From: Tim-Philipp Müller Date: Sun, 17 Oct 2021 23:40:14 +0000 (+0100) Subject: meson: update for dep.get_pkgconfig_variable() deprecation X-Git-Tag: 1.19.3~114 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1bb2c76c6a8fff91ecde68f6553ce8e133f7521;p=platform%2Fupstream%2Fgstreamer.git meson: update for dep.get_pkgconfig_variable() deprecation ... in favour of dep.get_variable('foo', ..) which in some cases allows for further cleanups in future since we can extract variables from pkg-config dependencies as well as internal dependencies using this mechanism. Part-of: --- diff --git a/subprojects/gst-devtools/validate/tests/meson.build b/subprojects/gst-devtools/validate/tests/meson.build index 7704328..ebe43eb 100644 --- a/subprojects/gst-devtools/validate/tests/meson.build +++ b/subprojects/gst-devtools/validate/tests/meson.build @@ -2,9 +2,9 @@ pluginsdirs = [ ] if gst_dep.type_name() == 'pkgconfig' pbase = dependency('gstreamer-plugins-base-' + apiversion) - pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), - pbase.get_pkgconfig_variable('pluginsdir')] - gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') + pluginsdirs = [gst_dep.get_variable('pluginsdir'), + pbase.get_variable('pluginsdir')] + gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir') else gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') endif diff --git a/subprojects/gst-editing-services/docs/meson.build b/subprojects/gst-editing-services/docs/meson.build index 9fa31f9..c22a9d4 100644 --- a/subprojects/gst-editing-services/docs/meson.build +++ b/subprojects/gst-editing-services/docs/meson.build @@ -32,7 +32,7 @@ if gst_dep.type_name() == 'internal' gst_proj = subproject('gstreamer') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') else - plugins_cache_generator = find_program(join_paths(gst_dep.get_pkgconfig_variable('libexecdir'), 'gstreamer-' + apiversion, 'gst-plugins-doc-cache-generator'), required: false) + plugins_cache_generator = find_program(join_paths(gst_dep.get_variable('libexecdir'), 'gstreamer-' + apiversion, 'gst-plugins-doc-cache-generator'), required: false) endif plugins_cache = join_paths(meson.current_source_dir(), 'gst_plugins_cache.json') diff --git a/subprojects/gst-editing-services/tests/check/meson.build b/subprojects/gst-editing-services/tests/check/meson.build index 4b5c398..ec73254 100644 --- a/subprojects/gst-editing-services/tests/check/meson.build +++ b/subprojects/gst-editing-services/tests/check/meson.build @@ -39,10 +39,10 @@ if gst_dep.type_name() == 'pkgconfig' pbase = dependency('gstreamer-plugins-base-' + apiversion, required : false) pbad = dependency('gstreamer-plugins-bad-' + apiversion, required : false) - pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), - pbase.get_pkgconfig_variable('pluginsdir'), - pbad.get_pkgconfig_variable('pluginsdir')] - gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') + pluginsdirs = [gst_dep.get_variable('pluginsdir'), + pbase.get_variable('pluginsdir'), + pbad.get_variable('pluginsdir')] + gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir') else gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') endif diff --git a/subprojects/gst-editing-services/tools/meson.build b/subprojects/gst-editing-services/tools/meson.build index 8b3760d..0e73cfa 100644 --- a/subprojects/gst-editing-services/tools/meson.build +++ b/subprojects/gst-editing-services/tools/meson.build @@ -25,7 +25,7 @@ bashcomp_found = false if bashcomp_dep.found() bashcomp_found = true bashcomp_dir_override = bashcomp_dep.version().version_compare('>= 2.10') ? ['datadir', datadir] : ['prefix', prefix] - bash_completions_dir = bashcomp_dep.get_pkgconfig_variable('completionsdir', define_variable: bashcomp_dir_override) + bash_completions_dir = bashcomp_dep.get_variable('completionsdir', pkgconfig_define: bashcomp_dir_override) if bash_completions_dir == '' msg = 'Found bash-completion but the .pc file did not set \'completionsdir\'.' if bashcomp_option.enabled() @@ -36,7 +36,7 @@ if bashcomp_dep.found() bashcomp_found = false endif - bash_helpers_dir = bashcomp_dep.get_pkgconfig_variable('helpersdir', define_variable: bashcomp_dir_override) + bash_helpers_dir = bashcomp_dep.get_variable('helpersdir', pkgconfig_define: bashcomp_dir_override) if bash_helpers_dir == '' msg = 'Found bash-completion, but the .pc file did not set \'helpersdir\'.' if bashcomp_option.enabled() diff --git a/subprojects/gst-libav/docs/meson.build b/subprojects/gst-libav/docs/meson.build index cfbbbd0..b51af66 100644 --- a/subprojects/gst-libav/docs/meson.build +++ b/subprojects/gst-libav/docs/meson.build @@ -14,7 +14,7 @@ if gst_dep.type_name() == 'internal' gst_proj = subproject('gstreamer') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') else - plugins_cache_generator = find_program(join_paths(gst_dep.get_pkgconfig_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), + plugins_cache_generator = find_program(join_paths(gst_dep.get_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), required: false) endif diff --git a/subprojects/gst-libav/tests/check/meson.build b/subprojects/gst-libav/tests/check/meson.build index a967f00..4207055 100644 --- a/subprojects/gst-libav/tests/check/meson.build +++ b/subprojects/gst-libav/tests/check/meson.build @@ -19,9 +19,9 @@ test_defines = [ pluginsdirs = [] if gst_dep.type_name() == 'pkgconfig' pbase = dependency('gstreamer-plugins-base-' + api_version, required: true) - pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), - pbase.get_pkgconfig_variable('pluginsdir')] - gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') + pluginsdirs = [gst_dep.get_variable('pluginsdir'), + pbase.get_variable('pluginsdir')] + gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir') else gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') endif diff --git a/subprojects/gst-omx/docs/meson.build b/subprojects/gst-omx/docs/meson.build index 908b4cf..811929d 100644 --- a/subprojects/gst-omx/docs/meson.build +++ b/subprojects/gst-omx/docs/meson.build @@ -15,7 +15,7 @@ if gst_dep.type_name() == 'internal' plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') else required_hotdoc_extensions += ['gst-extension'] - plugins_cache_generator = find_program(join_paths(gst_dep.get_pkgconfig_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), + plugins_cache_generator = find_program(join_paths(gst_dep.get_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), required: false) endif diff --git a/subprojects/gst-omx/meson.build b/subprojects/gst-omx/meson.build index a04d22b..d8f2fd3 100644 --- a/subprojects/gst-omx/meson.build +++ b/subprojects/gst-omx/meson.build @@ -188,8 +188,8 @@ elif omx_target == 'rpi' if gstgl_dep.found() if gstgl_dep.type_name() == 'pkgconfig' - gl_winsys = gstgl_dep.get_pkgconfig_variable('gl_winsys').split(' ') - gl_platforms = gstgl_dep.get_pkgconfig_variable('gl_platforms').split(' ') + gl_winsys = gstgl_dep.get_variable('gl_winsys').split(' ') + gl_platforms = gstgl_dep.get_variable('gl_platforms').split(' ') elif gstgl_dep.type_name() == 'internal' # XXX assume gst-plugins-base was built with dispmanx and egl support gl_winsys = ['dispmanx'] @@ -219,8 +219,8 @@ elif omx_target == 'tizonia' endif cdata.set('USE_OMX_TARGET_TIZONIA', 1) tizil_dep = dependency('tizilheaders', version : tizil_req) - cdata.set('TIZONIA_LIBDIR', tizil_dep.get_pkgconfig_variable('libdir')) - tizil_includedir = tizil_dep.get_pkgconfig_variable('includedir') + cdata.set('TIZONIA_LIBDIR', tizil_dep.get_variable('libdir')) + tizil_includedir = tizil_dep.get_variable('includedir') gst_omx_args += ['-I' + tizil_includedir + '/tizonia'] omx_inc = [] else diff --git a/subprojects/gst-omx/tests/check/meson.build b/subprojects/gst-omx/tests/check/meson.build index b43a517..0871911 100644 --- a/subprojects/gst-omx/tests/check/meson.build +++ b/subprojects/gst-omx/tests/check/meson.build @@ -12,8 +12,8 @@ test_defines = [ pluginsdirs = [] if gst_dep.type_name() == 'pkgconfig' pbase = dependency('gstreamer-plugins-base-' + api_version, required : false) - pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), - pbase.get_pkgconfig_variable('pluginsdir')] + pluginsdirs = [gst_dep.get_variable('pluginsdir'), + pbase.get_variable('pluginsdir')] endif state_ignore_elements='' diff --git a/subprojects/gst-plugins-bad/docs/meson.build b/subprojects/gst-plugins-bad/docs/meson.build index 8ad00de..310bcaf 100644 --- a/subprojects/gst-plugins-bad/docs/meson.build +++ b/subprojects/gst-plugins-bad/docs/meson.build @@ -31,7 +31,7 @@ if gst_dep.type_name() == 'internal' gst_proj = subproject('gstreamer') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') else - plugins_cache_generator = find_program(join_paths(gst_dep.get_pkgconfig_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), + plugins_cache_generator = find_program(join_paths(gst_dep.get_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), required: false) endif diff --git a/subprojects/gst-plugins-bad/ext/onnx/meson.build b/subprojects/gst-plugins-bad/ext/onnx/meson.build index 9063642..623d2ea 100644 --- a/subprojects/gst-plugins-bad/ext/onnx/meson.build +++ b/subprojects/gst-plugins-bad/ext/onnx/meson.build @@ -6,7 +6,7 @@ endif onnxrt_dep = dependency('libonnxruntime',required : get_option('onnx')) if onnxrt_dep.found() - onnxrt_include_root = onnxrt_dep.get_pkgconfig_variable('includedir') + onnxrt_include_root = onnxrt_dep.get_variable('includedir') onnxrt_includes = [onnxrt_include_root / 'core/session', onnxrt_include_root / 'core'] onnxrt_dep_args = [] diff --git a/subprojects/gst-plugins-bad/ext/opencv/meson.build b/subprojects/gst-plugins-bad/ext/opencv/meson.build index b0bd54e..709c7e6 100644 --- a/subprojects/gst-plugins-bad/ext/opencv/meson.build +++ b/subprojects/gst-plugins-bad/ext/opencv/meson.build @@ -84,7 +84,7 @@ if not opencv_found endif if opencv_found - opencv_prefix = opencv_dep.get_pkgconfig_variable('prefix') + opencv_prefix = opencv_dep.get_variable('prefix') gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] # Check the data dir used by opencv for its xml data files diff --git a/subprojects/gst-plugins-bad/ext/wayland/meson.build b/subprojects/gst-plugins-bad/ext/wayland/meson.build index 75800b2..a3ffb70 100644 --- a/subprojects/gst-plugins-bad/ext/wayland/meson.build +++ b/subprojects/gst-plugins-bad/ext/wayland/meson.build @@ -11,7 +11,7 @@ wl_sources = [ libdrm_dep = dependency('libdrm', version: '>= 2.4.55', required:get_option('wayland')) if use_wayland - protocols_datadir = wl_protocol_dep.get_pkgconfig_variable('pkgdatadir') + protocols_datadir = wl_protocol_dep.get_variable('pkgdatadir') protocol_defs = [ ['/stable/viewporter/viewporter.xml', 'viewporter-protocol.c', 'viewporter-client-protocol.h'], diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index 381e5b1..8a83b64 100644 --- a/subprojects/gst-plugins-bad/meson.build +++ b/subprojects/gst-plugins-bad/meson.build @@ -315,9 +315,9 @@ gstglegl_dep = dependency('', required : false) if gstgl_dep.found() if gstgl_dep.type_name() == 'pkgconfig' - gst_gl_apis = gstgl_dep.get_pkgconfig_variable('gl_apis').split() - gst_gl_winsys = gstgl_dep.get_pkgconfig_variable('gl_winsys').split() - gst_gl_platforms = gstgl_dep.get_pkgconfig_variable('gl_platforms').split() + gst_gl_apis = gstgl_dep.get_variable('gl_apis').split() + gst_gl_winsys = gstgl_dep.get_variable('gl_winsys').split() + gst_gl_platforms = gstgl_dep.get_variable('gl_platforms').split() else gstbase = subproject('gst-plugins-base') gst_gl_apis = gstbase.get_variable('enabled_gl_apis') diff --git a/subprojects/gst-plugins-bad/sys/msdk/meson.build b/subprojects/gst-plugins-bad/sys/msdk/meson.build index c06d63e..b091095 100644 --- a/subprojects/gst-plugins-bad/sys/msdk/meson.build +++ b/subprojects/gst-plugins-bad/sys/msdk/meson.build @@ -46,7 +46,7 @@ if mfx_api != 'oneVPL' mfx_dep = dependency('libmfx', version: ['>= 1.0', '<= 1.99'], required: false) if mfx_dep.found() - mfx_incdir = mfx_dep.get_pkgconfig_variable('includedir') + mfx_incdir = mfx_dep.get_variable('includedir') mfx_inc = [] use_msdk = true else @@ -75,7 +75,7 @@ if not use_msdk and mfx_api != 'MSDK' mfx_dep = dependency('vpl', version: '>= 2.2', required: false) if mfx_dep.found() - mfx_incdir = mfx_dep.get_pkgconfig_variable('includedir') + mfx_incdir = mfx_dep.get_variable('includedir') mfx_inc = [] use_onevpl = true endif diff --git a/subprojects/gst-plugins-bad/tests/check/meson.build b/subprojects/gst-plugins-bad/tests/check/meson.build index 0f59fc2..58e6e25 100644 --- a/subprojects/gst-plugins-bad/tests/check/meson.build +++ b/subprojects/gst-plugins-bad/tests/check/meson.build @@ -168,9 +168,9 @@ pluginsdirs = [ ] if gst_dep.type_name() == 'pkgconfig' pbase = dependency('gstreamer-plugins-base-' + api_version) - pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), - pbase.get_pkgconfig_variable('pluginsdir')] - gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') + pluginsdirs = [gst_dep.get_variable('pluginsdir'), + pbase.get_variable('pluginsdir')] + gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir') else gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') endif diff --git a/subprojects/gst-plugins-base/docs/meson.build b/subprojects/gst-plugins-base/docs/meson.build index a7cc7f6..cdc3924 100644 --- a/subprojects/gst-plugins-base/docs/meson.build +++ b/subprojects/gst-plugins-base/docs/meson.build @@ -33,7 +33,7 @@ if gst_dep.type_name() == 'internal' gst_proj = subproject('gstreamer') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') else - plugins_cache_generator = find_program(join_paths(gst_dep.get_pkgconfig_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), + plugins_cache_generator = find_program(join_paths(gst_dep.get_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), required: false) endif diff --git a/subprojects/gst-plugins-base/ext/libvisual/meson.build b/subprojects/gst-plugins-base/ext/libvisual/meson.build index fb921fd..aa5c1c6 100644 --- a/subprojects/gst-plugins-base/ext/libvisual/meson.build +++ b/subprojects/gst-plugins-base/ext/libvisual/meson.build @@ -7,7 +7,7 @@ libvisual_dep = dependency('libvisual-0.4', version : '>= 0.4.0', required : get_option('libvisual')) if libvisual_dep.found() core_conf.set_quoted('LIBVISUAL_PLUGINSBASEDIR', - libvisual_dep.get_pkgconfig_variable('pluginsbasedir')) + libvisual_dep.get_variable('pluginsbasedir')) gstlibvisual = library('gstlibvisual', libvisual_sources, diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build index 7ed86c9..8111566 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build @@ -599,7 +599,7 @@ if need_win_wayland != 'no' if wayland_client_dep.found() and wayland_cursor_dep.found() and wayland_egl_dep.found() and wayland_protocols_dep.found() and wayland_scanner.found() # Generate the XDG shell interface - wayland_protocols_basedir = wayland_protocols_dep.get_pkgconfig_variable('pkgdatadir') + wayland_protocols_basedir = wayland_protocols_dep.get_variable('pkgdatadir') xdg_shell_xml_spec = join_paths(wayland_protocols_basedir, 'stable', 'xdg-shell', 'xdg-shell.xml') xdg_shell_header = custom_target('xdg-shell-client-header', command: [ wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@' ], diff --git a/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build index e366a1e..7a14fe7 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build +++ b/subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build @@ -54,8 +54,8 @@ gst_tag_args = [ have_iso_codes = false iso_codes_dep = dependency('iso-codes', required: get_option('iso-codes')) if iso_codes_dep.found() - if iso_codes_dep.get_pkgconfig_variable('domains').split(' ').contains('iso_639-2') - iso_codes_prefix = iso_codes_dep.get_pkgconfig_variable('prefix') + if iso_codes_dep.get_variable('domains').split(' ').contains('iso_639-2') + iso_codes_prefix = iso_codes_dep.get_variable('prefix') if iso_codes_prefix != '' core_conf.set_quoted('ISO_CODES_PREFIX', iso_codes_prefix) core_conf.set_quoted('ISO_CODES_VERSION', iso_codes_dep.version()) diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build index c03691c..6bc1aa6 100644 --- a/subprojects/gst-plugins-base/meson.build +++ b/subprojects/gst-plugins-base/meson.build @@ -323,11 +323,11 @@ core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found()) if gio_dep.type_name() == 'pkgconfig' core_conf.set_quoted('GIO_MODULE_DIR', - gio_dep.get_pkgconfig_variable('giomoduledir')) + gio_dep.get_variable('giomoduledir')) core_conf.set_quoted('GIO_LIBDIR', - gio_dep.get_pkgconfig_variable('libdir')) + gio_dep.get_variable('libdir')) core_conf.set_quoted('GIO_PREFIX', - gio_dep.get_pkgconfig_variable('prefix')) + gio_dep.get_variable('prefix')) else core_conf.set_quoted('GIO_MODULE_DIR', join_paths(get_option('prefix'), get_option('libdir'), 'gio/modules')) diff --git a/subprojects/gst-plugins-base/tests/meson.build b/subprojects/gst-plugins-base/tests/meson.build index 25bd349..e10aa9a 100644 --- a/subprojects/gst-plugins-base/tests/meson.build +++ b/subprojects/gst-plugins-base/tests/meson.build @@ -1,7 +1,7 @@ pluginsdirs = [] if gst_dep.type_name() == 'pkgconfig' - pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir')] - gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') + pluginsdirs = [gst_dep.get_variable('pluginsdir')] + gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir') else gst_plugin_scanner_dir = gst_proj.get_variable('gst_scanner_dir') endif diff --git a/subprojects/gst-plugins-good/docs/meson.build b/subprojects/gst-plugins-good/docs/meson.build index 2c12d1d..150e04c 100644 --- a/subprojects/gst-plugins-good/docs/meson.build +++ b/subprojects/gst-plugins-good/docs/meson.build @@ -14,7 +14,7 @@ if gst_dep.type_name() == 'internal' gst_proj = subproject('gstreamer') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') else - plugins_cache_generator = find_program(join_paths(gst_dep.get_pkgconfig_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), + plugins_cache_generator = find_program(join_paths(gst_dep.get_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), required: false) endif diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index 1f86364..f539065 100644 --- a/subprojects/gst-plugins-good/meson.build +++ b/subprojects/gst-plugins-good/meson.build @@ -293,9 +293,9 @@ have_gstgl = gstgl_dep.found() if have_gstgl if gstgl_dep.type_name() == 'pkgconfig' - gst_gl_apis = gstgl_dep.get_pkgconfig_variable('gl_apis').split() - gst_gl_winsys = gstgl_dep.get_pkgconfig_variable('gl_winsys').split() - gst_gl_platforms = gstgl_dep.get_pkgconfig_variable('gl_platforms').split() + gst_gl_apis = gstgl_dep.get_variable('gl_apis').split() + gst_gl_winsys = gstgl_dep.get_variable('gl_winsys').split() + gst_gl_platforms = gstgl_dep.get_variable('gl_platforms').split() else gstbase = subproject('gst-plugins-base') gst_gl_apis = gstbase.get_variable('enabled_gl_apis') diff --git a/subprojects/gst-plugins-good/tests/check/meson.build b/subprojects/gst-plugins-good/tests/check/meson.build index 4460aac..73db4d7 100644 --- a/subprojects/gst-plugins-good/tests/check/meson.build +++ b/subprojects/gst-plugins-good/tests/check/meson.build @@ -167,9 +167,9 @@ test_defines = [ pluginsdirs = [] if gst_dep.type_name() == 'pkgconfig' pbase = dependency('gstreamer-plugins-base-' + api_version, required: true) - pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), - pbase.get_pkgconfig_variable('pluginsdir')] - gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') + pluginsdirs = [gst_dep.get_variable('pluginsdir'), + pbase.get_variable('pluginsdir')] + gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir') else gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') endif diff --git a/subprojects/gst-plugins-ugly/docs/meson.build b/subprojects/gst-plugins-ugly/docs/meson.build index 700cf7e..73a7d05 100644 --- a/subprojects/gst-plugins-ugly/docs/meson.build +++ b/subprojects/gst-plugins-ugly/docs/meson.build @@ -15,7 +15,7 @@ if gst_dep.type_name() == 'internal' gst_proj = subproject('gstreamer') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') else - plugins_cache_generator = find_program(join_paths(gst_dep.get_pkgconfig_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), + plugins_cache_generator = find_program(join_paths(gst_dep.get_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), required: false) endif diff --git a/subprojects/gst-plugins-ugly/tests/check/meson.build b/subprojects/gst-plugins-ugly/tests/check/meson.build index 2c3ecb1..c113037 100644 --- a/subprojects/gst-plugins-ugly/tests/check/meson.build +++ b/subprojects/gst-plugins-ugly/tests/check/meson.build @@ -24,9 +24,9 @@ test_defines = [ pluginsdirs = [] if gst_dep.type_name() == 'pkgconfig' pbase = dependency('gstreamer-plugins-base-' + api_version, required: true) - pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), - pbase.get_pkgconfig_variable('pluginsdir')] - gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') + pluginsdirs = [gst_dep.get_variable('pluginsdir'), + pbase.get_variable('pluginsdir')] + gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir') else gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') endif diff --git a/subprojects/gst-python/testsuite/meson.build b/subprojects/gst-python/testsuite/meson.build index 3d0e993..8b261f4 100644 --- a/subprojects/gst-python/testsuite/meson.build +++ b/subprojects/gst-python/testsuite/meson.build @@ -29,8 +29,8 @@ endif pluginsdirs = [] if gst_dep.type_name() == 'pkgconfig' pbase = dependency('gstreamer-plugins-base-' + api_version, required : false) - pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), - pbase.get_pkgconfig_variable('pluginsdir')] + pluginsdirs = [gst_dep.get_variable('pluginsdir'), + pbase.get_variable('pluginsdir')] endif pypluginsdir = [join_paths (meson.build_root(), 'plugin'), meson.current_source_dir()] diff --git a/subprojects/gst-rtsp-server/docs/meson.build b/subprojects/gst-rtsp-server/docs/meson.build index b7245cc..cc56a16 100644 --- a/subprojects/gst-rtsp-server/docs/meson.build +++ b/subprojects/gst-rtsp-server/docs/meson.build @@ -33,7 +33,7 @@ if gst_dep.type_name() == 'internal' plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') else required_hotdoc_extensions += ['gst-extension'] - plugins_cache_generator = find_program(join_paths(gst_dep.get_pkgconfig_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), + plugins_cache_generator = find_program(join_paths(gst_dep.get_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), required: false) endif diff --git a/subprojects/gst-rtsp-server/tests/check/meson.build b/subprojects/gst-rtsp-server/tests/check/meson.build index 860774a..0cf78aa 100644 --- a/subprojects/gst-rtsp-server/tests/check/meson.build +++ b/subprojects/gst-rtsp-server/tests/check/meson.build @@ -3,11 +3,11 @@ if gst_dep.type_name() == 'pkgconfig' pbase = dependency('gstreamer-plugins-base-' + api_version, required: true) pbad = dependency('gstreamer-plugins-bad-' + api_version, required: true) - pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), - pbase.get_pkgconfig_variable('pluginsdir'), - pbad.get_pkgconfig_variable('pluginsdir')] + pluginsdirs = [gst_dep.get_variable('pluginsdir'), + pbase.get_variable('pluginsdir'), + pbad.get_variable('pluginsdir')] - gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') + gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir') else gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') endif diff --git a/subprojects/gstreamer-sharp/meson.build b/subprojects/gstreamer-sharp/meson.build index 6d69bc2..39403eb 100644 --- a/subprojects/gstreamer-sharp/meson.build +++ b/subprojects/gstreamer-sharp/meson.build @@ -98,7 +98,7 @@ i = 0 testsenv_ld_library_path = [] foreach dep: gst_deps + [ges_dep] if dep.type_name() == 'pkgconfig' - testsenv_ld_library_path += [dep.get_pkgconfig_variable('libdir')] + testsenv_ld_library_path += [dep.get_variable('libdir')] else depdef = gst_deps_defs[i][1] libname = gst_deps_defs[i].get(2, '') diff --git a/subprojects/gstreamer-vaapi/docs/meson.build b/subprojects/gstreamer-vaapi/docs/meson.build index c6fe4a5..3b2a70c 100644 --- a/subprojects/gstreamer-vaapi/docs/meson.build +++ b/subprojects/gstreamer-vaapi/docs/meson.build @@ -14,7 +14,7 @@ if gst_dep.type_name() == 'internal' gst_proj = subproject('gstreamer') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') else - plugins_cache_generator = find_program(join_paths(gst_dep.get_pkgconfig_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), + plugins_cache_generator = find_program(join_paths(gst_dep.get_variable('libexecdir'), 'gstreamer-' + api_version, 'gst-plugins-doc-cache-generator'), required: false) endif diff --git a/subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/meson.build b/subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/meson.build index d4353a4..2e15063 100644 --- a/subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/meson.build +++ b/subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/meson.build @@ -171,7 +171,7 @@ endif if USE_WAYLAND # The XDG shell interface needs to be generated first - wayland_protocols_basedir = wayland_protocols_dep.get_pkgconfig_variable('pkgdatadir') + wayland_protocols_basedir = wayland_protocols_dep.get_variable('pkgdatadir') xdg_shell_xml_spec = join_paths(wayland_protocols_basedir, 'stable', 'xdg-shell', 'xdg-shell.xml') xdg_shell_header = custom_target('vaapi-xdg-shell-client-header', command: [ wayland_scanner_bin, 'client-header', '@INPUT@', '@OUTPUT@' ], diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build index 95ea0cb..0cd820e 100644 --- a/subprojects/gstreamer-vaapi/meson.build +++ b/subprojects/gstreamer-vaapi/meson.build @@ -148,7 +148,7 @@ if gstgl_dep.found() endif endif -driverdir = libva_dep.get_pkgconfig_variable('driverdir') +driverdir = libva_dep.get_variable('driverdir') if driverdir == '' driverdir = join_paths(get_option('prefix'), get_option('libdir'), 'dri') endif diff --git a/subprojects/gstreamer-vaapi/tests/check/meson.build b/subprojects/gstreamer-vaapi/tests/check/meson.build index cedd862..d717437 100644 --- a/subprojects/gstreamer-vaapi/tests/check/meson.build +++ b/subprojects/gstreamer-vaapi/tests/check/meson.build @@ -17,7 +17,7 @@ test_defines = [ pluginsdirs = [] if gst_dep.type_name() == 'pkgconfig' - pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir')] + pluginsdirs = [gst_dep.get_variable('pluginsdir')] endif foreach t : tests diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build index c0169bd..da80a65 100644 --- a/subprojects/gstreamer/meson.build +++ b/subprojects/gstreamer/meson.build @@ -539,7 +539,7 @@ bashcomp_found = false if bashcomp_dep.found() bashcomp_found = true bashcomp_dir_override = bashcomp_dep.version().version_compare('>= 2.10') ? ['datadir', datadir] : ['prefix', prefix] - bash_completions_dir = bashcomp_dep.get_pkgconfig_variable('completionsdir', define_variable: bashcomp_dir_override) + bash_completions_dir = bashcomp_dep.get_variable('completionsdir', pkgconfig_define: bashcomp_dir_override) if bash_completions_dir == '' msg = 'Found bash-completion but the .pc file did not set \'completionsdir\'.' if bashcomp_option.enabled() @@ -550,7 +550,7 @@ if bashcomp_dep.found() bashcomp_found = false endif - bash_helpers_dir = bashcomp_dep.get_pkgconfig_variable('helpersdir', define_variable: bashcomp_dir_override) + bash_helpers_dir = bashcomp_dep.get_variable('helpersdir', pkgconfig_define: bashcomp_dir_override) if bash_helpers_dir == '' msg = 'Found bash-completion, but the .pc file did not set \'helpersdir\'.' if bashcomp_option.enabled()