From f639c9cac49dfe2529b3cb6c645ed27ea947120f Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 25 Jan 2023 12:11:21 +0100 Subject: [PATCH] build: fix meson deprecation warnings Stop using features that Meson 0.63.0 throws deprecation warnings about: WARNING: Deprecated features used: * 0.56.0: {'dependency.get_pkgconfig_variable'} * 0.62.0: {'pkgconfig.generate variable for builtin directories'} Signed-off-by: Philipp Zabel --- compositor/meson.build | 1 - protocol/meson.build | 2 +- xwayland/meson.build | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/compositor/meson.build b/compositor/meson.build index 37f522903..cf09150e2 100644 --- a/compositor/meson.build +++ b/compositor/meson.build @@ -57,7 +57,6 @@ pkgconfig.generate( description: 'Header files for Weston plugin development', requires_private: [ lib_weston ], variables: [ - 'libexecdir=' + join_paths('${prefix}', get_option('libexecdir')), 'pkglibexecdir=${libexecdir}/weston' ], subdirs: 'weston' diff --git a/protocol/meson.build b/protocol/meson.build index fc3dd9533..1201efaec 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -1,5 +1,5 @@ dep_scanner = dependency('wayland-scanner', native: true) -prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) +prog_scanner = find_program(dep_scanner.get_variable(pkgconfig: 'wayland_scanner')) dep_wp = dependency('wayland-protocols', version: '>= 1.26', fallback: ['wayland-protocols', 'wayland_protocols']) diff --git a/xwayland/meson.build b/xwayland/meson.build index a9a0af30b..a7b3e40c0 100644 --- a/xwayland/meson.build +++ b/xwayland/meson.build @@ -4,7 +4,7 @@ endif xwayland_dep = dependency('xwayland', required: false) if xwayland_dep.found() - if xwayland_dep.get_pkgconfig_variable('have_listenfd') == 'true' + if xwayland_dep.get_variable(pkgconfig: 'have_listenfd') == 'true' config_h.set('HAVE_XWAYLAND_LISTENFD', '1') endif endif