diff options
author | Marc Ferland <marc.ferland@sonatest.com> | 2024-04-22 10:12:54 -0400 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-06-19 08:34:58 -0700 |
commit | 35bd8118fc9d02d1819c3d5a26b74170abb281d6 (patch) | |
tree | 53bb631b9c66c19a376b5e4f03aeabc1162d6302 | |
parent | 18c80c1c36a073a091ab61bb2e0261622e29b732 (diff) | |
download | poky-35bd8118fc9d02d1819c3d5a26b74170abb281d6.tar.gz |
libinput: fix building with debug-gui option
When building libinput with the 'gui' PACKAGECONFIG option, it fails
with:
| Run-time dependency x11 found: YES 1.8.9
| Run-time dependency wayland-client found: YES 1.22.0
| Run-time dependency wayland-protocols found: YES 1.34
| Program wayland-scanner found: NO
|
| ../git/meson.build:578:20: ERROR: Program 'wayland-scanner' not found or not executable
|
| A full log can be found at /home/marc/mnt/yocto-latest/build/tmp/work/core2-64-poky-linux/libinput/1.25.0/build/meson-logs/meson-log.txt
| ERROR: meson failed
| WARNING: exit code 1 from a shell command.
Adding a build dependency on wayland-native fixes the issue.
(From OE-Core rev: 71e49dcac0be026d12140598850e2cd38d702317)
Signed-off-by: Marc Ferland <marc.ferland@sonatest.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0e2d18e6267d26870ccbe45734bfccbc02744357)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-graphics/wayland/libinput_1.25.0.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-graphics/wayland/libinput_1.25.0.bb b/meta/recipes-graphics/wayland/libinput_1.25.0.bb index 517b247fed..894858e361 100644 --- a/meta/recipes-graphics/wayland/libinput_1.25.0.bb +++ b/meta/recipes-graphics/wayland/libinput_1.25.0.bb | |||
@@ -32,7 +32,7 @@ do_configure:append() { | |||
32 | 32 | ||
33 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | 33 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" |
34 | PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" | 34 | PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" |
35 | PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3" | 35 | PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3 wayland-native" |
36 | PACKAGECONFIG[tests] = "-Dtests=true -Dinstall-tests=true,-Dtests=false -Dinstall-tests=false,libcheck" | 36 | PACKAGECONFIG[tests] = "-Dtests=true -Dinstall-tests=true,-Dtests=false -Dinstall-tests=false,libcheck" |
37 | 37 | ||
38 | UDEVDIR = "`pkg-config --variable=udevdir udev`" | 38 | UDEVDIR = "`pkg-config --variable=udevdir udev`" |