diff --git a/subprojects/gst-devtools/meson.build b/subprojects/gst-devtools/meson.build index 5d091751f1..3a0da27cb1 100644 --- a/subprojects/gst-devtools/meson.build +++ b/subprojects/gst-devtools/meson.build @@ -87,12 +87,8 @@ gst_check_dep = dependency('gstreamer-check-1.0', version : gst_req, required : get_option('validate'), fallback : ['gstreamer', 'gst_check_dep']) -glib_dep = dependency('glib-2.0', version : '>=2.32.0', - fallback: ['glib', 'libglib_dep']) -gmodule_dep = dependency('gmodule-2.0', - fallback: ['glib', 'libgmodule_dep']) -gio_dep = dependency('gio-2.0', - fallback: ['glib', 'libgio_dep']) +gio_dep = dependency('gio-2.0', version: glib_req) +gmodule_dep = dependency('gmodule-2.0') gtk_dep = dependency('gtk+-3.0', required: false) mathlib = cc.find_library('m', required : false) diff --git a/subprojects/gst-devtools/validate/gst-libs/gst/video/meson.build b/subprojects/gst-devtools/validate/gst-libs/gst/video/meson.build index ad1c88b7e2..449c728f8c 100644 --- a/subprojects/gst-devtools/validate/gst-libs/gst/video/meson.build +++ b/subprojects/gst-devtools/validate/gst-libs/gst/video/meson.build @@ -6,13 +6,13 @@ if cairo_dep.found() 'gstvalidatevideo', 'gstvalidatessim.c', 'gssim.c', include_directories : inc_dirs, - dependencies : [gst_dep, gst_video_dep, gst_pbutils_dep, glib_dep, cairo_dep, gio_dep, + dependencies : [gst_dep, gst_video_dep, gst_pbutils_dep, cairo_dep, gio_dep, mathlib], ) validate_video_dep = declare_dependency( link_with : video, include_directories : inc_dirs, - dependencies : [gst_dep, gst_video_dep, gst_pbutils_dep, glib_dep, cairo_dep, gio_dep, + dependencies : [gst_dep, gst_video_dep, gst_pbutils_dep, cairo_dep, gio_dep, mathlib], ) endif diff --git a/subprojects/gst-devtools/validate/gst/validate/meson.build b/subprojects/gst-devtools/validate/gst/validate/meson.build index 7b798703eb..2ba4639d5e 100644 --- a/subprojects/gst-devtools/validate/gst/validate/meson.build +++ b/subprojects/gst-devtools/validate/gst/validate/meson.build @@ -56,7 +56,8 @@ gst_validate_enums = gnome.mkenums('gstvalidateenumtypes', install_header : true, install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/validate')) -validate_deps = [gst_check_dep, gst_dep, gst_controller_dep, gstbase_dep, glib_dep, gio_dep, gmodule_dep, gst_pbutils_dep, mathlib, json_dep] +validate_deps = [gst_check_dep, gst_dep, gst_controller_dep, gstbase_dep, + gio_dep, gmodule_dep, gst_pbutils_dep, mathlib, json_dep] gstvalidate = library('gstvalidate-1.0', sources: gstvalidate_sources + gst_validate_enums, version : libversion, diff --git a/subprojects/gst-devtools/validate/plugins/fault_injection/meson.build b/subprojects/gst-devtools/validate/plugins/fault_injection/meson.build index 196665db81..be7c6f278d 100644 --- a/subprojects/gst-devtools/validate/plugins/fault_injection/meson.build +++ b/subprojects/gst-devtools/validate/plugins/fault_injection/meson.build @@ -3,7 +3,7 @@ if dl.found() 'socket_interposer.c', include_directories : inc_dirs, link_with: [gstvalidate], - dependencies : [gst_dep, glib_dep, dl], + dependencies : [gst_dep, dl], c_args: ['-DHAVE_CONFIG_H'], install : true, install_dir : validate_plugins_install_dir, diff --git a/subprojects/gst-devtools/validate/plugins/gapplication/meson.build b/subprojects/gst-devtools/validate/plugins/gapplication/meson.build index 943d0a188a..378a722f8c 100644 --- a/subprojects/gst-devtools/validate/plugins/gapplication/meson.build +++ b/subprojects/gst-devtools/validate/plugins/gapplication/meson.build @@ -4,6 +4,6 @@ shared_library('gstvalidategapplication', c_args: ['-DHAVE_CONFIG_H'], install: true, install_dir: validate_plugins_install_dir, - dependencies : [gst_dep, glib_dep, gst_pbutils_dep, gio_dep], + dependencies : [gst_dep, gst_pbutils_dep, gio_dep], link_with : [gstvalidate] ) diff --git a/subprojects/gst-devtools/validate/plugins/gtk/meson.build b/subprojects/gst-devtools/validate/plugins/gtk/meson.build index dcb7896cb6..35c6b47171 100644 --- a/subprojects/gst-devtools/validate/plugins/gtk/meson.build +++ b/subprojects/gst-devtools/validate/plugins/gtk/meson.build @@ -1,6 +1,6 @@ shared_library('gstvalidategtk', 'gstvalidategtk.c', include_directories : inc_dirs, - dependencies : [gst_dep, glib_dep, gst_pbutils_dep, gtk_dep], + dependencies : [gst_dep, gst_pbutils_dep, gtk_dep], c_args: ['-DHAVE_CONFIG_H'], install : true, install_dir : validate_plugins_install_dir, diff --git a/subprojects/gst-devtools/validate/plugins/ssim/meson.build b/subprojects/gst-devtools/validate/plugins/ssim/meson.build index 5562e41e2e..980df8213d 100644 --- a/subprojects/gst-devtools/validate/plugins/ssim/meson.build +++ b/subprojects/gst-devtools/validate/plugins/ssim/meson.build @@ -3,7 +3,7 @@ if validate_video_dep.found() 'gstvalidatessim.c', include_directories : inc_dirs, link_with: [gstvalidate], - dependencies : [gst_dep, gst_video_dep, glib_dep, validate_video_dep, + dependencies : [gst_dep, gst_video_dep, validate_video_dep, gst_pbutils_dep], install : true, install_dir : validate_plugins_install_dir, diff --git a/subprojects/gst-docs/README.md b/subprojects/gst-docs/README.md index 5d8273e601..ebb528fea0 100644 --- a/subprojects/gst-docs/README.md +++ b/subprojects/gst-docs/README.md @@ -77,7 +77,7 @@ gst_elements = library('gstcoreelements', gst_elements_sources, c_args : gst_c_args, include_directories : [configinc], - dependencies : [gobject_dep, glib_dep, gst_dep, gst_base_dep], + dependencies : [gst_dep, gst_base_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build index de6c4c739a..f9dfeb203d 100644 --- a/subprojects/gst-editing-services/meson.build +++ b/subprojects/gst-editing-services/meson.build @@ -115,7 +115,8 @@ gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : get_option('validate'), fallback : ['gst-devtools', 'validate_dep']) -gio_dep = dependency('gio-2.0', version: glib_req, fallback: ['glib', 'libgio_dep']) +gio_dep = dependency('gio-2.0', version: glib_req) +gmodule_dep = dependency('gmodule-2.0') libxml_dep = dependency('libxml-2.0', required: get_option('xptv')) cdata.set('DISABLE_XPTV', not libxml_dep.found()) @@ -196,7 +197,6 @@ elif build_gir pylib_suffix = 'dylib' endif - gmodule_dep = dependency('gmodule-2.0') libges_deps = libges_deps + [python_dep, gmodule_dep] has_python = true message('python_abi_flags = @0@'.format(python_abi_flags)) diff --git a/subprojects/gst-examples/meson.build b/subprojects/gst-examples/meson.build index 05d3ba5807..33e396a8a3 100644 --- a/subprojects/gst-examples/meson.build +++ b/subprojects/gst-examples/meson.build @@ -17,14 +17,7 @@ gst_version_minor = version_arr[1].to_int() gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor) -glib_dep = dependency('glib-2.0', version: '>= 2.38', - fallback: ['glib', 'libglib_dep']) -gio_dep = dependency('gio-2.0', - fallback: ['glib', 'libgio_dep']) -gobject_dep = dependency('gobject-2.0', version: '>= 2.38', - fallback: ['glib', 'libgobject_dep']) -gmodule_dep = dependency('gmodule-2.0', - fallback: ['glib', 'libgmodule_dep']) +gio_dep = dependency('gio-2.0') gst_dep = dependency('gstreamer-1.0', version: gst_req, fallback : ['gstreamer', 'gst_dep']) diff --git a/subprojects/gst-examples/playback/player/gtk/meson.build b/subprojects/gst-examples/playback/player/gtk/meson.build index a09744f538..03840bac22 100644 --- a/subprojects/gst-examples/playback/player/gtk/meson.build +++ b/subprojects/gst-examples/playback/player/gtk/meson.build @@ -13,5 +13,5 @@ if gtk_dep.found() gtk_play_resources, 'gtk-video-renderer.h', 'gtk-video-renderer.c'], - dependencies : [glib_dep, gobject_dep, gmodule_dep, gst_dep, gsttag_dep, gstplay_dep, gtk_dep, x11_dep]) + dependencies : [gst_dep, gsttag_dep, gstplay_dep, gtk_dep, x11_dep]) endif diff --git a/subprojects/gst-omx/meson.build b/subprojects/gst-omx/meson.build index 3fc05b1cdb..f368913f75 100644 --- a/subprojects/gst-omx/meson.build +++ b/subprojects/gst-omx/meson.build @@ -163,9 +163,7 @@ gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req, fallback : ['gstreamer', 'gst_check_dep']) libm = cc.find_library('m', required : false) -glib_dep = dependency('glib-2.0', version : glib_req, fallback: ['glib', 'libglib_dep']) -gio_dep = dependency('gio-2.0', version : glib_req, fallback: ['glib', 'libgio_dep'] ) -gmodule_dep = dependency('gmodule-2.0', version : glib_req, fallback: ['glib', 'libgmodule_dep']) +gmodule_dep = dependency('gmodule-2.0', version: glib_req) gst_omx_args = ['-DHAVE_CONFIG_H'] configinc = include_directories('.') diff --git a/subprojects/gst-omx/omx/meson.build b/subprojects/gst-omx/omx/meson.build index becb72ff5b..8c074a9238 100644 --- a/subprojects/gst-omx/omx/meson.build +++ b/subprojects/gst-omx/omx/meson.build @@ -60,4 +60,4 @@ gstomx = library('gstomx', install_dir : plugins_install_dir, ) -plugins = [gstomx] \ No newline at end of file +plugins = [gstomx] diff --git a/subprojects/gst-omx/tests/check/meson.build b/subprojects/gst-omx/tests/check/meson.build index 4bb7de6976..26ebfe98ec 100644 --- a/subprojects/gst-omx/tests/check/meson.build +++ b/subprojects/gst-omx/tests/check/meson.build @@ -19,7 +19,7 @@ endif state_ignore_elements='' # FIXME: check, also + PTHREAD_CFLAGS -test_deps = [gst_dep, gstbase_dep, glib_dep, gstcheck_dep] +test_deps = [gst_dep, gstbase_dep, gstcheck_dep] # FIXME: add valgrind suppression common/gst.supp gst-plugins-good.supp foreach t : omx_tests diff --git a/subprojects/gst-omx/tools/meson.build b/subprojects/gst-omx/tools/meson.build index 7f6a6704b6..419ab34b2a 100644 --- a/subprojects/gst-omx/tools/meson.build +++ b/subprojects/gst-omx/tools/meson.build @@ -2,7 +2,7 @@ executable('listcomponents', 'listcomponents.c', install: false, include_directories : [configinc, omx_inc], - dependencies : [glib_dep, gmodule_dep], + dependencies : [gmodule_dep], link_with: [], c_args : gst_omx_args + extra_c_args, ) diff --git a/subprojects/gst-plugins-bad/ext/vulkan/meson.build b/subprojects/gst-plugins-bad/ext/vulkan/meson.build index d58c7443b8..e96a92eac9 100644 --- a/subprojects/gst-plugins-bad/ext/vulkan/meson.build +++ b/subprojects/gst-plugins-bad/ext/vulkan/meson.build @@ -46,7 +46,7 @@ gstvulkan_plugin = library('gstvulkan', objc_args : gst_plugins_bad_args, link_args : noseh_link_args, include_directories : [configinc], - dependencies : [gio_dep, gstvideo_dep, gstbase_dep, gstvulkan_dep, vulkan_dep], + dependencies : [gstvideo_dep, gstbase_dep, gstvulkan_dep, vulkan_dep, gio_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-bad/ext/webrtc/meson.build b/subprojects/gst-plugins-bad/ext/webrtc/meson.build index 1696d2aa6b..ded8cb83ad 100644 --- a/subprojects/gst-plugins-bad/ext/webrtc/meson.build +++ b/subprojects/gst-plugins-bad/ext/webrtc/meson.build @@ -24,8 +24,8 @@ if libnice_dep.found() webrtc_sources, c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'], include_directories : [configinc], - dependencies : [gio_dep, libnice_dep, gstbase_dep, gstsdp_dep, - gstapp_dep, gstwebrtc_dep, gstsctp_dep, gstrtp_dep], + dependencies : [gstbase_dep, gstsdp_dep, + gstapp_dep, gstwebrtc_dep, gstsctp_dep, gstrtp_dep, libnice_dep, gio_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build index 52c2b53dc6..92c5ba7bc4 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build @@ -158,4 +158,4 @@ libraries += [[pkg_name, library_def]] # Still non-public api, should not install headers gstd3d11_dep = declare_dependency(link_with : gstd3d11, include_directories : [libsinc], - dependencies : [gstbase_dep, gstvideo_dep, gmodule_dep, d3d11_lib, dxgi_lib]) + dependencies : [gstbase_dep, gstvideo_dep, d3d11_lib, dxgi_lib]) diff --git a/subprojects/gst-plugins-bad/gst/rtp/meson.build b/subprojects/gst-plugins-bad/gst/rtp/meson.build index 5c37ec5a8f..c3a15c90cd 100644 --- a/subprojects/gst-plugins-bad/gst/rtp/meson.build +++ b/subprojects/gst-plugins-bad/gst/rtp/meson.build @@ -7,7 +7,7 @@ gst_plugins_rtp_sources = [ gstrtp = library('gstrtpmanagerbad', gst_plugins_rtp_sources, - dependencies: [gio_dep, gst_dep, gstbase_dep, gstrtp_dep, gstnet_dep, gstcontroller_dep], + dependencies: [gst_dep, gstbase_dep, gstrtp_dep, gstnet_dep, gstcontroller_dep, gio_dep], include_directories: [configinc], install: true, c_args: gst_plugins_bad_args, diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index 0d5b66c466..8c27381a21 100644 --- a/subprojects/gst-plugins-bad/meson.build +++ b/subprojects/gst-plugins-bad/meson.build @@ -381,9 +381,8 @@ if gstgl_dep.found() endif libm = cc.find_library('m', required : false) -glib_dep = dependency('glib-2.0', version : glib_req, fallback: ['glib', 'libglib_dep']) -gmodule_dep = dependency('gmodule-2.0', fallback: ['glib', 'libgmodule_dep']) -gio_dep = dependency('gio-2.0', fallback: ['glib', 'libgio_dep']) +gio_dep = dependency('gio-2.0', version: glib_req) +gmodule_dep = dependency('gmodule-2.0') # gio-unix-2.0 is used by sys/bluez # Optional dep of ext/gl and gst/librfb @@ -588,7 +587,7 @@ if gst_version_nano == 0 message('Package release date: ' + release_date) endif -if glib_dep.version().version_compare('< 2.67.4') +if gio_dep.version().version_compare('< 2.67.4') cdata.set('g_memdup2(ptr,sz)', '(G_LIKELY(((guint64)(sz)) < G_MAXUINT)) ? g_memdup(ptr,sz) : (g_abort(),NULL)') endif diff --git a/subprojects/gst-plugins-bad/sys/bluez/meson.build b/subprojects/gst-plugins-bad/sys/bluez/meson.build index 769842dbf1..f7d0296591 100644 --- a/subprojects/gst-plugins-bad/sys/bluez/meson.build +++ b/subprojects/gst-plugins-bad/sys/bluez/meson.build @@ -13,9 +13,7 @@ if host_system == 'windows' endif bluez_dep = dependency('bluez', version : '>= 5.0', required : get_option('bluez')) -gio_unix_dep = dependency('gio-unix-2.0', version : glib_req, - fallback: ['glib', 'libgiounix_dep'], - required : get_option('bluez')) +gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez')) if bluez_dep.found() and gio_unix_dep.found() bluez_ch = gnome.gdbus_codegen('bluez', diff --git a/subprojects/gst-plugins-bad/sys/dvb/meson.build b/subprojects/gst-plugins-bad/sys/dvb/meson.build index 6a58f098a1..3ca3ee2046 100644 --- a/subprojects/gst-plugins-bad/sys/dvb/meson.build +++ b/subprojects/gst-plugins-bad/sys/dvb/meson.build @@ -36,7 +36,7 @@ if have_dvb dvb_sources, c_args : gst_plugins_bad_args + [ '-DGST_USE_UNSTABLE_API' ], include_directories : [configinc, libsinc], - dependencies : [gstmpegts_dep, gstbase_dep, glib_dep], + dependencies : [gstmpegts_dep, gstbase_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-bad/tests/check/meson.build b/subprojects/gst-plugins-bad/tests/check/meson.build index 4d04043c35..8b22a049fc 100644 --- a/subprojects/gst-plugins-bad/tests/check/meson.build +++ b/subprojects/gst-plugins-bad/tests/check/meson.build @@ -32,8 +32,8 @@ base_tests = [ [['elements/ccconverter.c'], not closedcaption_dep.found(), [gstvideo_dep]], [['elements/cccombiner.c'], not closedcaption_dep.found(), ], [['elements/ccextractor.c'], not closedcaption_dep.found(), ], - [['elements/cudaconvert.c'], false, [gmodule_dep, gstgl_dep]], - [['elements/cudafilter.c'], false, [gmodule_dep, gstgl_dep]], + [['elements/cudaconvert.c'], false, [gstgl_dep, gmodule_dep]], + [['elements/cudafilter.c'], false, [gstgl_dep, gmodule_dep]], [['elements/d3d11colorconvert.c'], host_machine.system() != 'windows', ], [['elements/gdpdepay.c']], [['elements/gdppay.c']], @@ -53,8 +53,8 @@ base_tests = [ [['elements/msdkh264enc.c'], not have_msdk, [msdk_dep]], [['elements/mxfdemux.c']], [['elements/mxfmux.c']], - [['elements/nvenc.c'], false, [gmodule_dep, gstgl_dep]], - [['elements/nvdec.c'], not gstgl_dep.found(), [gmodule_dep, gstgl_dep]], + [['elements/nvenc.c'], false, [gstgl_dep, gmodule_dep]], + [['elements/nvdec.c'], not gstgl_dep.found(), [gstgl_dep, gmodule_dep]], [['elements/svthevcenc.c'], not svthevcenc_dep.found(), [svthevcenc_dep]], [['elements/openjpeg.c'], not openjpeg_dep.found(), [openjpeg_dep]], [['elements/pcapparse.c'], false, [libparser_dep]], @@ -162,7 +162,7 @@ test_deps = [gst_dep, gstapp_dep, gstbase_dep, gstbasecamerabin_dep, gstphotography_dep, gstpbutils_dep, gstcontroller_dep, gstaudio_dep, gstvideo_dep, gstrtp_dep, gsturidownloader_dep, - gstcheck_dep, gio_dep, glib_dep, gsttag_dep] + gstcheck_dep, gio_dep, gsttag_dep] pluginsdirs = [ ] diff --git a/subprojects/gst-plugins-bad/tests/examples/ipcpipeline/meson.build b/subprojects/gst-plugins-bad/tests/examples/ipcpipeline/meson.build index 73583e6361..9c4674e929 100644 --- a/subprojects/gst-plugins-bad/tests/examples/ipcpipeline/meson.build +++ b/subprojects/gst-plugins-bad/tests/examples/ipcpipeline/meson.build @@ -15,12 +15,12 @@ endif executable('ipcpipeline1', 'ipcpipeline1.c', include_directories: [configinc], - dependencies: [glib_dep, gst_dep, gstbase_dep], + dependencies: [gst_dep, gstbase_dep], c_args: gst_plugins_bad_args, install: false) executable('ipc-play', 'ipc-play.c', include_directories: [configinc], - dependencies: [glib_dep, gst_dep, gstbase_dep, gstvideo_dep], + dependencies: [gst_dep, gstbase_dep, gstvideo_dep], c_args: gst_plugins_bad_args, install: false) diff --git a/subprojects/gst-plugins-bad/tests/examples/opencv/meson.build b/subprojects/gst-plugins-bad/tests/examples/opencv/meson.build index 889ea51a74..33ca65580d 100644 --- a/subprojects/gst-plugins-bad/tests/examples/opencv/meson.build +++ b/subprojects/gst-plugins-bad/tests/examples/opencv/meson.build @@ -7,7 +7,7 @@ foreach example : examples executable(exe_name, src_file, include_directories: [configinc], - dependencies: [glib_dep, gst_dep, gstbase_dep], + dependencies: [gst_dep, gstbase_dep], c_args : gst_plugins_bad_args, install: false) endforeach diff --git a/subprojects/gst-plugins-bad/tests/examples/webrtc/meson.build b/subprojects/gst-plugins-bad/tests/examples/webrtc/meson.build index 3ed7e6e616..c08d442c4f 100644 --- a/subprojects/gst-plugins-bad/tests/examples/webrtc/meson.build +++ b/subprojects/gst-plugins-bad/tests/examples/webrtc/meson.build @@ -8,7 +8,7 @@ foreach example : examples src_file, install: false, include_directories : [configinc], - dependencies : [glib_dep, gst_dep, gstwebrtc_dep], + dependencies : [gst_dep, gstwebrtc_dep], c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'], ) endforeach diff --git a/subprojects/gst-plugins-bad/tests/examples/wpe/meson.build b/subprojects/gst-plugins-bad/tests/examples/wpe/meson.build index 3e7f664954..98781e7f0e 100644 --- a/subprojects/gst-plugins-bad/tests/examples/wpe/meson.build +++ b/subprojects/gst-plugins-bad/tests/examples/wpe/meson.build @@ -8,7 +8,7 @@ foreach example : examples src_file, install: false, include_directories : [configinc], - dependencies : [glib_dep, gst_dep], + dependencies : [gst_dep], c_args : ['-DHAVE_CONFIG_H=1'], ) endforeach diff --git a/subprojects/gst-plugins-bad/tests/icles/meson.build b/subprojects/gst-plugins-bad/tests/icles/meson.build index 1b8dce6369..b0bc77922c 100644 --- a/subprojects/gst-plugins-bad/tests/icles/meson.build +++ b/subprojects/gst-plugins-bad/tests/icles/meson.build @@ -1,6 +1,6 @@ if not get_option('soundtouch').disabled() and soundtouch_dep.found() executable('pitch-test', 'pitch-test.c', include_directories: [configinc], - dependencies: [glib_dep, gst_dep, gstcontroller_dep], + dependencies: [gst_dep, gstcontroller_dep], install: false) endif diff --git a/subprojects/gst-plugins-base/ext/alsa/meson.build b/subprojects/gst-plugins-base/ext/alsa/meson.build index 13d82148b6..2b2a24f88c 100644 --- a/subprojects/gst-plugins-base/ext/alsa/meson.build +++ b/subprojects/gst-plugins-base/ext/alsa/meson.build @@ -15,7 +15,7 @@ if alsa_dep.found() alsa_sources, c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : glib_deps + [alsa_dep, audio_dep, tag_dep, gst_dep, gst_base_dep], + dependencies : [alsa_dep, audio_dep, tag_dep, gst_dep, gst_base_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-base/ext/cdparanoia/meson.build b/subprojects/gst-plugins-base/ext/cdparanoia/meson.build index 89fa6f0b69..d46a51dbab 100644 --- a/subprojects/gst-plugins-base/ext/cdparanoia/meson.build +++ b/subprojects/gst-plugins-base/ext/cdparanoia/meson.build @@ -33,7 +33,7 @@ if cdparanoia_found ['gstcdparanoiasrc.c'], include_directories: [configinc, libsinc], c_args : gst_plugins_base_args, - dependencies : cdparanoia_deps + glib_deps + [audio_dep, gst_dep, gst_base_dep], + dependencies : cdparanoia_deps + [audio_dep, gst_dep, gst_base_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-base/ext/libvisual/meson.build b/subprojects/gst-plugins-base/ext/libvisual/meson.build index aa5c1c6de1..cd56a22294 100644 --- a/subprojects/gst-plugins-base/ext/libvisual/meson.build +++ b/subprojects/gst-plugins-base/ext/libvisual/meson.build @@ -13,7 +13,7 @@ if libvisual_dep.found() libvisual_sources, c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : glib_deps + [libvisual_dep, audio_dep, video_dep, pbutils_dep, gst_dep, gst_base_dep], + dependencies : [libvisual_dep, audio_dep, video_dep, pbutils_dep, gst_dep, gst_base_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-base/ext/ogg/meson.build b/subprojects/gst-plugins-base/ext/ogg/meson.build index d6b133bff9..82be115215 100644 --- a/subprojects/gst-plugins-base/ext/ogg/meson.build +++ b/subprojects/gst-plugins-base/ext/ogg/meson.build @@ -19,7 +19,7 @@ if ogg_dep.found() c_args : gst_plugins_base_args, link_args : noseh_link_args, include_directories: [configinc, libsinc], - dependencies : glib_deps + [ogg_dep, audio_dep, pbutils_dep, tag_dep, riff_dep, gst_dep, gst_base_dep], + dependencies : [ogg_dep, audio_dep, pbutils_dep, tag_dep, riff_dep, gst_dep, gst_base_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-base/ext/opus/meson.build b/subprojects/gst-plugins-base/ext/opus/meson.build index 2b499029c4..ef3b6c24c8 100644 --- a/subprojects/gst-plugins-base/ext/opus/meson.build +++ b/subprojects/gst-plugins-base/ext/opus/meson.build @@ -16,7 +16,7 @@ if opus_dep.found() c_args : gst_plugins_base_args, link_args : noseh_link_args, include_directories: [configinc, libsinc], - dependencies : glib_deps + [pbutils_dep, tag_dep, audio_dep, gst_dep, gst_base_dep, opus_dep, libm], + dependencies : [pbutils_dep, tag_dep, audio_dep, gst_dep, gst_base_dep, opus_dep, libm], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-base/ext/pango/meson.build b/subprojects/gst-plugins-base/ext/pango/meson.build index 8368f4450c..8de05b3720 100644 --- a/subprojects/gst-plugins-base/ext/pango/meson.build +++ b/subprojects/gst-plugins-base/ext/pango/meson.build @@ -18,7 +18,7 @@ if pango_dep.found() c_args : gst_plugins_base_args, link_args : noseh_link_args, include_directories: [configinc, libsinc], - dependencies : glib_deps + [pango_dep, video_dep, gst_dep, gst_base_dep, libm], + dependencies : [pango_dep, video_dep, gst_dep, gst_base_dep, libm], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-base/ext/theora/meson.build b/subprojects/gst-plugins-base/ext/theora/meson.build index c0dba1bdd2..426396ac75 100644 --- a/subprojects/gst-plugins-base/ext/theora/meson.build +++ b/subprojects/gst-plugins-base/ext/theora/meson.build @@ -21,7 +21,7 @@ if theoradec_dep.found() or theoraenc_dep.found() c_args : gst_plugins_base_args, link_args : noseh_link_args, include_directories: [configinc, libsinc], - dependencies : theora_deps + glib_deps + [video_dep, tag_dep, gst_dep, gst_base_dep], + dependencies : theora_deps + [video_dep, tag_dep, gst_dep, gst_base_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-base/ext/vorbis/meson.build b/subprojects/gst-plugins-base/ext/vorbis/meson.build index 23fdf373c9..a4fef4893e 100644 --- a/subprojects/gst-plugins-base/ext/vorbis/meson.build +++ b/subprojects/gst-plugins-base/ext/vorbis/meson.build @@ -31,7 +31,7 @@ if vorbis_dep.found() c_args : gst_plugins_base_args, link_args : noseh_link_args, include_directories: [configinc, libsinc], - dependencies : vorbis_deps + glib_deps + [audio_dep, tag_dep, gst_dep, gst_base_dep], + dependencies : vorbis_deps + [audio_dep, tag_dep, gst_dep, gst_base_dep], install : true, install_dir : plugins_install_dir, ) @@ -47,7 +47,7 @@ if vorbisidec_dep.found() c_args : gst_plugins_base_args + ['-DTREMOR'], link_args : noseh_link_args, include_directories: [configinc, libsinc], - dependencies : glib_deps + [vorbisidec_dep, audio_dep, tag_dep, gst_dep, gst_base_dep], + dependencies : [vorbisidec_dep, audio_dep, tag_dep, gst_dep, gst_base_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/sdp/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/sdp/meson.build index 746004f291..4841d6155f 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/sdp/meson.build +++ b/subprojects/gst-plugins-base/gst-libs/gst/sdp/meson.build @@ -24,7 +24,6 @@ library_def = {'lib': gstsdp} pkg_name = 'gstreamer-sdp-1.0' sdp_gen_sources = [] pkgconfig.generate(gstsdp, - libraries : [glib_deps], variables : pkgconfig_variables, subdirs : pkgconfig_subdirs, name : pkg_name, diff --git a/subprojects/gst-plugins-base/gst/tcp/meson.build b/subprojects/gst-plugins-base/gst/tcp/meson.build index 86c62b3b95..64703a42db 100644 --- a/subprojects/gst-plugins-base/gst/tcp/meson.build +++ b/subprojects/gst-plugins-base/gst/tcp/meson.build @@ -19,7 +19,7 @@ gsttcp = library('gsttcp', tcp_sources, c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [gio_dep, gst_base_dep, gst_net_dep], + dependencies : [gst_base_dep, gst_net_dep, gio_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-base/gst/videoscale/meson.build b/subprojects/gst-plugins-base/gst/videoscale/meson.build index 7dc39fba42..991fa19797 100644 --- a/subprojects/gst-plugins-base/gst/videoscale/meson.build +++ b/subprojects/gst-plugins-base/gst/videoscale/meson.build @@ -6,7 +6,7 @@ gstvideoscale = library('gstvideoscale', videoscale_sources, c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : glib_deps + [video_dep, gst_dep, gst_base_dep], + dependencies : [video_dep, gst_dep, gst_base_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-base/gst/videotestsrc/meson.build b/subprojects/gst-plugins-base/gst/videotestsrc/meson.build index abcc83c14d..c781c980da 100644 --- a/subprojects/gst-plugins-base/gst/videotestsrc/meson.build +++ b/subprojects/gst-plugins-base/gst/videotestsrc/meson.build @@ -1,4 +1,4 @@ -videotestsrc_deps = glib_deps + [video_dep, gst_dep, gst_base_dep, libm] +videotestsrc_deps = [video_dep, gst_dep, gst_base_dep, libm] orcsrc = 'gstvideotestsrcorc' if have_orcc videotestsrc_deps += [orc_dep] diff --git a/subprojects/gst-plugins-base/gst/volume/meson.build b/subprojects/gst-plugins-base/gst/volume/meson.build index 25aed3eb96..bc28a7cbfe 100644 --- a/subprojects/gst-plugins-base/gst/volume/meson.build +++ b/subprojects/gst-plugins-base/gst/volume/meson.build @@ -1,4 +1,4 @@ -volume_deps = glib_deps + [audio_dep, gst_dep, gst_base_dep] +volume_deps = [audio_dep, gst_dep, gst_base_dep] orcsrc = 'gstvolumeorc' if have_orcc volume_deps += [orc_dep] diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build index 0d52230c73..186cc56057 100644 --- a/subprojects/gst-plugins-base/meson.build +++ b/subprojects/gst-plugins-base/meson.build @@ -309,19 +309,13 @@ endif # X11 checks are for sys/ and tests/ x11_dep = dependency('x11', required : get_option('x11')) -# GLib checks are for the entire project -# Almost everything that uses glib also uses gobject -glib_deps = [dependency('glib-2.0', version : glib_req, fallback: ['glib', 'libglib_dep']), - dependency('gobject-2.0', fallback: ['glib', 'libgobject_dep'])] # GIO is used by the GIO plugin, and by the TCP, SDP, and RTSP plugins -gio_dep = dependency('gio-2.0', fallback: ['glib', 'libgio_dep']) +gio_dep = dependency('gio-2.0', version: glib_req) giounix_dep = dependency('', required: false) if host_system != 'windows' - giounix_dep = dependency('gio-unix-2.0', version : glib_req, - fallback: ['glib', 'libgiounix_dep']) + giounix_dep = dependency('gio-unix-2.0') endif -gmodule_dep = dependency('gmodule-no-export-2.0', - fallback: ['glib', 'libgmodule_dep']) +gmodule_dep = dependency('gmodule-2.0') # some of the examples can use gdk-pixbuf and GTK+3 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', required : get_option('examples')) diff --git a/subprojects/gst-plugins-base/sys/ximage/meson.build b/subprojects/gst-plugins-base/sys/ximage/meson.build index b96b4f1926..4f795b8c13 100644 --- a/subprojects/gst-plugins-base/sys/ximage/meson.build +++ b/subprojects/gst-plugins-base/sys/ximage/meson.build @@ -8,7 +8,7 @@ gstximage = library('gstximagesink', 'ximagesink.c', 'ximage.c', 'ximagepool.c', c_args : gst_plugins_base_args + no_warn_args, include_directories: [configinc, libsinc], - dependencies : glib_deps + [video_dep, gst_base_dep, gst_dep, x11_dep, xshm_dep, xi_dep], + dependencies : [video_dep, gst_base_dep, gst_dep, x11_dep, xshm_dep, xi_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-base/sys/xvimage/meson.build b/subprojects/gst-plugins-base/sys/xvimage/meson.build index 38b4466191..137dd7ca44 100644 --- a/subprojects/gst-plugins-base/sys/xvimage/meson.build +++ b/subprojects/gst-plugins-base/sys/xvimage/meson.build @@ -19,7 +19,7 @@ if xvideo_dep.found() xvimage_sources, c_args : gst_plugins_base_args + no_warn_args, include_directories: [configinc, libsinc], - dependencies : glib_deps + [video_dep, gst_base_dep, gst_dep, x11_dep, xshm_dep, xvideo_dep, xi_dep, libm], + dependencies : [video_dep, gst_base_dep, gst_dep, x11_dep, xshm_dep, xvideo_dep, xi_dep, libm], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-base/tests/check/meson.build b/subprojects/gst-plugins-base/tests/check/meson.build index d36b7633fb..240b8e93ce 100644 --- a/subprojects/gst-plugins-base/tests/check/meson.build +++ b/subprojects/gst-plugins-base/tests/check/meson.build @@ -137,7 +137,7 @@ endif test_deps = [gst_dep, gst_base_dep, gst_net_dep, gst_check_dep, audio_dep, video_dep, pbutils_dep, rtp_dep, rtsp_dep, tag_dep, allocators_dep, app_dep, - fft_dep, riff_dep, sdp_dep, gio_dep, valgrind_dep] + glib_deps + fft_dep, riff_dep, sdp_dep, gio_dep, valgrind_dep] foreach t : base_tests fname = t.get(0) diff --git a/subprojects/gst-plugins-base/tests/examples/app/meson.build b/subprojects/gst-plugins-base/tests/examples/app/meson.build index f6e9a81c34..467e8f75ff 100644 --- a/subprojects/gst-plugins-base/tests/examples/app/meson.build +++ b/subprojects/gst-plugins-base/tests/examples/app/meson.build @@ -12,6 +12,6 @@ foreach app : app_examples executable(app, '@0@.c'.format(app), c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep, app_dep], + dependencies : [gst_dep, app_dep], install: false) endforeach diff --git a/subprojects/gst-plugins-base/tests/examples/audio/meson.build b/subprojects/gst-plugins-base/tests/examples/audio/meson.build index f5aa1ffabb..305c5d5da2 100644 --- a/subprojects/gst-plugins-base/tests/examples/audio/meson.build +++ b/subprojects/gst-plugins-base/tests/examples/audio/meson.build @@ -3,11 +3,11 @@ if gtk_dep.found() executable('audiomix', 'audiomix.c', c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep, audio_dep, gtk_dep], + dependencies : [gst_dep, audio_dep, gtk_dep], install: false) executable('volume', 'volume.c', c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep, libm, audio_dep, gtk_dep], + dependencies : [gst_dep, libm, audio_dep, gtk_dep], install: false) endif diff --git a/subprojects/gst-plugins-base/tests/examples/decodebin_next/meson.build b/subprojects/gst-plugins-base/tests/examples/decodebin_next/meson.build index efcbe3e02d..3ece1fee57 100644 --- a/subprojects/gst-plugins-base/tests/examples/decodebin_next/meson.build +++ b/subprojects/gst-plugins-base/tests/examples/decodebin_next/meson.build @@ -2,6 +2,6 @@ foreach example : ['decodebin3', 'playbin-test', 'uridecodebin3-select-all'] executable(example, '@0@.c'.format(example), c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep], + dependencies : [gst_dep], install: false) endforeach diff --git a/subprojects/gst-plugins-base/tests/examples/dynamic/meson.build b/subprojects/gst-plugins-base/tests/examples/dynamic/meson.build index 6bccdb0e08..1ac8ee592a 100644 --- a/subprojects/gst-plugins-base/tests/examples/dynamic/meson.build +++ b/subprojects/gst-plugins-base/tests/examples/dynamic/meson.build @@ -4,6 +4,6 @@ foreach example : dynamic_examples executable(example, '@0@.c'.format(example), c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep], + dependencies : [gst_dep], install: false) endforeach diff --git a/subprojects/gst-plugins-base/tests/examples/encoding/meson.build b/subprojects/gst-plugins-base/tests/examples/encoding/meson.build index 39e2ad6c36..d074cce330 100644 --- a/subprojects/gst-plugins-base/tests/examples/encoding/meson.build +++ b/subprojects/gst-plugins-base/tests/examples/encoding/meson.build @@ -1,5 +1,5 @@ executable('encoding', 'encoding.c', 'gstcapslist.c', c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep, pbutils_dep, tag_dep, video_dep, audio_dep], + dependencies : [gst_dep, pbutils_dep, tag_dep, video_dep, audio_dep], install: false) diff --git a/subprojects/gst-plugins-base/tests/examples/fft/meson.build b/subprojects/gst-plugins-base/tests/examples/fft/meson.build index 84e9b78ce7..83992f7231 100644 --- a/subprojects/gst-plugins-base/tests/examples/fft/meson.build +++ b/subprojects/gst-plugins-base/tests/examples/fft/meson.build @@ -1,5 +1,5 @@ executable('fftrange', 'fftrange.c', c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep, fft_dep], + dependencies : [gst_dep, fft_dep], install: false) diff --git a/subprojects/gst-plugins-base/tests/examples/gio/meson.build b/subprojects/gst-plugins-base/tests/examples/gio/meson.build index 5d329cbecf..4340220984 100644 --- a/subprojects/gst-plugins-base/tests/examples/gio/meson.build +++ b/subprojects/gst-plugins-base/tests/examples/gio/meson.build @@ -2,6 +2,6 @@ if gtk_dep.found() executable('giosrc-mounting', 'giosrc-mounting.c', c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gio_dep, gst_dep, gtk_dep], + dependencies : [gst_dep, gtk_dep, gio_dep], install: false) endif diff --git a/subprojects/gst-plugins-base/tests/examples/overlay/meson.build b/subprojects/gst-plugins-base/tests/examples/overlay/meson.build index 8d0019c97b..7b1f49d2ee 100644 --- a/subprojects/gst-plugins-base/tests/examples/overlay/meson.build +++ b/subprojects/gst-plugins-base/tests/examples/overlay/meson.build @@ -7,7 +7,7 @@ if x11_dep.found() executable('gtk-videooverlay', 'gtk-videooverlay.c', c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep, video_dep, libm, x11_dep, gtk_x11_dep], + dependencies : [gst_dep, video_dep, libm, x11_dep, gtk_x11_dep], install: false) endif @@ -20,7 +20,7 @@ if x11_dep.found() executable('qt-videooverlay', 'qt-videooverlay.cpp', cpp_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep, video_dep, libm, x11_dep, qt5widgets_dep], + dependencies : [gst_dep, video_dep, libm, x11_dep, qt5widgets_dep], install: false) # FIXME: this doesn't work properly yet, no moc_qtgv-videooverlay.cpp generated @@ -28,7 +28,7 @@ if x11_dep.found() executable('qtgv-videooverlay', 'qtgv-videooverlay.cpp', moc_files, cpp_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep, video_dep, libm, x11_dep, qt5widgets_dep], + dependencies : [gst_dep, video_dep, libm, x11_dep, qt5widgets_dep], install: false) endif endif diff --git a/subprojects/gst-plugins-base/tests/examples/playback/meson.build b/subprojects/gst-plugins-base/tests/examples/playback/meson.build index 93a401f6a8..1252ad1210 100644 --- a/subprojects/gst-plugins-base/tests/examples/playback/meson.build +++ b/subprojects/gst-plugins-base/tests/examples/playback/meson.build @@ -8,6 +8,6 @@ if gtk_dep.found() executable('playback-test', 'playback-test.c', c_args : gst_plugins_base_args + quartz_cflags, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep, video_dep, libm, gtk_dep], + dependencies : [gst_dep, video_dep, libm, gtk_dep], install: false) endif diff --git a/subprojects/gst-plugins-base/tests/examples/playrec/meson.build b/subprojects/gst-plugins-base/tests/examples/playrec/meson.build index 5db2bb6e05..e0300ae2d2 100644 --- a/subprojects/gst-plugins-base/tests/examples/playrec/meson.build +++ b/subprojects/gst-plugins-base/tests/examples/playrec/meson.build @@ -1,5 +1,5 @@ executable('playrec', 'playrec.c', c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep], + dependencies : [gst_dep], install: false) diff --git a/subprojects/gst-plugins-base/tests/examples/seek/meson.build b/subprojects/gst-plugins-base/tests/examples/seek/meson.build index eb721b004c..e91475a4bc 100644 --- a/subprojects/gst-plugins-base/tests/examples/seek/meson.build +++ b/subprojects/gst-plugins-base/tests/examples/seek/meson.build @@ -9,31 +9,31 @@ if gtk_x11_dep.found() executable('jsseek', 'jsseek.c', c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep, video_dep, libm, gtk_dep], + dependencies : [gst_dep, video_dep, libm, gtk_dep], install: false) endif executable('scrubby', 'scrubby.c', c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep, video_dep, libm, gtk_dep], + dependencies : [gst_dep, video_dep, libm, gtk_dep], install: false) endif executable('stepping', 'stepping.c', c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [libm, glib_deps, gst_dep, video_dep], + dependencies : [libm, gst_dep, video_dep], install: false) executable('stepping2', 'stepping2.c', c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [libm, glib_deps, gst_dep, video_dep], + dependencies : [libm, gst_dep, video_dep], install: false) executable('instant-rate-change', 'instant-rate-change.c', c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [libm, glib_deps, gst_dep, video_dep], + dependencies : [libm, gst_dep, video_dep], install: false) diff --git a/subprojects/gst-plugins-base/tests/examples/snapshot/meson.build b/subprojects/gst-plugins-base/tests/examples/snapshot/meson.build index 61adb9fd9a..7f823b9596 100644 --- a/subprojects/gst-plugins-base/tests/examples/snapshot/meson.build +++ b/subprojects/gst-plugins-base/tests/examples/snapshot/meson.build @@ -2,6 +2,6 @@ if gdk_pixbuf_dep.found() executable('snapshot', 'snapshot.c', c_args : gst_plugins_base_args, include_directories: [configinc, libsinc], - dependencies : [libm, glib_deps, gst_dep, video_dep, gdk_pixbuf_dep], + dependencies : [libm, gst_dep, video_dep, gdk_pixbuf_dep], install: false) endif diff --git a/subprojects/gst-plugins-base/tools/meson.build b/subprojects/gst-plugins-base/tools/meson.build index 211c212598..f96d0601b3 100644 --- a/subprojects/gst-plugins-base/tools/meson.build +++ b/subprojects/gst-plugins-base/tools/meson.build @@ -1,4 +1,4 @@ -tool_deps = glib_deps + [pbutils_dep, audio_dep, video_dep, tag_dep, gst_dep, gst_base_dep, gmodule_dep] +tool_deps = [pbutils_dep, audio_dep, video_dep, tag_dep, gst_dep, gst_base_dep, gmodule_dep] extra_args = [] extra_deps = [] diff --git a/subprojects/gst-plugins-good/ext/qt/meson.build b/subprojects/gst-plugins-good/ext/qt/meson.build index a49cc31d17..279a1a5427 100644 --- a/subprojects/gst-plugins-good/ext/qt/meson.build +++ b/subprojects/gst-plugins-good/ext/qt/meson.build @@ -156,7 +156,7 @@ if have_qt_windowing cpp_args : gst_plugins_good_args + qt_defines, link_args : noseh_link_args, include_directories: [configinc, libsinc], - dependencies : [glib_deps, gst_dep, gstvideo_dep, gstgl_dep, gstglproto_dep, qt5qml_dep, optional_deps], + dependencies : [gst_dep, gstvideo_dep, gstgl_dep, gstglproto_dep, qt5qml_dep, optional_deps], override_options : ['cpp_std=c++11'], install: true, install_dir : plugins_install_dir) diff --git a/subprojects/gst-plugins-good/ext/soup/meson.build b/subprojects/gst-plugins-good/ext/soup/meson.build index 1db53bede1..ea169bf31c 100644 --- a/subprojects/gst-plugins-good/ext/soup/meson.build +++ b/subprojects/gst-plugins-good/ext/soup/meson.build @@ -12,9 +12,6 @@ if soup_opt.disabled() subdir_done() endif -gmodule_dep = dependency('gmodule-2.0', fallback: ['glib', 'libgmodule_dep']) -gobject_dep = dependency('gobject-2.0', fallback: ['glib', 'libgobject_dep']) - libdl_dep = cc.find_library('dl', required: false) static_args = [] @@ -50,7 +47,7 @@ soup_library_kwargs = { 'install' : true, 'install_dir' : plugins_install_dir, } -soup_library_deps = [gst_dep, gstbase_dep, gsttag_dep, gmodule_dep, gobject_dep, gio_dep, libdl_dep] +soup_library_deps = [gst_dep, gstbase_dep, gsttag_dep, gmodule_dep, gio_dep, libdl_dep] soup_library_c_args = gst_plugins_good_args if default_library in ['shared', 'both'] diff --git a/subprojects/gst-plugins-good/gst/imagefreeze/meson.build b/subprojects/gst-plugins-good/gst/imagefreeze/meson.build index ce50e6dd93..0ececc9687 100644 --- a/subprojects/gst-plugins-good/gst/imagefreeze/meson.build +++ b/subprojects/gst-plugins-good/gst/imagefreeze/meson.build @@ -2,7 +2,7 @@ gstimagefreeze = library('gstimagefreeze', 'gstimagefreeze.c', c_args : gst_plugins_good_args, include_directories : [configinc, libsinc], - dependencies : glib_deps + [gst_dep], + dependencies : [gst_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-good/gst/rtsp/meson.build b/subprojects/gst-plugins-good/gst/rtsp/meson.build index d60d9a975c..d43c5b8d9f 100644 --- a/subprojects/gst-plugins-good/gst/rtsp/meson.build +++ b/subprojects/gst-plugins-good/gst/rtsp/meson.build @@ -10,7 +10,7 @@ gstrtsp = library('gstrtsp', rtsp_sources, c_args : gst_plugins_good_args, include_directories : [configinc, libsinc], - dependencies : [gstbase_dep, gio_dep, gstrtp_dep, gstrtsp_dep, gstsdp_dep, gstnet_dep], + dependencies : [gstbase_dep, gstrtp_dep, gstrtsp_dep, gstsdp_dep, gstnet_dep, gio_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-good/gst/shapewipe/meson.build b/subprojects/gst-plugins-good/gst/shapewipe/meson.build index 2dff8df4f2..97fb52ab2a 100644 --- a/subprojects/gst-plugins-good/gst/shapewipe/meson.build +++ b/subprojects/gst-plugins-good/gst/shapewipe/meson.build @@ -2,7 +2,7 @@ gstshapewipe = library('gstshapewipe', 'gstshapewipe.c', c_args : gst_plugins_good_args, include_directories : [configinc], - dependencies : [gio_dep, gst_dep, gstvideo_dep], + dependencies : [gst_dep, gstvideo_dep, gio_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index ff23fe0a37..6a0ef3d75f 100644 --- a/subprojects/gst-plugins-good/meson.build +++ b/subprojects/gst-plugins-good/meson.build @@ -369,9 +369,8 @@ if not zlib_dep.found() endif cdata.set('HAVE_ZLIB', true) -glib_deps = [dependency('glib-2.0', version : glib_req, fallback: ['glib', 'libglib_dep']), - dependency('gobject-2.0', fallback: ['glib', 'libgobject_dep'])] -gio_dep = dependency('gio-2.0', fallback: ['glib', 'libgio_dep']) +gio_dep = dependency('gio-2.0', version: glib_req) +gmodule_dep = dependency('gmodule-2.0') gst_plugins_good_args = ['-DHAVE_CONFIG_H'] configinc = include_directories('.') diff --git a/subprojects/gst-plugins-good/tests/check/meson.build b/subprojects/gst-plugins-good/tests/check/meson.build index 93cd2673a8..5625d17e6a 100644 --- a/subprojects/gst-plugins-good/tests/check/meson.build +++ b/subprojects/gst-plugins-good/tests/check/meson.build @@ -196,7 +196,7 @@ state_ignore_elements = '''aasink autoaudiosrc autoaudiosink autovideosrc # FIXME: check, also + PTHREAD_CFLAGS test_deps = [gst_dep, gstbase_dep, gstnet_dep, gstcheck_dep, gstaudio_dep, gstvideo_dep, gstpbutils_dep, gstrtp_dep, gstrtsp_dep, gsttag_dep, - gstapp_dep, gio_dep, valgrind_dep] + glib_deps + gstapp_dep, gio_dep, valgrind_dep] # FIXME: add valgrind suppression common/gst.supp gst-plugins-good.supp foreach t : good_tests diff --git a/subprojects/gst-plugins-ugly/ext/dvdread/meson.build b/subprojects/gst-plugins-ugly/ext/dvdread/meson.build index a1cbfdcb38..44e247bcc9 100644 --- a/subprojects/gst-plugins-ugly/ext/dvdread/meson.build +++ b/subprojects/gst-plugins-ugly/ext/dvdread/meson.build @@ -5,7 +5,7 @@ dvdread_opt = get_option('dvdread').require(gpl_allowed, error_message: ''' dvdread_dep = dependency('dvdread', version : '>= 0.5.0', required : dvdread_opt) -if gmodule_dep.found() and dvdread_dep.found() +if dvdread_dep.found() dvdread = library('gstdvdread', ['dvdreadsrc.c'], c_args : ugly_args, diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build index 5138cb21ab..15ad4c4eef 100644 --- a/subprojects/gst-plugins-ugly/meson.build +++ b/subprojects/gst-plugins-ugly/meson.build @@ -187,7 +187,7 @@ else cdata.set('DISABLE_ORC', 1) endif -gmodule_dep = dependency('gmodule-2.0', fallback : ['glib', 'libgmodule_dep']) +gmodule_dep = dependency('gmodule-2.0', version: glib_req) if gmodule_dep.version().version_compare('< 2.67.4') cdata.set('g_memdup2(ptr,sz)', '(G_LIKELY(((guint64)(sz)) < G_MAXUINT)) ? g_memdup(ptr,sz) : (g_abort(),NULL)') diff --git a/subprojects/gst-python/plugin/meson.build b/subprojects/gst-python/plugin/meson.build index 4aa7ec2221..b50013bd9d 100644 --- a/subprojects/gst-python/plugin/meson.build +++ b/subprojects/gst-python/plugin/meson.build @@ -1,7 +1,7 @@ gstpython = library('gstpython', ['gstpythonplugin.c'], include_directories : [configinc], - dependencies : [gst_dep, pygobject_dep, gstbase_dep, python_dep, gmodule_dep], + dependencies : [gst_dep, pygobject_dep, gstbase_dep, python_dep, gmodule_dep] , install : true, install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')), ) diff --git a/subprojects/gst-rtsp-server/examples/meson.build b/subprojects/gst-rtsp-server/examples/meson.build index 9352f4ea58..21b907c218 100644 --- a/subprojects/gst-rtsp-server/examples/meson.build +++ b/subprojects/gst-rtsp-server/examples/meson.build @@ -26,7 +26,7 @@ foreach example : examples executable(example, '@0@.c'.format(example), c_args : rtspserver_args, include_directories : rtspserver_incs, - dependencies : [glib_dep, gst_dep, gstapp_dep, gstnet_dep, gst_rtsp_server_dep], + dependencies : [gst_dep, gstapp_dep, gstnet_dep, gst_rtsp_server_dep], install: false) endforeach @@ -35,6 +35,6 @@ if cgroup_dep.found() executable('test-cgroups', 'test-cgroups.c', c_args : rtspserver_args, include_directories : rtspserver_incs, - dependencies : [glib_dep, gst_dep, gstnet_dep, gst_rtsp_server_dep, cgroup_dep], + dependencies : [gst_dep, gstnet_dep, gst_rtsp_server_dep, cgroup_dep], install: false) endif diff --git a/subprojects/gst-rtsp-server/meson.build b/subprojects/gst-rtsp-server/meson.build index 65bd9a78af..945655e21b 100644 --- a/subprojects/gst-rtsp-server/meson.build +++ b/subprojects/gst-rtsp-server/meson.build @@ -139,8 +139,6 @@ endforeach rtspserver_incs = include_directories('gst/rtsp-server', '.') -glib_dep = dependency('glib-2.0', version : glib_req, - fallback: ['glib', 'libglib_dep']) gst_dep = dependency('gstreamer-1.0', version : gst_req, fallback : ['gstreamer', 'gst_dep']) gstrtsp_dep = dependency('gstreamer-rtsp-1.0', version : gst_req, diff --git a/subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapifilter.c b/subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapifilter.c index 675c481b3f..28393e85d0 100644 --- a/subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapifilter.c +++ b/subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/gstvaapifilter.c @@ -20,6 +20,8 @@ * Boston, MA 02110-1301 USA */ +#include "config.h" + #include "sysdeps.h" #include "gstvaapicompat.h" #include "gstvaapifilter.h" diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build index a110942559..058933bf88 100644 --- a/subprojects/gstreamer-vaapi/meson.build +++ b/subprojects/gstreamer-vaapi/meson.build @@ -21,7 +21,6 @@ else endif libva_req = ['>= 0.39.0', '!= 0.99.0'] -glib_req = '>= 2.44.0' libwayland_req = '>= 1.11.0' libdrm_req = '>= 2.4.98' gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor) @@ -95,7 +94,7 @@ libudev_dep = dependency('libudev', required: get_option('drm')) x11_dep = dependency('x11', required: get_option('x11')) xrandr_dep = dependency('xrandr', required: get_option('x11')) -gmodule_dep = dependency('gmodule-2.0', required: get_option('egl')) +gmodule_dep = dependency('gmodule-2.0') egl_dep = dependency('egl', required: get_option('egl')) glesv2_dep = dependency('glesv2', required: false) @@ -139,8 +138,7 @@ USE_AV1_DECODER = libva_dep.version().version_compare('>= 1.10') USE_DRM = (libva_drm_dep.found() and libdrm_dep.found() and libudev_dep.found()) -USE_EGL = (gmodule_dep.found() - and egl_dep.found() +USE_EGL = (egl_dep.found() and GLES_VERSION_MASK != 0) USE_WAYLAND = (libva_wayland_dep.found() and wayland_client_dep.found() diff --git a/subprojects/gstreamer/docs/meson.build b/subprojects/gstreamer/docs/meson.build index 26331d7f3a..d2cc58cff7 100644 --- a/subprojects/gstreamer/docs/meson.build +++ b/subprojects/gstreamer/docs/meson.build @@ -12,7 +12,7 @@ hotdoc_plugin_scanner = executable('gst-hotdoc-plugins-scanner', 'gst-hotdoc-plugins-scanner.c', c_args : gst_c_args, include_directories : [configinc], - dependencies : [gobject_dep, gmodule_dep, glib_dep, gio_dep, gst_dep], + dependencies : [gst_dep, gmodule_dep, gio_dep], install_dir : helpers_install_dir, link_with: [printf_lib], install: true, @@ -121,7 +121,7 @@ libs_doc = [hotdoc.generate_doc('gstreamer', gi_index: 'gst/gi-index.md', gi_smart_index: true, gi_c_source_roots: [join_paths(meson.current_source_dir(), '../gst/'), ], - dependencies: [gst_dep, glib_dep, gobject_dep, gmodule_dep, hotdoc_plugin_scanner], + dependencies: [gst_dep, gmodule_dep, hotdoc_plugin_scanner], extra_assets: [join_paths(meson.current_source_dir(), 'images')], )] diff --git a/subprojects/gstreamer/libs/gst/base/meson.build b/subprojects/gstreamer/libs/gst/base/meson.build index 04ebd5228e..1c1c12549a 100644 --- a/subprojects/gstreamer/libs/gst/base/meson.build +++ b/subprojects/gstreamer/libs/gst/base/meson.build @@ -46,7 +46,7 @@ gst_base = library('gstbase-@0@'.format(apiversion), darwin_versions : osxversion, install : true, include_directories : [configinc, libsinc], - dependencies : [gobject_dep, glib_dep, gst_dep], + dependencies : [gst_dep], ) library_def = {'lib': gst_base} diff --git a/subprojects/gstreamer/libs/gst/check/meson.build b/subprojects/gstreamer/libs/gst/check/meson.build index 22cd3bea7b..8dbda58759 100644 --- a/subprojects/gstreamer/libs/gst/check/meson.build +++ b/subprojects/gstreamer/libs/gst/check/meson.build @@ -45,7 +45,7 @@ gst_check = library('gstcheck-@0@'.format(apiversion), install : true, include_directories : [configinc, libsinc], link_with : [libcheck], - dependencies : [gobject_dep, glib_dep, gst_dep], + dependencies : [gst_dep], ) library_def = {'lib': gst_check} diff --git a/subprojects/gstreamer/libs/gst/controller/meson.build b/subprojects/gstreamer/libs/gst/controller/meson.build index 57f22e8af6..f087f62c13 100644 --- a/subprojects/gstreamer/libs/gst/controller/meson.build +++ b/subprojects/gstreamer/libs/gst/controller/meson.build @@ -45,7 +45,7 @@ gst_controller = library('gstcontroller-@0@'.format(apiversion), soversion : soversion, darwin_versions : osxversion, include_directories : [configinc, libsinc], - dependencies : [gobject_dep, glib_dep, mathlib, gst_dep], + dependencies : [mathlib, gst_dep], ) library_def = {'lib': gst_controller} diff --git a/subprojects/gstreamer/libs/gst/helpers/meson.build b/subprojects/gstreamer/libs/gst/helpers/meson.build index a6ca092c02..290c84bb0f 100644 --- a/subprojects/gstreamer/libs/gst/helpers/meson.build +++ b/subprojects/gstreamer/libs/gst/helpers/meson.build @@ -2,7 +2,7 @@ exe = executable('gst-plugin-scanner', 'gst-plugin-scanner.c', c_args : gst_c_args, include_directories : [configinc], - dependencies : [gobject_dep, gmodule_dep, glib_dep, mathlib, gst_dep], + dependencies : [gst_dep, mathlib, gmodule_dep,], install_dir : helpers_install_dir, install: true, ) @@ -17,7 +17,7 @@ if bashcomp_found 'gst-completion-helper.c', c_args : gst_c_args, include_directories : [configinc], - dependencies : [gobject_dep, glib_dep, gst_dep], + dependencies : [gst_dep], install_dir : helpers_install_dir, install: true, ) @@ -114,7 +114,7 @@ if have_ptp exe = executable('gst-ptp-helper', 'gst-ptp-helper.c', c_args : gst_c_args, include_directories : [configinc, libsinc], - dependencies : [gio_dep, gobject_dep, glib_dep, mathlib, gst_dep, cap_dep], + dependencies : [gst_dep, gio_dep, mathlib, cap_dep], install_dir : helpers_install_dir, install : true) diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build index 46551c7978..e31a3b520f 100644 --- a/subprojects/gstreamer/meson.build +++ b/subprojects/gstreamer/meson.build @@ -524,18 +524,13 @@ privinc = include_directories('gst') # Find dependencies glib_dep = dependency('glib-2.0', version : '>=2.56.0', fallback: ['glib', 'libglib_dep']) -gobject_dep = dependency('gobject-2.0', - fallback: ['glib', 'libgobject_dep']) -gmodule_dep = dependency('gmodule-2.0', - fallback: ['glib', 'libgmodule_dep']) +gobject_dep = dependency('gobject-2.0') +gmodule_dep = dependency('gmodule-2.0') if host_system == 'windows' - gio_dep = dependency('gio-2.0', - fallback: ['glib', 'libgio_dep']) + gio_dep = dependency('gio-2.0') else - gio_dep = [dependency('gio-2.0', - fallback: ['glib', 'libgio_dep']), - dependency('gio-unix-2.0', - fallback: ['glib', 'libgio_dep'])] + gio_dep = [dependency('gio-2.0'), + dependency('gio-unix-2.0')] endif mathlib = cc.find_library('m', required : false) diff --git a/subprojects/gstreamer/plugins/elements/meson.build b/subprojects/gstreamer/plugins/elements/meson.build index 574ee87b85..45a6f3c866 100644 --- a/subprojects/gstreamer/plugins/elements/meson.build +++ b/subprojects/gstreamer/plugins/elements/meson.build @@ -30,7 +30,7 @@ gst_elements = library('gstcoreelements', gst_elements_sources, c_args : gst_c_args, include_directories : [configinc], - dependencies : [gobject_dep, glib_dep, gst_dep, gst_base_dep], + dependencies : [gst_dep, gst_base_dep], install : true, install_dir : plugins_install_dir, ) diff --git a/subprojects/gstreamer/tests/benchmarks/meson.build b/subprojects/gstreamer/tests/benchmarks/meson.build index 598f19c8d2..a40f0a906f 100644 --- a/subprojects/gstreamer/tests/benchmarks/meson.build +++ b/subprojects/gstreamer/tests/benchmarks/meson.build @@ -14,6 +14,6 @@ benchmarks = [ foreach b : benchmarks executable(b, '@0@.c'.format(b), c_args : gst_c_args, - dependencies : [gobject_dep, gmodule_dep, glib_dep, gst_dep, gst_controller_dep], + dependencies : [gst_dep, gst_controller_dep, gmodule_dep], ) endforeach diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build index 9c4228b6e4..9787b0a0dd 100644 --- a/subprojects/gstreamer/tests/check/meson.build +++ b/subprojects/gstreamer/tests/check/meson.build @@ -135,8 +135,7 @@ if get_option('check').disabled() endif endif -glib_deps = [gio_dep, gobject_dep, gmodule_dep, glib_dep] -gst_deps = [gst_dep, gst_base_dep, gst_check_dep, gst_net_dep, gst_controller_dep] +gst_deps = [gst_dep, gst_base_dep, gst_check_dep, gst_net_dep, gst_controller_dep, gio_dep, gmodule_dep] foreach t : core_tests fname = t[0] @@ -150,7 +149,7 @@ foreach t : core_tests cpp_args : gst_c_args + test_defines, include_directories : [configinc], link_with : link_with_libs, - dependencies : test_deps + glib_deps + gst_deps, + dependencies : gst_deps + test_deps, ) env = environment() diff --git a/subprojects/gstreamer/tests/examples/adapter/meson.build b/subprojects/gstreamer/tests/examples/adapter/meson.build index 200c5c4ab4..971f8223bb 100644 --- a/subprojects/gstreamer/tests/examples/adapter/meson.build +++ b/subprojects/gstreamer/tests/examples/adapter/meson.build @@ -1,7 +1,7 @@ if cdata.has('HAVE_SYS_TIMES_H') and cdata.has('HAVE_UNISTD_H') executable('adapter_test', 'adapter_test.c', install: false, - dependencies : [glib_dep, gobject_dep, gmodule_dep, mathlib, gst_dep, gst_base_dep], + dependencies : [gst_dep, gst_base_dep, gmodule_dep, mathlib], c_args: gst_c_args, ) endif diff --git a/subprojects/gstreamer/tests/examples/controller/meson.build b/subprojects/gstreamer/tests/examples/controller/meson.build index 52896ee33d..d975e02e48 100644 --- a/subprojects/gstreamer/tests/examples/controller/meson.build +++ b/subprojects/gstreamer/tests/examples/controller/meson.build @@ -8,7 +8,7 @@ progs = [ foreach prog : progs executable(prog, prog + '.c', install: false, - dependencies : [glib_dep, gobject_dep, gmodule_dep, mathlib, gst_dep, gst_controller_dep], + dependencies : [gst_dep, gst_controller_dep, gmodule_dep, mathlib], c_args: gst_c_args, ) endforeach @@ -17,7 +17,7 @@ gtk_dep = dependency('gtk+-3.0', required : get_option('examples')) if gtk_dep.found() executable('controller-graph', 'controller-graph.c', install: false, - dependencies : [glib_dep, gobject_dep, gmodule_dep, mathlib, gst_dep, gst_controller_dep, gtk_dep], + dependencies : [gst_dep, gst_controller_dep, gmodule_dep, mathlib, gtk_dep], c_args: gst_c_args, ) endif diff --git a/subprojects/gstreamer/tests/examples/helloworld/meson.build b/subprojects/gstreamer/tests/examples/helloworld/meson.build index 5eea10bee8..6a4afc8995 100644 --- a/subprojects/gstreamer/tests/examples/helloworld/meson.build +++ b/subprojects/gstreamer/tests/examples/helloworld/meson.build @@ -1,5 +1,5 @@ executable('helloworld', 'helloworld.c', install: false, - dependencies : [glib_dep, gobject_dep, gmodule_dep, mathlib, gst_dep], + dependencies : [gst_dep, gmodule_dep, mathlib], c_args: gst_c_args, ) diff --git a/subprojects/gstreamer/tests/examples/memory/meson.build b/subprojects/gstreamer/tests/examples/memory/meson.build index edce02a36c..9786e244f5 100644 --- a/subprojects/gstreamer/tests/examples/memory/meson.build +++ b/subprojects/gstreamer/tests/examples/memory/meson.build @@ -1,5 +1,5 @@ executable('memory_test', 'memory_test.c', 'my-memory.c', 'my-vidmem.c', install: false, - dependencies : [glib_dep, gobject_dep, gmodule_dep, mathlib, gst_dep], + dependencies : [gst_dep, gmodule_dep, mathlib], c_args: gst_c_args, ) diff --git a/subprojects/gstreamer/tests/examples/netclock/meson.build b/subprojects/gstreamer/tests/examples/netclock/meson.build index 6d9589d0c5..acc2380851 100644 --- a/subprojects/gstreamer/tests/examples/netclock/meson.build +++ b/subprojects/gstreamer/tests/examples/netclock/meson.build @@ -1,11 +1,11 @@ executable('netclock-server', 'netclock-server.c', install: false, - dependencies : [glib_dep, gobject_dep, gmodule_dep, mathlib, gst_dep, gst_net_dep], + dependencies : [gst_dep, gst_net_dep, gmodule_dep, mathlib], c_args: gst_c_args, ) executable('netclock-client', 'netclock-client.c', install: false, - dependencies : [glib_dep, gobject_dep, gmodule_dep, mathlib, gst_dep, gst_net_dep], + dependencies : [gst_dep, gst_net_dep, gmodule_dep, mathlib], c_args: gst_c_args, ) diff --git a/subprojects/gstreamer/tests/examples/ptp/meson.build b/subprojects/gstreamer/tests/examples/ptp/meson.build index 7e89b1e632..920b19289a 100644 --- a/subprojects/gstreamer/tests/examples/ptp/meson.build +++ b/subprojects/gstreamer/tests/examples/ptp/meson.build @@ -1,5 +1,5 @@ executable('ptp-print-times', 'ptp-print-times.c', install: false, - dependencies : [glib_dep, gobject_dep, gmodule_dep, mathlib, gst_dep, gst_net_dep], + dependencies : [gst_dep, gst_net_dep, gmodule_dep, mathlib], c_args: gst_c_args, ) diff --git a/subprojects/gstreamer/tests/examples/stepping/meson.build b/subprojects/gstreamer/tests/examples/stepping/meson.build index e4d4f287ec..5568114ce3 100644 --- a/subprojects/gstreamer/tests/examples/stepping/meson.build +++ b/subprojects/gstreamer/tests/examples/stepping/meson.build @@ -1,5 +1,5 @@ executable('framestep1', 'framestep1.c', install: false, - dependencies : [glib_dep, gobject_dep, gmodule_dep, mathlib, gst_dep], + dependencies : [gst_dep, gmodule_dep, mathlib], c_args: gst_c_args, ) diff --git a/subprojects/gstreamer/tests/examples/streamiddemux/meson.build b/subprojects/gstreamer/tests/examples/streamiddemux/meson.build index 88c4823d59..6de16a72ce 100644 --- a/subprojects/gstreamer/tests/examples/streamiddemux/meson.build +++ b/subprojects/gstreamer/tests/examples/streamiddemux/meson.build @@ -1,5 +1,5 @@ executable('streamiddemux-stream', 'streamiddemux-stream.c', install: false, - dependencies : [glib_dep, gobject_dep, gmodule_dep, mathlib, gst_dep], + dependencies : [gst_dep, gmodule_dep, mathlib], c_args: gst_c_args, ) diff --git a/subprojects/gstreamer/tests/examples/streams/meson.build b/subprojects/gstreamer/tests/examples/streams/meson.build index 88dcc11bc1..6414a09ed1 100644 --- a/subprojects/gstreamer/tests/examples/streams/meson.build +++ b/subprojects/gstreamer/tests/examples/streams/meson.build @@ -1,6 +1,6 @@ executable('stream-status', 'stream-status.c', install: false, - dependencies : [glib_dep, gobject_dep, gmodule_dep, mathlib, gst_dep], + dependencies : [gst_dep, gmodule_dep, mathlib], c_args: gst_c_args, ) @@ -8,7 +8,7 @@ if cc.has_header('pthread.h') threads_dep = dependency('threads') executable('rtpool-test', 'rtpool-test.c', 'testrtpool.c', install: false, - dependencies : [glib_dep, gobject_dep, gmodule_dep, mathlib, gst_dep, threads_dep], + dependencies : [gst_dep, threads_dep, gmodule_dep, mathlib], c_args: gst_c_args, ) endif