sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

build: Replace deprecated meson functions

Browse source 
The `dep.get_<type>_variable()` methods have been deprecated in
favor of the generic `dep.get_variable()` method.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2702>
This commit is contained in:
Florian Müllner 2022-11-19 02:16:04 +01:00
parent db2387d7f8
commit c4f43b65ed
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
meson.build
View file

@ -224,7 +224,7 @@ if have_libgudev
udev_dir = get_option('udev_dir')
if udev_dir == ''
udev_dir = udev_dep.get_pkgconfig_variable('udevdir')
udev_dir = udev_dep.get_variable('udevdir')
endif
endif
@ -515,7 +515,7 @@ cdata.set('HAVE_INTROSPECTION', have_introspection)
cdata.set('HAVE_PROFILER', have_profiler)
if have_x11_client
xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base')
xkb_base = xkeyboard_config_dep.get_variable('xkb_base')
cdata.set_quoted('XKB_BASE', xkb_base)
endif
@ -532,7 +532,7 @@ if have_xwayland
xwayland_path = get_option('xwayland_path')
if xwayland_path == ''
if xwayland_dep.found()
xwayland_path = xwayland_dep.get_pkgconfig_variable('xwayland')
xwayland_path = xwayland_dep.get_variable('xwayland')
else
xwayland_path = find_program('Xwayland').path()
endif
@ -551,7 +551,7 @@ if have_xwayland
# For Xwayland -initfd usage
use_initfd = get_option('xwayland_initfd')
if xwayland_dep.found()
xwayland_supports_initfd = xwayland_dep.get_pkgconfig_variable('have_initfd') == 'true'
xwayland_supports_initfd = xwayland_dep.get_variable('have_initfd') == 'true'
else
xwayland_options = run_command(xwayland_path, '-help')
xwayland_supports_initfd = xwayland_options.stderr().contains('-initfd')
@ -572,7 +572,7 @@ if have_xwayland
# For Xwayland -listenfd usage
if xwayland_dep.found()
have_xwayland_listenfd = xwayland_dep.get_pkgconfig_variable('have_listenfd') == 'true'
have_xwayland_listenfd = xwayland_dep.get_variable('have_listenfd') == 'true'
endif
if (have_xwayland_listenfd)
@ -581,7 +581,7 @@ if have_xwayland
# For Xwayland -listenfd usage
if xwayland_dep.found()
have_xwayland_terminate_delay = xwayland_dep.get_pkgconfig_variable('have_terminate_delay') == 'true'
have_xwayland_terminate_delay = xwayland_dep.get_variable('have_terminate_delay') == 'true'
endif
if (have_xwayland_terminate_delay)

6
src/meson.build
View file

@ -882,7 +882,7 @@ if have_profiler
]
if sysprof_dep.type_name() == 'pkgconfig'
sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces')
sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_variable('datadir'), 'dbus-1', 'interfaces')
else
sysprof_dbus_interfaces_dir = join_paths(mutter_srcdir, 'subprojects', 'sysprof', 'src')
endif
@ -980,14 +980,14 @@ if have_wayland
['xwayland-keyboard-grab', 'unstable', 'v1', ],
]
if have_wayland_eglstream
wayland_eglstream_protocols_dir = wayland_eglstream_protocols_dep.get_pkgconfig_variable('pkgdatadir')
wayland_eglstream_protocols_dir = wayland_eglstream_protocols_dep.get_variable('pkgdatadir')
wayland_protocols += [
['wayland-eglstream-controller', 'third-party', wayland_eglstream_protocols_dir],
]
endif
wayland_scanner = find_program('wayland-scanner')
protocols_dir = wayland_protocols_dep.get_pkgconfig_variable('pkgdatadir')
protocols_dir = wayland_protocols_dep.get_variable('pkgdatadir')
assert(protocols_dir != '', 'Could not get pkgdatadir from wayland-protocols.pc')
foreach p: wayland_protocols