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 <p.zabel@pengutronix.de>
This commit is contained in:
parent
eb3ad4ec64
commit
f639c9cac4
|
@ -57,7 +57,6 @@ pkgconfig.generate(
|
||||||
description: 'Header files for Weston plugin development',
|
description: 'Header files for Weston plugin development',
|
||||||
requires_private: [ lib_weston ],
|
requires_private: [ lib_weston ],
|
||||||
variables: [
|
variables: [
|
||||||
'libexecdir=' + join_paths('${prefix}', get_option('libexecdir')),
|
|
||||||
'pkglibexecdir=${libexecdir}/weston'
|
'pkglibexecdir=${libexecdir}/weston'
|
||||||
],
|
],
|
||||||
subdirs: 'weston'
|
subdirs: 'weston'
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
dep_scanner = dependency('wayland-scanner', native: true)
|
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',
|
dep_wp = dependency('wayland-protocols', version: '>= 1.26',
|
||||||
fallback: ['wayland-protocols', 'wayland_protocols'])
|
fallback: ['wayland-protocols', 'wayland_protocols'])
|
||||||
|
|
|
@ -4,7 +4,7 @@ endif
|
||||||
|
|
||||||
xwayland_dep = dependency('xwayland', required: false)
|
xwayland_dep = dependency('xwayland', required: false)
|
||||||
if xwayland_dep.found()
|
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')
|
config_h.set('HAVE_XWAYLAND_LISTENFD', '1')
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue