diff options
-rw-r--r-- | meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch | 27 | ||||
-rw-r--r-- | meta/recipes-graphics/waffle/waffle_1.7.0.bb | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch b/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch new file mode 100644 index 0000000000..1b62db92e9 --- /dev/null +++ b/meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 2195cec1e5bc66128d72049c11ff381ca4516a4b Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 5 Jul 2022 11:51:39 +0200 | ||
4 | Subject: [PATCH] meson.build: request native wayland-scanner | ||
5 | |||
6 | This matters in cross compilation, as otherwise meson will | ||
7 | try to use a cross-binary, and fail. | ||
8 | |||
9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/110] | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | --- | ||
12 | meson.build | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/meson.build b/meson.build | ||
16 | index 0bb6128..0b6da1f 100644 | ||
17 | --- a/meson.build | ||
18 | +++ b/meson.build | ||
19 | @@ -108,7 +108,7 @@ else | ||
20 | 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), | ||
21 | ) | ||
22 | dep_wayland_scanner = dependency( | ||
23 | - 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'), | ||
24 | + 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'), native: true, | ||
25 | ) | ||
26 | if dep_wayland_scanner.found() | ||
27 | prog_wayland_scanner = find_program(dep_wayland_scanner.get_pkgconfig_variable('wayland_scanner')) | ||
diff --git a/meta/recipes-graphics/waffle/waffle_1.7.0.bb b/meta/recipes-graphics/waffle/waffle_1.7.0.bb index f1fd9e7630..dc475908d0 100644 --- a/meta/recipes-graphics/waffle/waffle_1.7.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.7.0.bb | |||
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ | |||
11 | 11 | ||
12 | SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=master \ | 12 | SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=master \ |
13 | file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \ | 13 | file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \ |
14 | file://0001-meson.build-request-native-wayland-scanner.patch \ | ||
14 | " | 15 | " |
15 | SRCREV = "905c6c10f2483adf0cbfa024e2d3c2ed541fb300" | 16 | SRCREV = "905c6c10f2483adf0cbfa024e2d3c2ed541fb300" |
16 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |