From 1ecb4407059f4235a6dca3c8f9900ee0ac69ce1a Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 18 Apr 2022 16:52:48 +0100 Subject: [PATCH] meson: replace deprecated dep.get_pkgconfig_variable(...) with dep.get_variable(pkgconfig : ...) The former is deprecated since meson 0.56, while the latter is available since meson 0.51, and we currently require meson 0.53+. Part-of: --- meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 1c7c6beeda8..a544b37b7a5 100644 --- a/meson.build +++ b/meson.build @@ -784,10 +784,10 @@ omx_drivers_path = get_option('omx-libs-path') if with_gallium_omx != 'disabled' # Figure out where to put the omx driver. # FIXME: this could all be vastly simplified by adding a 'defined_variable' - # argument to meson's get_pkgconfig_variable method. + # argument to meson's get_variable method. if omx_drivers_path == '' - _omx_libdir = dep_omx.get_pkgconfig_variable('libdir') - _omx_drivers_dir = dep_omx.get_pkgconfig_variable('pluginsdir') + _omx_libdir = dep_omx.get_variable(pkgconfig : 'libdir') + _omx_drivers_dir = dep_omx.get_variable(pkgconfig : 'pluginsdir') if _omx_libdir == get_option('libdir') omx_drivers_path = _omx_drivers_dir else @@ -1995,7 +1995,7 @@ endif if with_platform_wayland dep_wl_scanner = dependency('wayland-scanner', native: true) - prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) + prog_wl_scanner = find_program(dep_wl_scanner.get_variable(pkgconfig : 'wayland_scanner')) if dep_wl_scanner.version().version_compare('>= 1.15') wl_scanner_arg = 'private-code' else @@ -2009,7 +2009,7 @@ if with_platform_wayland dep_wayland_egl_headers = dep_wayland_egl.partial_dependency(compile_args : true) endif wayland_dmabuf_xml = join_paths( - dep_wl_protocols.get_pkgconfig_variable('pkgdatadir'), 'unstable', + dep_wl_protocols.get_variable(pkgconfig : 'pkgdatadir'), 'unstable', 'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml' ) pre_args += '-DWL_HIDE_DEPRECATED'