[Buildroot] [PATCH 3/4] package/waffle: remove patches
Raphael Gallais-Pou
rgallaispou at gmail.com
Sun Oct 5 13:24:44 UTC 2025
Patches make no longer sense since they are either merged or related to
deprecated cmake build.
Signed-off-by: Raphael Gallais-Pou <rgallaispou at gmail.com>
---
...rd-cflags-from-.pc-files-to-waffle-cflags.patch | 42 ---------------
...02-wayland-fix-build-against-version-1-20.patch | 59 ----------------------
package/waffle/0003-drop-C-dependency.patch | 46 -----------------
3 files changed, 147 deletions(-)
diff --git a/package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch b/package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch
deleted file mode 100644
index b2a1294f24da581268031ab0ca753291b0997e17..0000000000000000000000000000000000000000
--- a/package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8b0ae49c8bea78df73c3ecae0059d54a95c561fa Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour at gmail.com>
-Date: Sun, 24 Dec 2017 00:11:45 +0100
-Subject: [PATCH] cmake: forward cflags from *.pc files to waffle cflags
-
-When building mesa egl without x11 and gles2 the headers need a
-EGL_NO_X11 define to avoid including X11 headers.
-
-This define EGL_NO_X11 is lost while building waffle
-since CFLAGS defined by pc files are not used.
-
-EGL_NO_X11 is defined in CFLAGS from egl.pc.
-
-Signed-off-by: Romain Naour <romain.naour at gmail.com>
-[Upstream status:
-https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/111]
----
- src/waffle/CMakeLists.txt | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt
-index d76e029..2ff72c8 100644
---- a/src/waffle/CMakeLists.txt
-+++ b/src/waffle/CMakeLists.txt
-@@ -5,6 +5,14 @@
- add_definitions(
- -DWAFFLE_API_VERSION=${waffle_api_version}
- -DWAFFLE_API_EXPERIMENTAL
-+ ${egl_CFLAGS}
-+ ${gbm_CFLAGS}
-+ ${gl_CFLAGS}
-+ ${GLEXT_CFLAGS}
-+ ${libudev_CFLAGS}
-+ ${wayland-client_CFLAGS}
-+ ${wayland-egl_CFLAGS}
-+ ${x11-xcb_CFLAGS}
- )
-
- include_directories(
---
-2.14.3
-
diff --git a/package/waffle/0002-wayland-fix-build-against-version-1-20.patch b/package/waffle/0002-wayland-fix-build-against-version-1-20.patch
deleted file mode 100644
index d3b66180ec443150bfbf58b011c3075b934bae6e..0000000000000000000000000000000000000000
--- a/package/waffle/0002-wayland-fix-build-against-version-1-20.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 2c33597245bb74f19104f0a858cd40e80b26991d Mon Sep 17 00:00:00 2001
-From: Philipp Zabel <p.zabel at pengutronix.de>
-Date: Fri, 17 Dec 2021 13:46:40 +0100
-Subject: [PATCH] wayland: fix build against version 1.20
-
-Wayland 1.20 introduces two new symbols wl_proxy_marshal_flags and
-wl_proxy_marshal_array_flags, which need to be wrapped as well.
-
-Closes: https://gitlab.freedesktop.org/mesa/waffle/-/issues/76
-Signed-off-by: Philipp Zabel <p.zabel at pengutronix.de>
-[Retrieved from:
-https://gitlab.freedesktop.org/mesa/waffle/-/commit/2c33597245bb74f19104f0a858cd40e80b26991d]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
----
- src/waffle/wayland/wayland_sym.h | 18 ++++++++++++++++++
- src/waffle/wayland/wayland_wrapper.h | 2 ++
- 2 files changed, 20 insertions(+)
-
-diff --git a/src/waffle/wayland/wayland_sym.h b/src/waffle/wayland/wayland_sym.h
-index 3d48625..4c6ac8d 100644
---- a/src/waffle/wayland/wayland_sym.h
-+++ b/src/waffle/wayland/wayland_sym.h
-@@ -26,3 +26,21 @@ WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor,
- WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned,
- (struct wl_proxy *proxy, uint32_t opcode,
- const struct wl_interface *interface, uint32_t version, ...))
-+
-+WAFFLE_WAYLAND_SYM(struct wl_proxy *,
-+ wl_proxy_marshal_flags,
-+ (struct wl_proxy * p,
-+ uint32_t opcode,
-+ const struct wl_interface *interface,
-+ uint32_t version,
-+ uint32_t flags,
-+ ...))
-+
-+WAFFLE_WAYLAND_SYM(struct wl_proxy *,
-+ wl_proxy_marshal_array_flags,
-+ (struct wl_proxy * p,
-+ uint32_t opcode,
-+ const struct wl_interface *interface,
-+ uint32_t version,
-+ uint32_t flags,
-+ union wl_argument *args))
-diff --git a/src/waffle/wayland/wayland_wrapper.h b/src/waffle/wayland/wayland_wrapper.h
-index 4af2f64..6addf4f 100644
---- a/src/waffle/wayland/wayland_wrapper.h
-+++ b/src/waffle/wayland/wayland_wrapper.h
-@@ -65,5 +65,7 @@ struct wl_display;
- #define wl_proxy_marshal (*wfl_wl_proxy_marshal)
- #define wl_proxy_marshal_constructor (*wfl_wl_proxy_marshal_constructor)
- #define wl_proxy_marshal_constructor_versioned (*wfl_wl_proxy_marshal_constructor_versioned)
-+#define wl_proxy_marshal_flags (*wfl_wl_proxy_marshal_flags)
-+#define wl_proxy_marshal_array_flags (*wfl_wl_proxy_marshal_array_flags)
-
- #include <wayland-client-protocol.h>
---
-GitLab
-
diff --git a/package/waffle/0003-drop-C-dependency.patch b/package/waffle/0003-drop-C-dependency.patch
deleted file mode 100644
index 89c0cd09f20a182565cf309f0626e45d9c359486..0000000000000000000000000000000000000000
--- a/package/waffle/0003-drop-C-dependency.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a54a5d086c5f7e0751f68ac1a2942d8077922ebc Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice at gmail.com>
-Date: Sun, 7 Aug 2022 16:18:22 +0200
-Subject: [PATCH] drop C++ dependency
-
-C++ dependency has been added for nacl backend which has been added by
-https://gitlab.freedesktop.org/mesa/waffle/-/commit/6ca943584e593aec2bd4f9c66d91859e63e02d61
-and dropped by
-https://gitlab.freedesktop.org/mesa/waffle/-/commit/a7c7152b054e6d2b9af36ed9db9a0df44731b279
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
-[Upstream status: not sent yet]
----
- CMakeLists.txt | 2 +-
- src/waffle/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index acece86..04ea68c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23,7 +23,7 @@
- # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--project(waffle1 C CXX)
-+project(waffle1 C)
-
- cmake_minimum_required(VERSION 2.8.12)
-
-diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt
-index 8014b51..276f276 100644
---- a/src/waffle/CMakeLists.txt
-+++ b/src/waffle/CMakeLists.txt
-@@ -238,7 +238,7 @@ include_directories(
- ${XCB_INCLUDE_DIRS}
- )
-
--add_library(${waffle_libname} SHARED ${waffle_sources} ${waffle_cxx_sources})
-+add_library(${waffle_libname} SHARED ${waffle_sources})
-
- # Debian's packaging system emits warnings if wflinfo directly links to any
- # library that it doesn't directly use. Silence the warnings by annotating
---
-2.35.1
-
--
2.51.0
More information about the buildroot
mailing list