fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-26 20:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: fix meson deprecation warnings

Browse source 
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:
Philipp Zabel 2023-01-25 12:11:21 +01:00 • committed by Marius Vlad
parent eb3ad4ec64
commit f639c9cac4
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
compositor/meson.build
View file

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

2
protocol/meson.build
View file

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

2
xwayland/meson.build
View file

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