mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16012>
This commit is contained in:
Eric Engestrom 2022-04-18 16:52:48 +01:00 committed by Marge Bot
parent e01f86c67b
commit 1ecb440705
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@ -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'