mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-25 19:40:35 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/cegui: bump version

Browse Source 
Removed patches which are included in this release.

Updated dependencies and configure options due to upstream commits:
36c0eaf629
c9adaa03d6
20f5ac6658

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls
2026-01-01 12:36:16 +01:00
committed by Thomas Petazzoni
parent b1bfe97aa6
commit 1146284192
4 changed files with 15 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
package/cegui/0002-XMLParser.cpp-include-string.h.patch
View File

@@ -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

29
package/cegui/0003-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch
View File

@@ -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: '") +

2
package/cegui/cegui.hash
View File

@@ -1,3 +1,3 @@
# Locally computed:
sha256 5b6f9e209e8a29b2f30d6aef92efd125c8bedaab5be04b562208be51e5e7f04e cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0.tar.gz
sha256 9460cbbe7fc3bb3cf6abfd7f5a9c5f135b20e9898400bd698a5fa0d0fe879865 cegui-e7a03afc70c6182a091ff31accb9d77c6bdf6f60.tar.gz
sha256 cc869e2ece8ad039f6d7fd17259db4ea0ae0a502d02a1bb506c0168deb12e40d COPYING

29
package/cegui/cegui.mk
View File

@@ -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))