mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
waffle: correctly request wayland-scanner executable
(From OE-Core rev: 05457e7f2a4c379082f8f39480f16b90141dc54f) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit cd05e2543bde4175da67781ec6f3eebc143d95d0) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
bf3232255d
commit
5b4699fc90
+27
@@ -0,0 +1,27 @@
|
|||||||
|
From 2195cec1e5bc66128d72049c11ff381ca4516a4b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Kanavin <alex@linutronix.de>
|
||||||
|
Date: Tue, 5 Jul 2022 11:51:39 +0200
|
||||||
|
Subject: [PATCH] meson.build: request native wayland-scanner
|
||||||
|
|
||||||
|
This matters in cross compilation, as otherwise meson will
|
||||||
|
try to use a cross-binary, and fail.
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/110]
|
||||||
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||||
|
---
|
||||||
|
meson.build | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/meson.build b/meson.build
|
||||||
|
index 0bb6128..0b6da1f 100644
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -108,7 +108,7 @@ else
|
||||||
|
'wayland-egl', version : '>= 9.1', required : get_option('wayland'),
|
||||||
|
)
|
||||||
|
dep_wayland_scanner = dependency(
|
||||||
|
- 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'),
|
||||||
|
+ 'wayland-scanner', version : '>= 1.15', required : get_option('wayland'), native: true,
|
||||||
|
)
|
||||||
|
if dep_wayland_scanner.found()
|
||||||
|
prog_wayland_scanner = find_program(dep_wayland_scanner.get_pkgconfig_variable('wayland_scanner'))
|
||||||
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
|
|||||||
|
|
||||||
SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=master \
|
SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=master \
|
||||||
file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \
|
file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \
|
||||||
|
file://0001-meson.build-request-native-wayland-scanner.patch \
|
||||||
"
|
"
|
||||||
SRCREV = "905c6c10f2483adf0cbfa024e2d3c2ed541fb300"
|
SRCREV = "905c6c10f2483adf0cbfa024e2d3c2ed541fb300"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|||||||
Reference in New Issue
Block a user