diff options
| author |   Denys Dmytriyenko <denys@konsulko.com> | 2023-06-07 19:52:08 +0000 |
|---|---|---|
| committer | Denys Dmytriyenko <denys@konsulko.com> | 2023-06-09 22:51:20 +0000 |
| commit | 5d4671ca8e09985471336eef7f6ecfaa79fd768e (patch) | |
| tree | 211870e745f3d59bcfff89f25c3220bd42ae9432 | |
| parent | c9ae3bc5a102caad6d8040cd268a64295654e162 (diff) | |
meson.build: replace get_pkgconfig_variable with get_variable
Newer meson requires using get_variable(pkgconfig: ...) instead of
get_pkgconfig_variable() and results in this error:
| ../git/homescreen/meson.build:23: WARNING: Project targets '>= 0.60.0' but uses feature deprecated since '0.56.0': dependency.get_pkgconfig_variable. use dependency.get_variable(pkgconfig : ...) instead
Also, look for wayland-scanner program directly, instead of querying
pkgconfig, so it works properly with OE recipe-specific sysroot.
Bug-AGL: SPEC-4578
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Change-Id: I57abc17abea31883c9cc63419a0c2a868e262bba
| -rw-r--r-- | homescreen/meson.build | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/homescreen/meson.build b/homescreen/meson.build index 3ee5e48..2402e6c 100644 --- a/homescreen/meson.build +++ b/homescreen/meson.build @@ -19,10 +19,9 @@ if cpp.has_header(qpa_header, dependencies : qt5_dep) message('Found QtGui QPA header in ' + qpa_header_path) endif -dep_scanner = dependency('wayland-scanner') -prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) +prog_scanner = find_program('wayland-scanner') agl_compositor_dep = dependency('agl-compositor-0.0.21-protocols') -dir_agl_compositor_base = agl_compositor_dep.get_pkgconfig_variable('pkgdatadir') +dir_agl_compositor_base = agl_compositor_dep.get_variable(pkgconfig: 'pkgdatadir') homescreen_dep = [ qt5_dep, @@ -60,7 +59,7 @@ foreach proto: protocols output_file = '@0@-server-protocol.h'.format(base_file) else output_file = '@0@-protocol.c'.format(base_file) - if dep_scanner.version().version_compare('< 1.14.91') + if prog_scanner.version().version_compare('< 1.14.91') output_type = 'code' endif endif |