From a8b8b2168540ce4018b530276d67cb53f6e0109c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 27 Aug 2024 07:23:49 +0200 Subject: [PATCH] waffle: upgrade 1.8.0 -> 1.8.1 Drop the patch: the build is correctly using everything from sysroots now. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...-make-core-protocol-into-the-library.patch | 40 ------------------- .../{waffle_1.8.0.bb => waffle_1.8.1.bb} | 5 +-- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch rename meta/recipes-graphics/waffle/{waffle_1.8.0.bb => waffle_1.8.1.bb} (93%) diff --git a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch deleted file mode 100644 index 31ac3e0dd19..00000000000 --- a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 79b9e4338f803d79449e53a40b1ecc0a5a5889e4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -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 ---- - 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, - ] diff --git a/meta/recipes-graphics/waffle/waffle_1.8.0.bb b/meta/recipes-graphics/waffle/waffle_1.8.1.bb similarity index 93% rename from meta/recipes-graphics/waffle/waffle_1.8.0.bb rename to meta/recipes-graphics/waffle/waffle_1.8.1.bb index ad8649b40ef..684124bc4d2 100644 --- a/meta/recipes-graphics/waffle/waffle_1.8.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.8.1.bb @@ -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 -- 2.47.2