mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 03:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

waffle: update 1.7.2 -> 1.8.0

Browse Source 
(From OE-Core rev: b63ce3e9ae0e38e9951440d805b0d9487fd3736d)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2024-03-13 18:33:35 +01:00
committed by Richard Purdie
parent 0a60440ceb
commit cdc15a0ff2
3 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
meta/recipes-graphics/waffle/waffle/0001-meson.build-request-native-wayland-scanner.patch
View File

@@ -1,28 +0,0 @@
From 0961787d2bf0d359a3ead89e9cec642818b32dea 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 ca6a212..3177bde 100644
--- a/meson.build
+++ b/meson.build
@@ -110,7 +110,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_variable(pkgconfig: 'wayland_scanner'))

9
meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch
View File

@@ -1,4 +1,4 @@
From 71f9399d6cea1e2e885a98b98d82eb628832a86e Mon Sep 17 00:00:00 2001
From 79b9e4338f803d79449e53a40b1ecc0a5a5889e4 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Tue, 26 Oct 2021 08:52:17 +0200
Subject: [PATCH] waffle: do not make core protocol into the library
@@ -9,16 +9,15 @@ wayland.xml from the host.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
src/waffle/meson.build | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/waffle/meson.build b/src/waffle/meson.build
index e2636c7..3ff5762 100644
index 1cc99f6..022745a 100644
--- a/src/waffle/meson.build
+++ b/src/waffle/meson.build
@@ -88,12 +88,6 @@ if build_surfaceless
@@ -89,12 +89,6 @@ if build_surfaceless
endif
if build_wayland
@@ -31,7 +30,7 @@ index e2636c7..3ff5762 100644
wl_xdg_shell_proto_c = custom_target(
'wl-xdg-shell-proto.c',
input: wayland_xdg_shell_xml,
@@ -114,7 +108,6 @@ if build_wayland
@@ -115,7 +109,6 @@ if build_wayland
'wayland/wayland_wrapper.c',
)
files_libwaffle += [

5
meta/recipes-graphics/waffle/waffle_1.7.2.bb → meta/recipes-graphics/waffle/waffle_1.8.0.bb
View File

@@ -9,11 +9,10 @@ LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
file://include/waffle-1/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf"
SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.7 \
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-meson.build-request-native-wayland-scanner.patch \
"
SRCREV = "f3b42a7216105498842bc6ba77d8481b90d6f5f9"
SRCREV = "580b912a30085528886603942c100c7b309b3bdb"
S = "${WORKDIR}/git"
inherit meson features_check lib_package bash-completion pkgconfig