|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:gst-droid.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos/gst-droid.git</param>
<param name="branch">master</param>
- <param name="revision">472b0905ae43db6e42a968e3c3c7e302fbef4806</param>
+ <param name="revision">354ce68c9021a812092632160abf261926279f04</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20210806.0.tar.gz/gst-libs/gst/droid/meson.build
^
|
| @@ -1,5 +1,4 @@
gstdroid_sources = [
- '/usr/share/droidmedia/hybris.c',
'gstdroidbufferpool.c',
'gstdroidcodec.c',
'gstdroidmediabuffer.c',
@@ -16,13 +15,13 @@
]
gstdroid_deps = [
+ droidmedia_dep,
gst_dep,
gstbase_dep,
gstcodecparsers_dep,
gstvideo_dep,
egl_dep,
gstnemointerfaces_dep,
- hybris_dep
]
install_headers(gstdroid_headers, subdir : 'gstreamer-@0@/gst/allocators'.format(api_version))
@@ -30,7 +29,7 @@
gstdroid = library('gstdroid-@0@'.format(api_version),
gstdroid_sources + gstdroid_headers,
c_args : gstdroid_args + ['-DGST_USE_UNSTABLE_API'],
- include_directories : [configinc, libsinc, droidmedia_h],
+ include_directories : [configinc, libsinc],
version : lib_version,
soversion : so_version,
install : true,
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20210806.0.tar.gz/gst/droidcamsrc/meson.build
^
|
| @@ -1,5 +1,4 @@
gstdroidcamsrc_sources = [
- '/usr/share/droidmedia/hybris.c',
'gstdroidcamsrc.c',
'gstdroidcamsrcdev.c',
'gstdroidcamsrcparams.c',
@@ -24,6 +23,7 @@
]
gstdroidcamsrc_deps = [
+ droidmedia_dep,
gst_dep,
gstbase_dep,
gstcamerabinsrc_dep,
@@ -34,13 +34,12 @@
gstvideo_dep,
egl_dep,
exif_dep,
- hybris_dep
]
gstdroidcamsrc = static_library('gstdroidcamsrc-@0@'.format(api_version),
gstdroidcamsrc_sources + gstdroidcamsrc_headers,
c_args : gstdroid_args + ['-DGST_USE_UNSTABLE_API'],
- include_directories : ['..', configinc, libsinc, droidmedia_h],
+ include_directories : ['..', configinc, libsinc],
dependencies : gstdroidcamsrc_deps
)
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20210806.0.tar.gz/gst/droidcodec/meson.build
^
|
| @@ -1,5 +1,4 @@
gstdroidcodec_sources = [
- '/usr/share/droidmedia/hybris.c',
'gstdroidvdec.c',
'gstdroidvenc.c',
'gstdroidadec.c',
@@ -14,6 +13,7 @@
]
gstdroidcodec_deps = [
+ droidmedia_dep,
gst_dep,
gstaudio_dep,
gstbase_dep,
@@ -21,14 +21,13 @@
gstdroid_dep,
gstvideo_dep,
egl_dep,
- hybris_dep,
orc_dep
]
gstdroidcodec = static_library('gstdroidcodec-@0@'.format(api_version),
gstdroidcodec_sources + gstdroidcodec_headers,
c_args : gstdroid_args + ['-DGST_USE_UNSTABLE_API'],
- include_directories : ['..', configinc, libsinc, droidmedia_h],
+ include_directories : ['..', configinc, libsinc],
dependencies : gstdroidcodec_deps
)
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20210806.0.tar.gz/gst/droideglsink/meson.build
^
|
| @@ -1,5 +1,4 @@
gstdroideglsink_sources = [
- '/usr/share/droidmedia/hybris.c',
'gstdroideglsink.c',
'gstdroidvideotexturesink.c'
]
@@ -10,6 +9,7 @@
]
gstdroideglsink_deps = [
+ droidmedia_dep,
gst_dep,
gstdroid_dep,
gstnemointerfaces_dep,
@@ -20,7 +20,7 @@
gstdroideglsink = static_library('gstdroideglsink-@0@'.format(api_version),
gstdroideglsink_sources + gstdroideglsink_headers,
c_args : gstdroid_args + ['-DGST_USE_UNSTABLE_API'],
- include_directories : ['..', configinc, libsinc, droidmedia_h],
+ include_directories : ['..', configinc, libsinc],
dependencies : gstdroideglsink_deps
)
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20210806.0.tar.gz/gst/meson.build
^
|
| @@ -1,5 +1,4 @@
libgstdroid_sources = [
- '/usr/share/droidmedia/hybris.c',
'plugin.c',
]
@@ -14,8 +13,8 @@
libgstdroid = library('gstdroid',
libgstdroid_sources + libgstdroid_headers,
c_args : gstdroid_args + ['-DGST_USE_UNSTABLE_API'],
- include_directories : [configinc, libsinc, droidmedia_h, 'droidcamsrc', 'droidcodec', 'droideglsink'],
- dependencies : [ gst_dep, gstdroidcamsrc_dep, gstdroidcodec_dep, gstdroideglsink_dep, hybris_dep ],
+ include_directories : [configinc, libsinc, 'droidcamsrc', 'droidcodec', 'droideglsink'],
+ dependencies : [ gst_dep, gstdroidcamsrc_dep, gstdroidcodec_dep, gstdroideglsink_dep, droidmedia_dep ],
install : true,
install_dir : plugins_install_dir,
)
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20210806.0.tar.gz/gst/plugin.c
^
|
| @@ -89,7 +89,7 @@
GST_TYPE_DROIDAENC);
if (ok)
- droid_media_init ();
+ ok = droid_media_init ();
return ok;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20210806.0.tar.gz/meson.build
^
|
| @@ -50,8 +50,7 @@
droid_conf.set_quoted('PACKAGE_STRING', 'GstDroid library')
root_dir = include_directories('.')
-droidmedia_h = include_directories('/usr/include/droidmedia')
-hybris_dep = cc.find_library('hybris-common', required: true)
+droidmedia_dep = dependency('droidmedia', required : true)
gstdroid_args = ['-DHAVE_CONFIG_H', '-DSYSCONFDIR="/etc"']
|
|
[-]
[+]
|
Changed |
_service:tar_git:gstreamer1.0-droid-0.20210806.0.tar.gz/tools/meson.build
^
|
| @@ -4,7 +4,7 @@
['common.c', 'resolutions.c'],
install: true,
c_args : gstdroid_args,
- include_directories : [configinc, libsinc, droidmedia_h],
+ include_directories : [configinc, libsinc],
dependencies : tool_deps,
)
@@ -12,6 +12,6 @@
['common.c', 'gstdroidcamparams.c'],
install: true,
c_args : gstdroid_args,
- include_directories : [configinc, libsinc, droidmedia_h],
+ include_directories : [configinc, libsinc],
dependencies : tool_deps,
)
|
