yoctoproject/poky-contrib
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky-contrib synced 2025-05-08 23:52:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

waffle: upgrade 1.8.0 -> 1.8.1

Browse Source 
Drop the patch: the build is correctly using everything from sysroots
now.

(From OE-Core rev: a8b8b2168540ce4018b530276d67cb53f6e0109c)

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-08-27 07:23:49 +02:00 committed by Richard Purdie
parent d12a3f1025
commit d85d7419e4
2 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,40 +0,0 @@
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
None of the consumers (which is just piglit) use it, and
this avoids host contamination from pkg-config suggesting
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 1cc99f6..022745a 100644
--- a/src/waffle/meson.build
+++ b/src/waffle/meson.build
@@ -89,12 +89,6 @@ if build_surfaceless
endif
if build_wayland
- wl_core_proto_c = custom_target(
- 'wl-core-proto.c',
- input: wayland_core_xml,
- output: 'wl-core-proto.c',
- command: [prog_wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'],
- )
wl_xdg_shell_proto_c = custom_target(
'wl-xdg-shell-proto.c',
input: wayland_xdg_shell_xml,
@@ -115,7 +109,6 @@ if build_wayland
'wayland/wayland_wrapper.c',
)
files_libwaffle += [
- wl_core_proto_c,
wl_xdg_shell_proto_c,
wl_xdg_shell_proto_h,
]

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

@ -9,10 +9,9 @@ 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=master \
file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \
SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.8 \
"
SRCREV = "580b912a30085528886603942c100c7b309b3bdb"
SRCREV = "49abc7cb5f73cc6852136c91da49ea3a338960e4"
S = "${WORKDIR}/git"
inherit meson features_check lib_package bash-completion pkgconfig