* [Buildroot] [PATCH 1/2] package/cegui: Fix cmake 4 build
@ 2026-01-01 11:36 Bernd Kuhls
2026-01-01 11:36 ` [Buildroot] [PATCH 2/2] package/cegui: bump version Bernd Kuhls
2026-01-01 22:44 ` [Buildroot] [PATCH 1/2] package/cegui: Fix cmake 4 build Thomas Petazzoni via buildroot
0 siblings, 2 replies; 4+ messages in thread
From: Bernd Kuhls @ 2026-01-01 11:36 UTC (permalink / raw)
To: buildroot
Renamed current patches to prepare for their removal with the upcoming
version bump that will not touch the CMake fix which is not committed
upstream yet.
Fixes:
https://autobuild.buildroot.net/results/a23/a23e3a81e3526d12206ea0f036f6e8db8dc5eaab/
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
package/cegui/0001-Fix-cmake-4-build.patch | 28 +++++++++++++++++++
...0002-XMLParser.cpp-include-string.h.patch} | 0
...of-xmlGetLastError-for-libxml2-2-12.patch} | 0
3 files changed, 28 insertions(+)
create mode 100644 package/cegui/0001-Fix-cmake-4-build.patch
rename package/cegui/{0001-XMLParser.cpp-include-string.h.patch => 0002-XMLParser.cpp-include-string.h.patch} (100%)
rename package/cegui/{0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch => 0003-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch} (100%)
diff --git a/package/cegui/0001-Fix-cmake-4-build.patch b/package/cegui/0001-Fix-cmake-4-build.patch
new file mode 100644
index 0000000000..952b17e494
--- /dev/null
+++ b/package/cegui/0001-Fix-cmake-4-build.patch
@@ -0,0 +1,28 @@
+From 6c0e6d8ffb3c13cd7fb08c8ef217daf45eabdf99 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Tue, 2 Dec 2025 20:38:29 +0100
+Subject: [PATCH] Fix cmake 4 build
+
+Upstream: https://github.com/cegui/cegui/pull/1334
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 418931822..645ff6cf7 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ ################################################################################
+ # Top-level CMakeLists.txt file for Crazy Eddie's GUI System
+ ################################################################################
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.5)
+
+ if (APPLE AND NOT CMAKE_OSX_ARCHITECTURES)
+ set( CMAKE_OSX_ARCHITECTURES ${CMAKE_HOST_SYSTEM_PROCESSOR} CACHE STRING "Build architectures for Mac OS X")
+--
+2.47.3
+
diff --git a/package/cegui/0001-XMLParser.cpp-include-string.h.patch b/package/cegui/0002-XMLParser.cpp-include-string.h.patch
similarity index 100%
rename from package/cegui/0001-XMLParser.cpp-include-string.h.patch
rename to package/cegui/0002-XMLParser.cpp-include-string.h.patch
diff --git a/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch b/package/cegui/0003-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch
similarity index 100%
rename from package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch
rename to package/cegui/0003-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch
--
2.47.3
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Buildroot] [PATCH 2/2] package/cegui: bump version 2026-01-01 11:36 [Buildroot] [PATCH 1/2] package/cegui: Fix cmake 4 build Bernd Kuhls @ 2026-01-01 11:36 ` Bernd Kuhls 2026-02-04 16:04 ` Thomas Petazzoni via buildroot 2026-01-01 22:44 ` [Buildroot] [PATCH 1/2] package/cegui: Fix cmake 4 build Thomas Petazzoni via buildroot 1 sibling, 1 reply; 4+ messages in thread From: Bernd Kuhls @ 2026-01-01 11:36 UTC (permalink / raw) To: buildroot Removed patches which are included in this release. Updated dependencies and configure options due to upstream commits: https://github.com/cegui/cegui/commit/36c0eaf629b46bdaa3448d20d46294cb0dbc6db5 https://github.com/cegui/cegui/commit/c9adaa03d67e2ba650e063dc7b60c63113ba6cf0 https://github.com/cegui/cegui/commit/20f5ac6658ce151e73772906cdb9be93603c5064 Signed-off-by: Bernd Kuhls <bernd@kuhls.net> --- .../0002-XMLParser.cpp-include-string.h.patch | 37 ------------------- ...-of-xmlGetLastError-for-libxml2-2-12.patch | 29 --------------- package/cegui/cegui.hash | 2 +- package/cegui/cegui.mk | 29 +++++++-------- 4 files changed, 15 insertions(+), 82 deletions(-) delete mode 100644 package/cegui/0002-XMLParser.cpp-include-string.h.patch delete mode 100644 package/cegui/0003-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch diff --git a/package/cegui/0002-XMLParser.cpp-include-string.h.patch b/package/cegui/0002-XMLParser.cpp-include-string.h.patch deleted file mode 100644 index e117d6220d..0000000000 --- a/package/cegui/0002-XMLParser.cpp-include-string.h.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b98ed87225fa3c0f156b0798ca5c285d8fa8fac1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Tue, 15 Jun 2021 07:27:41 +0200 -Subject: [PATCH] XMLParser.cpp: include string.h - -Include string.h to avoid the following build failure: - -/home/buildroot/autobuild/run/instance-3/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/RapidXML/XMLParser.cpp:73:5: error: 'memcpy' was not declared in this scope - 73 | memcpy(buf, source.getDataPtr(), size); - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/1cb09e5f52435efc505c61707b2d5d2ee871524b - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Upstream: 628f7edf4b420f752f1965ea11e5e747e3ff93b0 -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> ---- - cegui/src/XMLParserModules/RapidXML/XMLParser.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/cegui/src/XMLParserModules/RapidXML/XMLParser.cpp b/cegui/src/XMLParserModules/RapidXML/XMLParser.cpp -index 810ea6bbf..59822fc80 100644 ---- a/cegui/src/XMLParserModules/RapidXML/XMLParser.cpp -+++ b/cegui/src/XMLParserModules/RapidXML/XMLParser.cpp -@@ -38,6 +38,8 @@ - #include "CEGUI/Logger.h" - #include "CEGUI/Exceptions.h" - -+#include <string.h> -+ - // Start of CEGUI namespace section - namespace CEGUI - { --- -2.31.1 - diff --git a/package/cegui/0003-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch b/package/cegui/0003-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch deleted file mode 100644 index 9091062e28..0000000000 --- a/package/cegui/0003-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 285ba5a2c0c435ed865c6e86afe314a822fd1e3f Mon Sep 17 00:00:00 2001 -From: oreo639 <oreo6391@gmail.com> -Date: Sun, 18 Feb 2024 14:16:21 -0800 -Subject: [PATCH] Fix return type of xmlGetLastError for libxml2 2.12 - -https://gitlab.gnome.org/GNOME/libxml2/-/commit/45470611b047db78106dcb2fdbd4164163c15ab7 - -Upstream: https://github.com/cegui/cegui/commit/285ba5a2c0c435ed865c6e86afe314a822fd1e3f -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - cegui/src/XMLParserModules/Libxml2/XMLParser.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp -index 74a3dbddd..a408f9305 100644 ---- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp -+++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp -@@ -109,7 +109,11 @@ void LibxmlParser::parseXML(XMLHandler& handler, - - if (!doc) - { -+#if LIBXML_VERSION >= 21200 -+ const xmlError* err = xmlGetLastError(); -+#else - xmlError* err = xmlGetLastError(); -+#endif - - throw GenericException( - String("xmlParseMemory failed in file: '") + diff --git a/package/cegui/cegui.hash b/package/cegui/cegui.hash index 131b248619..be0939148c 100644 --- a/package/cegui/cegui.hash +++ b/package/cegui/cegui.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5b6f9e209e8a29b2f30d6aef92efd125c8bedaab5be04b562208be51e5e7f04e cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0.tar.gz +sha256 9460cbbe7fc3bb3cf6abfd7f5a9c5f135b20e9898400bd698a5fa0d0fe879865 cegui-e7a03afc70c6182a091ff31accb9d77c6bdf6f60.tar.gz sha256 cc869e2ece8ad039f6d7fd17259db4ea0ae0a502d02a1bb506c0168deb12e40d COPYING diff --git a/package/cegui/cegui.mk b/package/cegui/cegui.mk index 835658763e..9b2a1704b6 100644 --- a/package/cegui/cegui.mk +++ b/package/cegui/cegui.mk @@ -4,20 +4,19 @@ # ################################################################################ -CEGUI_VERSION = 00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0 +CEGUI_VERSION = e7a03afc70c6182a091ff31accb9d77c6bdf6f60 CEGUI_SITE = $(call github,cegui,cegui,$(CEGUI_VERSION)) CEGUI_LICENSE = MIT CEGUI_LICENSE_FILES = COPYING CEGUI_INSTALL_STAGING = YES CEGUI_CONF_OPTS = \ - -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF \ + -DCEGUI_BUILD_RESOURCE_PROVIDER_MINIZIP=OFF \ -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF \ -DCEGUI_BUILD_RENDERER_IRRLICHT=OFF \ -DCEGUI_BUILD_RENDERER_OGRE=OFF \ -DCEGUI_BUILD_RENDERER_OPENGLES=OFF \ -DCEGUI_BUILD_XMLPARSER_XERCES=OFF \ -DCEGUI_USE_FRIBIDI=OFF \ - -DCEGUI_SAMPLES_ENABLED=OFF \ -DCEGUI_BUILD_APPLICATION_TEMPLATES=OFF \ -DCEGUI_BUILD_PYTHON_MODULES_SWIG=OFF CEGUI_DEPENDENCIES = glm \ @@ -60,16 +59,16 @@ endif ifeq ($(BR2_PACKAGE_PCRE),y) CEGUI_DEPENDENCIES += pcre -CEGUI_CONF_OPTS += -DCEGUI_HAS_PCRE_REGEX=ON +CEGUI_CONF_OPTS += -DCEGUI_REGEX_MATCHER=PCRE else -CEGUI_CONF_OPTS += -DCEGUI_HAS_PCRE_REGEX=OFF +CEGUI_CONF_OPTS += -DCEGUI_REGEX_MATCHER=std endif ifeq ($(BR2_PACKAGE_FREETYPE),y) CEGUI_DEPENDENCIES += freetype -CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=ON +CEGUI_CONF_OPTS += -DCEGUI_USE_FREETYPE=ON else -CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=OFF +CEGUI_CONF_OPTS += -DCEGUI_USE_FREETYPE=OFF endif ifeq ($(BR2_PACKAGE_LIBXML2),y) @@ -79,18 +78,18 @@ else CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF endif -ifeq ($(BR2_PACKAGE_RAPIDXML),y) -CEGUI_DEPENDENCIES += rapidxml -CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=ON +ifeq ($(BR2_PACKAGE_PUGIXML),y) +CEGUI_DEPENDENCIES += pugixml +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_PUGIXML=ON else -CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_PUGIXML=OFF endif -ifeq ($(BR2_PACKAGE_TINYXML),y) -CEGUI_DEPENDENCIES += tinyxml -CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=ON +ifeq ($(BR2_PACKAGE_TINYXML2),y) +CEGUI_DEPENDENCIES += tinyxml2 +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=ON else -CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=OFF endif $(eval $(cmake-package)) -- 2.47.3 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/cegui: bump version 2026-01-01 11:36 ` [Buildroot] [PATCH 2/2] package/cegui: bump version Bernd Kuhls @ 2026-02-04 16:04 ` Thomas Petazzoni via buildroot 0 siblings, 0 replies; 4+ messages in thread From: Thomas Petazzoni via buildroot @ 2026-02-04 16:04 UTC (permalink / raw) To: Bernd Kuhls; +Cc: buildroot Hello Bernd, On Thu, Jan 01, 2026 at 12:36:16PM +0100, Bernd Kuhls wrote: > Removed patches which are included in this release. > > Updated dependencies and configure options due to upstream commits: > https://github.com/cegui/cegui/commit/36c0eaf629b46bdaa3448d20d46294cb0dbc6db5 > https://github.com/cegui/cegui/commit/c9adaa03d67e2ba650e063dc7b60c63113ba6cf0 > https://github.com/cegui/cegui/commit/20f5ac6658ce151e73772906cdb9be93603c5064 > > Signed-off-by: Bernd Kuhls <bernd@kuhls.net> The build breaks for me. I have no idea if it was working before or not, since I was encountering the CMake 4 compatibility issue. But the build breaks with: /home/thomas/buildroot/br/output-all/build/cegui-e7a03afc70c6182a091ff31accb9d77c6bdf6f60/cegui/src/ScriptModules/Python/bindings/generators/include /python_CEGUI.h:105:12: error: ‘VerticalFormatting’ does not name a type; did you mean ‘VerticalTextFormatting’? 105 | static VerticalFormatting stringToVerticalFormatting(const String& str) and other errors like: /home/thomas/buildroot/br/output-all/build/cegui-e7a03afc70c6182a091ff31accb9d77c6bdf6f60/cegui/src/ScriptModules/Python/bindings/generators/include /python_CEGUI.h:146:41: error: ‘Vector2f’ does not name a type; did you mean ‘UVector2’? 146 | static String vector2ToString(const Vector2f& val) I can't easily provide a minimal configuration for this, because I'm encountering this while doing a full build of all packages. Also, note that there are numerous cegui build failures in the autobuilders: https://autobuild.buildroot.net/?reason=cegui% Are you willing to fix them? Or should we remove cegui? Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/cegui: Fix cmake 4 build 2026-01-01 11:36 [Buildroot] [PATCH 1/2] package/cegui: Fix cmake 4 build Bernd Kuhls 2026-01-01 11:36 ` [Buildroot] [PATCH 2/2] package/cegui: bump version Bernd Kuhls @ 2026-01-01 22:44 ` Thomas Petazzoni via buildroot 1 sibling, 0 replies; 4+ messages in thread From: Thomas Petazzoni via buildroot @ 2026-01-01 22:44 UTC (permalink / raw) To: Bernd Kuhls; +Cc: buildroot On Thu, 1 Jan 2026 12:36:15 +0100 Bernd Kuhls <bernd@kuhls.net> wrote: > Renamed current patches to prepare for their removal with the upcoming > version bump that will not touch the CMake fix which is not committed > upstream yet. > > Fixes: > https://autobuild.buildroot.net/results/a23/a23e3a81e3526d12206ea0f036f6e8db8dc5eaab/ > > Signed-off-by: Bernd Kuhls <bernd@kuhls.net> > --- > package/cegui/0001-Fix-cmake-4-build.patch | 28 +++++++++++++++++++ > ...0002-XMLParser.cpp-include-string.h.patch} | 0 > ...of-xmlGetLastError-for-libxml2-2-12.patch} | 0 > 3 files changed, 28 insertions(+) > create mode 100644 package/cegui/0001-Fix-cmake-4-build.patch > rename package/cegui/{0001-XMLParser.cpp-include-string.h.patch => 0002-XMLParser.cpp-include-string.h.patch} (100%) > rename package/cegui/{0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch => 0003-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch} (100%) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-02-04 16:04 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2026-01-01 11:36 [Buildroot] [PATCH 1/2] package/cegui: Fix cmake 4 build Bernd Kuhls 2026-01-01 11:36 ` [Buildroot] [PATCH 2/2] package/cegui: bump version Bernd Kuhls 2026-02-04 16:04 ` Thomas Petazzoni via buildroot 2026-01-01 22:44 ` [Buildroot] [PATCH 1/2] package/cegui: Fix cmake 4 build Thomas Petazzoni via buildroot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox