diff mbox series

waffle: upgrade 1.8.1 -> 1.8.2

Message ID 20260622132423.2346533-1-ross.burton@arm.com
State Under Review
Headers show
Series waffle: upgrade 1.8.1 -> 1.8.2 | expand

Commit Message

Ross Burton June 22, 2026, 1:24 p.m. UTC 
Drop upstreamed patch.

Also remove the obsolete python3 DEPENDS, this hasn't been needed since
the port to Meson.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../0001-c11-threads-fix-build-on-c23.patch   | 51 -------------------
 .../{waffle_1.8.1.bb => waffle_1.8.2.bb}      |  8 +--
 2 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 meta/recipes-graphics/waffle/waffle/0001-c11-threads-fix-build-on-c23.patch
 rename meta/recipes-graphics/waffle/{waffle_1.8.1.bb => waffle_1.8.2.bb} (92%)
diff mbox series

Patch

diff --git a/meta/recipes-graphics/waffle/waffle/0001-c11-threads-fix-build-on-c23.patch b/meta/recipes-graphics/waffle/waffle/0001-c11-threads-fix-build-on-c23.patch
deleted file mode 100644
index 4082a763e16..00000000000
--- a/meta/recipes-graphics/waffle/waffle/0001-c11-threads-fix-build-on-c23.patch
+++ /dev/null
@@ -1,51 +0,0 @@ 
-From 6b3c46483844faba4dfe7dd90dc2b0cd06e67158 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 10 Nov 2025 19:20:22 -0800
-Subject: [PATCH] c11/threads: fix build on c23
-
-C23/glibc is now including once_init in stdlib.h
-
-https://patchwork.sourceware.org/project/glibc/patch/78061085-f04a-0c45-107b-5a8a15521083@redhat.com/#213088
-
-Conditionally check if glibc already provided c23 definition via stdlib.h
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/158]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- third_party/threads/threads.h       | 3 ++-
- third_party/threads/threads_posix.c | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/third_party/threads/threads.h b/third_party/threads/threads.h
-index b4db50c..cdc7bea 100644
---- a/third_party/threads/threads.h
-+++ b/third_party/threads/threads.h
-@@ -102,8 +102,9 @@ typedef pthread_cond_t  cnd_t;
- typedef pthread_t       thrd_t;
- typedef pthread_key_t   tss_t;
- typedef pthread_mutex_t mtx_t;
-+#ifndef __once_flag_defined
- typedef pthread_once_t  once_flag;
--
-+#endif
- #else
- #error Not supported on this platform.
- #endif
-diff --git a/third_party/threads/threads_posix.c b/third_party/threads/threads_posix.c
-index bc50825..d93013b 100644
---- a/third_party/threads/threads_posix.c
-+++ b/third_party/threads/threads_posix.c
-@@ -75,11 +75,12 @@ static void *impl_thrd_routine(void *p)
-
- /*--------------- 7.25.2 Initialization functions ---------------*/
- // 7.25.2.1
-+#ifndef __once_flag_defined
- void call_once(once_flag *flag, void (*func)(void))
- {
-     pthread_once(flag, func);
- }
--
-+#endif
-
- /*------------- 7.25.3 Condition variable functions -------------*/
- // 7.25.3.1
diff --git a/meta/recipes-graphics/waffle/waffle_1.8.1.bb b/meta/recipes-graphics/waffle/waffle_1.8.2.bb
similarity index 92%
rename from meta/recipes-graphics/waffle/waffle_1.8.1.bb
rename to meta/recipes-graphics/waffle/waffle_1.8.2.bb
index 5d993cf254b..dd31d4057d0 100644
--- a/meta/recipes-graphics/waffle/waffle_1.8.1.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.8.2.bb
@@ -9,15 +9,11 @@  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.8 \
-           file://0001-c11-threads-fix-build-on-c23.patch \
-           "
-SRCREV = "49abc7cb5f73cc6852136c91da49ea3a338960e4"
+SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.8"
+SRCREV = "70dd251e0390401ab9dc4f768ee9665863f4c268"
 
 inherit meson features_check lib_package bash-completion pkgconfig
 
-DEPENDS:append = " python3"
-
 # This should be overridden per-machine to reflect the capabilities of the GL
 # stack.
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \