mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-02 02:03:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: update for dep.get_pkgconfig_variable() deprecation

Browse source 
... 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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1183>
This commit is contained in:
Tim-Philipp Müller 2021-10-18 00:40:14 +01:00 committed by GStreamer Marge Bot
parent 531aa4064a
commit f1bb2c76c6
36 changed files with 68 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gst-devtools/validate/tests/meson.build
View file

@ -2,9 +2,9 @@ pluginsdirs = [ ]
if gst_dep.type_name() == 'pkgconfig' if gst_dep.type_name() == 'pkgconfig'
pbase = dependency('gstreamer-plugins-base-' + apiversion) pbase = dependency('gstreamer-plugins-base-' + apiversion)
pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), pluginsdirs = [gst_dep.get_variable('pluginsdir'),
pbase.get_pkgconfig_variable('pluginsdir')] pbase.get_variable('pluginsdir')]
gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir')
else else
gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir')
endif endif

2
subprojects/gst-editing-services/docs/meson.build
View file

@ -32,7 +32,7 @@ if gst_dep.type_name() == 'internal'
gst_proj = subproject('gstreamer') gst_proj = subproject('gstreamer')
plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator')
else 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 endif
plugins_cache = join_paths(meson.current_source_dir(), 'gst_plugins_cache.json') plugins_cache = join_paths(meson.current_source_dir(), 'gst_plugins_cache.json')

8
subprojects/gst-editing-services/tests/check/meson.build
View file

@ -39,10 +39,10 @@ if gst_dep.type_name() == 'pkgconfig'
pbase = dependency('gstreamer-plugins-base-' + apiversion, required : false) pbase = dependency('gstreamer-plugins-base-' + apiversion, required : false)
pbad = dependency('gstreamer-plugins-bad-' + apiversion, required : false) pbad = dependency('gstreamer-plugins-bad-' + apiversion, required : false)
pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), pluginsdirs = [gst_dep.get_variable('pluginsdir'),
pbase.get_pkgconfig_variable('pluginsdir'), pbase.get_variable('pluginsdir'),
pbad.get_pkgconfig_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 else
gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir')
endif endif

4
subprojects/gst-editing-services/tools/meson.build
View file

@ -25,7 +25,7 @@ bashcomp_found = false
if bashcomp_dep.found() if bashcomp_dep.found()
bashcomp_found = true bashcomp_found = true
bashcomp_dir_override = bashcomp_dep.version().version_compare('>= 2.10') ? ['datadir', datadir] : ['prefix', prefix] 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 == '' if bash_completions_dir == ''
msg = 'Found bash-completion but the .pc file did not set \'completionsdir\'.' msg = 'Found bash-completion but the .pc file did not set \'completionsdir\'.'
if bashcomp_option.enabled() if bashcomp_option.enabled()
@ -36,7 +36,7 @@ if bashcomp_dep.found()
bashcomp_found = false bashcomp_found = false
endif 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 == '' if bash_helpers_dir == ''
msg = 'Found bash-completion, but the .pc file did not set \'helpersdir\'.' msg = 'Found bash-completion, but the .pc file did not set \'helpersdir\'.'
if bashcomp_option.enabled() if bashcomp_option.enabled()

2
subprojects/gst-libav/docs/meson.build
View file

@ -14,7 +14,7 @@ if gst_dep.type_name() == 'internal'
gst_proj = subproject('gstreamer') gst_proj = subproject('gstreamer')
plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator')
else 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) required: false)
endif endif

6
subprojects/gst-libav/tests/check/meson.build
View file

@ -19,9 +19,9 @@ test_defines = [
pluginsdirs = [] pluginsdirs = []
if gst_dep.type_name() == 'pkgconfig' if gst_dep.type_name() == 'pkgconfig'
pbase = dependency('gstreamer-plugins-base-' + api_version, required: true) pbase = dependency('gstreamer-plugins-base-' + api_version, required: true)
pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), pluginsdirs = [gst_dep.get_variable('pluginsdir'),
pbase.get_pkgconfig_variable('pluginsdir')] pbase.get_variable('pluginsdir')]
gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir')
else else
gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir')
endif endif

2
subprojects/gst-omx/docs/meson.build
View file

@ -15,7 +15,7 @@ if gst_dep.type_name() == 'internal'
plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator')
else else
required_hotdoc_extensions += ['gst-extension'] 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) required: false)
endif endif

8
subprojects/gst-omx/meson.build
View file

@ -188,8 +188,8 @@ elif omx_target == 'rpi'
if gstgl_dep.found() if gstgl_dep.found()
if gstgl_dep.type_name() == 'pkgconfig' if gstgl_dep.type_name() == 'pkgconfig'
gl_winsys = gstgl_dep.get_pkgconfig_variable('gl_winsys').split(' ') gl_winsys = gstgl_dep.get_variable('gl_winsys').split(' ')
gl_platforms = gstgl_dep.get_pkgconfig_variable('gl_platforms').split(' ') gl_platforms = gstgl_dep.get_variable('gl_platforms').split(' ')
elif gstgl_dep.type_name() == 'internal' elif gstgl_dep.type_name() == 'internal'
# XXX assume gst-plugins-base was built with dispmanx and egl support # XXX assume gst-plugins-base was built with dispmanx and egl support
gl_winsys = ['dispmanx'] gl_winsys = ['dispmanx']
@ -219,8 +219,8 @@ elif omx_target == 'tizonia'
endif endif
cdata.set('USE_OMX_TARGET_TIZONIA', 1) cdata.set('USE_OMX_TARGET_TIZONIA', 1)
tizil_dep = dependency('tizilheaders', version : tizil_req) tizil_dep = dependency('tizilheaders', version : tizil_req)
cdata.set('TIZONIA_LIBDIR', tizil_dep.get_pkgconfig_variable('libdir')) cdata.set('TIZONIA_LIBDIR', tizil_dep.get_variable('libdir'))
tizil_includedir = tizil_dep.get_pkgconfig_variable('includedir') tizil_includedir = tizil_dep.get_variable('includedir')
gst_omx_args += ['-I' + tizil_includedir + '/tizonia'] gst_omx_args += ['-I' + tizil_includedir + '/tizonia']
omx_inc = [] omx_inc = []
else else

4
subprojects/gst-omx/tests/check/meson.build
View file

@ -12,8 +12,8 @@ test_defines = [
pluginsdirs = [] pluginsdirs = []
if gst_dep.type_name() == 'pkgconfig' if gst_dep.type_name() == 'pkgconfig'
pbase = dependency('gstreamer-plugins-base-' + api_version, required : false) pbase = dependency('gstreamer-plugins-base-' + api_version, required : false)
pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), pluginsdirs = [gst_dep.get_variable('pluginsdir'),
pbase.get_pkgconfig_variable('pluginsdir')] pbase.get_variable('pluginsdir')]
endif endif
state_ignore_elements='' state_ignore_elements=''

2
subprojects/gst-plugins-bad/docs/meson.build
View file

@ -31,7 +31,7 @@ if gst_dep.type_name() == 'internal'
gst_proj = subproject('gstreamer') gst_proj = subproject('gstreamer')
plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator')
else 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) required: false)
endif endif

2
subprojects/gst-plugins-bad/ext/onnx/meson.build
View file

@ -6,7 +6,7 @@ endif
onnxrt_dep = dependency('libonnxruntime',required : get_option('onnx')) onnxrt_dep = dependency('libonnxruntime',required : get_option('onnx'))
if onnxrt_dep.found() 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_includes = [onnxrt_include_root / 'core/session', onnxrt_include_root / 'core']
onnxrt_dep_args = [] onnxrt_dep_args = []

2
subprojects/gst-plugins-bad/ext/opencv/meson.build
View file

@ -84,7 +84,7 @@ if not opencv_found
endif endif
if opencv_found if opencv_found
opencv_prefix = opencv_dep.get_pkgconfig_variable('prefix') opencv_prefix = opencv_dep.get_variable('prefix')
gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"']
# Check the data dir used by opencv for its xml data files # Check the data dir used by opencv for its xml data files

2
subprojects/gst-plugins-bad/ext/wayland/meson.build
View file

@ -11,7 +11,7 @@ wl_sources = [
libdrm_dep = dependency('libdrm', version: '>= 2.4.55', required:get_option('wayland')) libdrm_dep = dependency('libdrm', version: '>= 2.4.55', required:get_option('wayland'))
if use_wayland if use_wayland
protocols_datadir = wl_protocol_dep.get_pkgconfig_variable('pkgdatadir') protocols_datadir = wl_protocol_dep.get_variable('pkgdatadir')
protocol_defs = [ protocol_defs = [
['/stable/viewporter/viewporter.xml', 'viewporter-protocol.c', 'viewporter-client-protocol.h'], ['/stable/viewporter/viewporter.xml', 'viewporter-protocol.c', 'viewporter-client-protocol.h'],

6
subprojects/gst-plugins-bad/meson.build
View file

@ -315,9 +315,9 @@ gstglegl_dep = dependency('', required : false)
if gstgl_dep.found() if gstgl_dep.found()
if gstgl_dep.type_name() == 'pkgconfig' if gstgl_dep.type_name() == 'pkgconfig'
gst_gl_apis = gstgl_dep.get_pkgconfig_variable('gl_apis').split() gst_gl_apis = gstgl_dep.get_variable('gl_apis').split()
gst_gl_winsys = gstgl_dep.get_pkgconfig_variable('gl_winsys').split() gst_gl_winsys = gstgl_dep.get_variable('gl_winsys').split()
gst_gl_platforms = gstgl_dep.get_pkgconfig_variable('gl_platforms').split() gst_gl_platforms = gstgl_dep.get_variable('gl_platforms').split()
else else
gstbase = subproject('gst-plugins-base') gstbase = subproject('gst-plugins-base')
gst_gl_apis = gstbase.get_variable('enabled_gl_apis') gst_gl_apis = gstbase.get_variable('enabled_gl_apis')

4
subprojects/gst-plugins-bad/sys/msdk/meson.build
View file

@ -46,7 +46,7 @@ if mfx_api != 'oneVPL'
mfx_dep = dependency('libmfx', version: ['>= 1.0', '<= 1.99'], required: false) mfx_dep = dependency('libmfx', version: ['>= 1.0', '<= 1.99'], required: false)
if mfx_dep.found() if mfx_dep.found()
mfx_incdir = mfx_dep.get_pkgconfig_variable('includedir') mfx_incdir = mfx_dep.get_variable('includedir')
mfx_inc = [] mfx_inc = []
use_msdk = true use_msdk = true
else else
@ -75,7 +75,7 @@ if not use_msdk and mfx_api != 'MSDK'
mfx_dep = dependency('vpl', version: '>= 2.2', required: false) mfx_dep = dependency('vpl', version: '>= 2.2', required: false)
if mfx_dep.found() if mfx_dep.found()
mfx_incdir = mfx_dep.get_pkgconfig_variable('includedir') mfx_incdir = mfx_dep.get_variable('includedir')
mfx_inc = [] mfx_inc = []
use_onevpl = true use_onevpl = true
endif endif

6
subprojects/gst-plugins-bad/tests/check/meson.build
View file

@ -168,9 +168,9 @@ pluginsdirs = [ ]
if gst_dep.type_name() == 'pkgconfig' if gst_dep.type_name() == 'pkgconfig'
pbase = dependency('gstreamer-plugins-base-' + api_version) pbase = dependency('gstreamer-plugins-base-' + api_version)
pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), pluginsdirs = [gst_dep.get_variable('pluginsdir'),
pbase.get_pkgconfig_variable('pluginsdir')] pbase.get_variable('pluginsdir')]
gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir')
else else
gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir')
endif endif

2
subprojects/gst-plugins-base/docs/meson.build
View file

@ -33,7 +33,7 @@ if gst_dep.type_name() == 'internal'
gst_proj = subproject('gstreamer') gst_proj = subproject('gstreamer')
plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator')
else 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) required: false)
endif endif

2
subprojects/gst-plugins-base/ext/libvisual/meson.build
View file

@ -7,7 +7,7 @@ libvisual_dep = dependency('libvisual-0.4', version : '>= 0.4.0',
required : get_option('libvisual')) required : get_option('libvisual'))
if libvisual_dep.found() if libvisual_dep.found()
core_conf.set_quoted('LIBVISUAL_PLUGINSBASEDIR', core_conf.set_quoted('LIBVISUAL_PLUGINSBASEDIR',
libvisual_dep.get_pkgconfig_variable('pluginsbasedir')) libvisual_dep.get_variable('pluginsbasedir'))
gstlibvisual = library('gstlibvisual', gstlibvisual = library('gstlibvisual',
libvisual_sources, libvisual_sources,

2
subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build
View file

@ -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() 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 # 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_xml_spec = join_paths(wayland_protocols_basedir, 'stable', 'xdg-shell', 'xdg-shell.xml')
xdg_shell_header = custom_target('xdg-shell-client-header', xdg_shell_header = custom_target('xdg-shell-client-header',
command: [ wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@' ], command: [ wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@' ],

4
subprojects/gst-plugins-base/gst-libs/gst/tag/meson.build
View file

@ -54,8 +54,8 @@ gst_tag_args = [
have_iso_codes = false have_iso_codes = false
iso_codes_dep = dependency('iso-codes', required: get_option('iso-codes')) iso_codes_dep = dependency('iso-codes', required: get_option('iso-codes'))
if iso_codes_dep.found() if iso_codes_dep.found()
if iso_codes_dep.get_pkgconfig_variable('domains').split(' ').contains('iso_639-2') if iso_codes_dep.get_variable('domains').split(' ').contains('iso_639-2')
iso_codes_prefix = iso_codes_dep.get_pkgconfig_variable('prefix') iso_codes_prefix = iso_codes_dep.get_variable('prefix')
if iso_codes_prefix != '' if iso_codes_prefix != ''
core_conf.set_quoted('ISO_CODES_PREFIX', iso_codes_prefix) core_conf.set_quoted('ISO_CODES_PREFIX', iso_codes_prefix)
core_conf.set_quoted('ISO_CODES_VERSION', iso_codes_dep.version()) core_conf.set_quoted('ISO_CODES_VERSION', iso_codes_dep.version())

6
subprojects/gst-plugins-base/meson.build
View file

@ -323,11 +323,11 @@ core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found())
if gio_dep.type_name() == 'pkgconfig' if gio_dep.type_name() == 'pkgconfig'
core_conf.set_quoted('GIO_MODULE_DIR', core_conf.set_quoted('GIO_MODULE_DIR',
gio_dep.get_pkgconfig_variable('giomoduledir')) gio_dep.get_variable('giomoduledir'))
core_conf.set_quoted('GIO_LIBDIR', core_conf.set_quoted('GIO_LIBDIR',
gio_dep.get_pkgconfig_variable('libdir')) gio_dep.get_variable('libdir'))
core_conf.set_quoted('GIO_PREFIX', core_conf.set_quoted('GIO_PREFIX',
gio_dep.get_pkgconfig_variable('prefix')) gio_dep.get_variable('prefix'))
else else
core_conf.set_quoted('GIO_MODULE_DIR', join_paths(get_option('prefix'), core_conf.set_quoted('GIO_MODULE_DIR', join_paths(get_option('prefix'),
get_option('libdir'), 'gio/modules')) get_option('libdir'), 'gio/modules'))

4
subprojects/gst-plugins-base/tests/meson.build
View file

@ -1,7 +1,7 @@
pluginsdirs = [] pluginsdirs = []
if gst_dep.type_name() == 'pkgconfig' if gst_dep.type_name() == 'pkgconfig'
pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir')] pluginsdirs = [gst_dep.get_variable('pluginsdir')]
gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir')
else else
gst_plugin_scanner_dir = gst_proj.get_variable('gst_scanner_dir') gst_plugin_scanner_dir = gst_proj.get_variable('gst_scanner_dir')
endif endif

2
subprojects/gst-plugins-good/docs/meson.build
View file

@ -14,7 +14,7 @@ if gst_dep.type_name() == 'internal'
gst_proj = subproject('gstreamer') gst_proj = subproject('gstreamer')
plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator')
else 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) required: false)
endif endif

6
subprojects/gst-plugins-good/meson.build
View file

@ -293,9 +293,9 @@ have_gstgl = gstgl_dep.found()
if have_gstgl if have_gstgl
if gstgl_dep.type_name() == 'pkgconfig' if gstgl_dep.type_name() == 'pkgconfig'
gst_gl_apis = gstgl_dep.get_pkgconfig_variable('gl_apis').split() gst_gl_apis = gstgl_dep.get_variable('gl_apis').split()
gst_gl_winsys = gstgl_dep.get_pkgconfig_variable('gl_winsys').split() gst_gl_winsys = gstgl_dep.get_variable('gl_winsys').split()
gst_gl_platforms = gstgl_dep.get_pkgconfig_variable('gl_platforms').split() gst_gl_platforms = gstgl_dep.get_variable('gl_platforms').split()
else else
gstbase = subproject('gst-plugins-base') gstbase = subproject('gst-plugins-base')
gst_gl_apis = gstbase.get_variable('enabled_gl_apis') gst_gl_apis = gstbase.get_variable('enabled_gl_apis')

6
subprojects/gst-plugins-good/tests/check/meson.build
View file

@ -167,9 +167,9 @@ test_defines = [
pluginsdirs = [] pluginsdirs = []
if gst_dep.type_name() == 'pkgconfig' if gst_dep.type_name() == 'pkgconfig'
pbase = dependency('gstreamer-plugins-base-' + api_version, required: true) pbase = dependency('gstreamer-plugins-base-' + api_version, required: true)
pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), pluginsdirs = [gst_dep.get_variable('pluginsdir'),
pbase.get_pkgconfig_variable('pluginsdir')] pbase.get_variable('pluginsdir')]
gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir')
else else
gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir')
endif endif

2
subprojects/gst-plugins-ugly/docs/meson.build
View file

@ -15,7 +15,7 @@ if gst_dep.type_name() == 'internal'
gst_proj = subproject('gstreamer') gst_proj = subproject('gstreamer')
plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator')
else 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) required: false)
endif endif

6
subprojects/gst-plugins-ugly/tests/check/meson.build
View file

@ -24,9 +24,9 @@ test_defines = [
pluginsdirs = [] pluginsdirs = []
if gst_dep.type_name() == 'pkgconfig' if gst_dep.type_name() == 'pkgconfig'
pbase = dependency('gstreamer-plugins-base-' + api_version, required: true) pbase = dependency('gstreamer-plugins-base-' + api_version, required: true)
pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), pluginsdirs = [gst_dep.get_variable('pluginsdir'),
pbase.get_pkgconfig_variable('pluginsdir')] pbase.get_variable('pluginsdir')]
gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir') gst_plugin_scanner_dir = gst_dep.get_variable('pluginscannerdir')
else else
gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir')
endif endif

4
subprojects/gst-python/testsuite/meson.build
View file

@ -29,8 +29,8 @@ endif
pluginsdirs = [] pluginsdirs = []
if gst_dep.type_name() == 'pkgconfig' if gst_dep.type_name() == 'pkgconfig'
pbase = dependency('gstreamer-plugins-base-' + api_version, required : false) pbase = dependency('gstreamer-plugins-base-' + api_version, required : false)
pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), pluginsdirs = [gst_dep.get_variable('pluginsdir'),
pbase.get_pkgconfig_variable('pluginsdir')] pbase.get_variable('pluginsdir')]
endif endif
pypluginsdir = [join_paths (meson.build_root(), 'plugin'), meson.current_source_dir()] pypluginsdir = [join_paths (meson.build_root(), 'plugin'), meson.current_source_dir()]

2
subprojects/gst-rtsp-server/docs/meson.build
View file

@ -33,7 +33,7 @@ if gst_dep.type_name() == 'internal'
plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator')
else else
required_hotdoc_extensions += ['gst-extension'] 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) required: false)
endif endif

8
subprojects/gst-rtsp-server/tests/check/meson.build
View file

@ -3,11 +3,11 @@ if gst_dep.type_name() == 'pkgconfig'
pbase = dependency('gstreamer-plugins-base-' + api_version, required: true) pbase = dependency('gstreamer-plugins-base-' + api_version, required: true)
pbad = dependency('gstreamer-plugins-bad-' + api_version, required: true) pbad = dependency('gstreamer-plugins-bad-' + api_version, required: true)
pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'), pluginsdirs = [gst_dep.get_variable('pluginsdir'),
pbase.get_pkgconfig_variable('pluginsdir'), pbase.get_variable('pluginsdir'),
pbad.get_pkgconfig_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 else
gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir') gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir')
endif endif

2
subprojects/gstreamer-sharp/meson.build
View file

@ -98,7 +98,7 @@ i = 0
testsenv_ld_library_path = [] testsenv_ld_library_path = []
foreach dep: gst_deps + [ges_dep] foreach dep: gst_deps + [ges_dep]
if dep.type_name() == 'pkgconfig' if dep.type_name() == 'pkgconfig'
testsenv_ld_library_path += [dep.get_pkgconfig_variable('libdir')] testsenv_ld_library_path += [dep.get_variable('libdir')]
else else
depdef = gst_deps_defs[i][1] depdef = gst_deps_defs[i][1]
libname = gst_deps_defs[i].get(2, '') libname = gst_deps_defs[i].get(2, '')

2
subprojects/gstreamer-vaapi/docs/meson.build
View file

@ -14,7 +14,7 @@ if gst_dep.type_name() == 'internal'
gst_proj = subproject('gstreamer') gst_proj = subproject('gstreamer')
plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator') plugins_cache_generator = gst_proj.get_variable('plugins_cache_generator')
else 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) required: false)
endif endif

2
subprojects/gstreamer-vaapi/gst-libs/gst/vaapi/meson.build
View file

@ -171,7 +171,7 @@ endif
if USE_WAYLAND if USE_WAYLAND
# The XDG shell interface needs to be generated first # 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_xml_spec = join_paths(wayland_protocols_basedir, 'stable', 'xdg-shell', 'xdg-shell.xml')
xdg_shell_header = custom_target('vaapi-xdg-shell-client-header', xdg_shell_header = custom_target('vaapi-xdg-shell-client-header',
command: [ wayland_scanner_bin, 'client-header', '@INPUT@', '@OUTPUT@' ], command: [ wayland_scanner_bin, 'client-header', '@INPUT@', '@OUTPUT@' ],

2
subprojects/gstreamer-vaapi/meson.build
View file

@ -148,7 +148,7 @@ if gstgl_dep.found()
endif endif
endif endif
driverdir = libva_dep.get_pkgconfig_variable('driverdir') driverdir = libva_dep.get_variable('driverdir')
if driverdir == '' if driverdir == ''
driverdir = join_paths(get_option('prefix'), get_option('libdir'), 'dri') driverdir = join_paths(get_option('prefix'), get_option('libdir'), 'dri')
endif endif

2
subprojects/gstreamer-vaapi/tests/check/meson.build
View file

@ -17,7 +17,7 @@ test_defines = [
pluginsdirs = [] pluginsdirs = []
if gst_dep.type_name() == 'pkgconfig' if gst_dep.type_name() == 'pkgconfig'
pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir')] pluginsdirs = [gst_dep.get_variable('pluginsdir')]
endif endif
foreach t : tests foreach t : tests

4
subprojects/gstreamer/meson.build
View file

@ -539,7 +539,7 @@ bashcomp_found = false
if bashcomp_dep.found() if bashcomp_dep.found()
bashcomp_found = true bashcomp_found = true
bashcomp_dir_override = bashcomp_dep.version().version_compare('>= 2.10') ? ['datadir', datadir] : ['prefix', prefix] 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 == '' if bash_completions_dir == ''
msg = 'Found bash-completion but the .pc file did not set \'completionsdir\'.' msg = 'Found bash-completion but the .pc file did not set \'completionsdir\'.'
if bashcomp_option.enabled() if bashcomp_option.enabled()
@ -550,7 +550,7 @@ if bashcomp_dep.found()
bashcomp_found = false bashcomp_found = false
endif 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 == '' if bash_helpers_dir == ''
msg = 'Found bash-completion, but the .pc file did not set \'helpersdir\'.' msg = 'Found bash-completion, but the .pc file did not set \'helpersdir\'.'
if bashcomp_option.enabled() if bashcomp_option.enabled()