diff options
Diffstat (limited to 'meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch')
-rw-r--r-- | meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch | 9 |
1 files changed, 5 insertions, 4 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 index 1b62db92e9..4b3a0e7c4a 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2195cec1e5bc66128d72049c11ff381ca4516a4b Mon Sep 17 00:00:00 2001 | 1 | From 0961787d2bf0d359a3ead89e9cec642818b32dea Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Tue, 5 Jul 2022 11:51:39 +0200 | 3 | Date: Tue, 5 Jul 2022 11:51:39 +0200 |
4 | Subject: [PATCH] meson.build: request native wayland-scanner | 4 | Subject: [PATCH] meson.build: request native wayland-scanner |
@@ -8,15 +8,16 @@ try to use a cross-binary, and fail. | |||
8 | 8 | ||
9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/110] | 9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/110] |
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
11 | |||
11 | --- | 12 | --- |
12 | meson.build | 2 +- | 13 | meson.build | 2 +- |
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 15 | ||
15 | diff --git a/meson.build b/meson.build | 16 | diff --git a/meson.build b/meson.build |
16 | index 0bb6128..0b6da1f 100644 | 17 | index ca6a212..3177bde 100644 |
17 | --- a/meson.build | 18 | --- a/meson.build |
18 | +++ b/meson.build | 19 | +++ b/meson.build |
19 | @@ -108,7 +108,7 @@ else | 20 | @@ -110,7 +110,7 @@ else |
20 | 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), | 21 | 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), |
21 | ) | 22 | ) |
22 | dep_wayland_scanner = dependency( | 23 | dep_wayland_scanner = dependency( |
@@ -24,4 +25,4 @@ index 0bb6128..0b6da1f 100644 | |||
24 | + 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'), native: true, | 25 | + 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'), native: true, |
25 | ) | 26 | ) |
26 | if dep_wayland_scanner.found() | 27 | if dep_wayland_scanner.found() |
27 | prog_wayland_scanner = find_program(dep_wayland_scanner.get_pkgconfig_variable('wayland_scanner')) | 28 | prog_wayland_scanner = find_program(dep_wayland_scanner.get_variable(pkgconfig: 'wayland_scanner')) |