[Buildroot] [git commit] package/cegui: rename and bump version
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Sun Mar 29 20:37:20 UTC 2020
commit: https://git.buildroot.net/buildroot/commit/?id=260c408184745b86afead8baec0232f38bb48525
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Since spice ver. 0.12.6 doesn't depend on cegui anymore
let's bump to the latest stable version and rename package.
Signed-off-by: Bartosz Bilas <b.bilas at grinn-global.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
Config.in.legacy | 8 ++
DEVELOPERS | 2 +-
package/Config.in | 2 +-
...ons.cpp-check-if-execinfo-header-is-avail.patch | 33 ++++++
package/{cegui06 => cegui}/Config.in | 17 +--
package/cegui/cegui.hash | 3 +
package/cegui/cegui.mk | 117 +++++++++++++++++++++
package/cegui06/0001-stddef.h.patch | 26 -----
package/cegui06/cegui06.hash | 3 -
package/cegui06/cegui06.mk | 36 -------
10 files changed, 172 insertions(+), 75 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 77dea41e02..4a9b2ead9d 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -155,6 +155,14 @@ config BR2_GCC_VERSION_5_X
comment "Legacy options removed in 2020.02"
+config BR2_PACKAGE_CEGUI06
+ bool "BR2_PACKAGE_CEGUI06 was renamed"
+ select BR2_PACKAGE_CEGUI
+ select BR2_LEGACY
+ help
+ The BR2_PACKAGE_CEGUI06 config symbol was renamed to
+ BR2_PACKAGE_CEGUI.
+
config BR2_PACKAGE_JAMVM
bool "jamvm removed"
select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 23aeb3d588..75aaf98c44 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -2604,7 +2604,7 @@ F: board/friendlyarm/nanopi-neo/
F: configs/nanopi_neo_defconfig
F: fs/squashfs/
F: package/asterisk/
-F: package/cegui06/
+F: package/cegui/
F: package/dahdi-linux/
F: package/dahdi-tools/
F: package/dtc/
diff --git a/package/Config.in b/package/Config.in
index f855076b5a..a51125e17b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -295,7 +295,7 @@ comment "Graphic applications"
source "package/tesseract-ocr/Config.in"
comment "Graphic libraries"
- source "package/cegui06/Config.in"
+ source "package/cegui/Config.in"
source "package/directfb/Config.in"
source "package/directfb-examples/Config.in"
source "package/efl/Config.in"
diff --git a/package/cegui/0001-src-Exceptions.cpp-check-if-execinfo-header-is-avail.patch b/package/cegui/0001-src-Exceptions.cpp-check-if-execinfo-header-is-avail.patch
new file mode 100644
index 0000000000..dd5dba9e71
--- /dev/null
+++ b/package/cegui/0001-src-Exceptions.cpp-check-if-execinfo-header-is-avail.patch
@@ -0,0 +1,33 @@
+From e18e48624cd45910917e5e4fb0aa16cef490bb6d Mon Sep 17 00:00:00 2001
+From: Bartosz Bilas <b.bilas at grinn-global.com>
+Date: Sun, 22 Mar 2020 14:25:53 +0100
+Subject: [PATCH] src/Exceptions.cpp: check if execinfo header is available
+
+Fixes:
+ fatal error: execinfo.h: No such file or directory
+ compilation terminated.
+
+Signed-off-by: Bartosz Bilas <bartosz.bilas at hotmail.com>
+---
+ Upstream status: https://github.com/cegui/cegui/pull/1189
+
+cegui/src/Exceptions.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/cegui/src/Exceptions.cpp b/cegui/src/Exceptions.cpp
+index 8e4890378..6a8420491 100644
+--- a/cegui/src/Exceptions.cpp
++++ b/cegui/src/Exceptions.cpp
+@@ -46,7 +46,9 @@
+ #elif (defined(__linux__) && !defined(__ANDROID__)) \
+ || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) \
+ || defined(__HAIKU__)
++#ifdef HAVE_EXECINFO_H
+ # include <execinfo.h>
++#endif
+ # include <dlfcn.h>
+ # include <cxxabi.h>
+ # include <cstddef>
+--
+2.25.2
+
diff --git a/package/cegui06/Config.in b/package/cegui/Config.in
similarity index 68%
rename from package/cegui06/Config.in
rename to package/cegui/Config.in
index 0139d32422..f917be0cc5 100644
--- a/package/cegui06/Config.in
+++ b/package/cegui/Config.in
@@ -1,14 +1,15 @@
-comment "cegui06 needs a toolchain w/ C++, threads, dynamic library"
- depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
+comment "cegui needs a toolchain w/ C++, threads, dynamic library, wchar"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \
+ || BR2_STATIC_LIBS || !BR2_USE_WCHAR
-config BR2_PACKAGE_CEGUI06
- bool "cegui06"
- depends on BR2_TOOLCHAIN_HAS_THREADS
+config BR2_PACKAGE_CEGUI
+ bool "cegui"
depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_STATIC_LIBS
- select BR2_PACKAGE_EXPAT
- select BR2_PACKAGE_FREETYPE
- select BR2_PACKAGE_PCRE
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_USE_WCHAR
+ select BR2_PACKAGE_GLM
+ select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
Crazy Eddie's GUI System is a free library providing windowing
and widgets for graphics APIs / engines where such
diff --git a/package/cegui/cegui.hash b/package/cegui/cegui.hash
new file mode 100644
index 0000000000..8295039037
--- /dev/null
+++ b/package/cegui/cegui.hash
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256 7be289d2d8562e7d20bd155d087d6ccb0ba62f7e99cc25d20684b8edf2ba15cd cegui-0-8-7.tar.gz
+sha256 cc869e2ece8ad039f6d7fd17259db4ea0ae0a502d02a1bb506c0168deb12e40d COPYING
diff --git a/package/cegui/cegui.mk b/package/cegui/cegui.mk
new file mode 100644
index 0000000000..657492a7f7
--- /dev/null
+++ b/package/cegui/cegui.mk
@@ -0,0 +1,117 @@
+################################################################################
+#
+# cegui
+#
+################################################################################
+
+CEGUI_VERSION = 0-8-7
+CEGUI_SITE = $(call github,cegui,cegui,v$(CEGUI_VERSION))
+CEGUI_LICENSE = MIT
+CEGUI_LICENSE_FILES = COPYING
+CEGUI_INSTALL_STAGING = YES
+CEGUI_DEPENDENCIES = glm \
+ $(if $(BR2_PACKAGE_LIBGLFW),libglfw) \
+ $(if $(BR2_PACKAGE_HAS_LIBGL),libgl) \
+ $(if $(BR2_PACKAGE_HAS_LIBGLES),libgles) \
+ $(if $(BR2_PACKAGE_LIBGLEW),libglew) \
+ $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+
+ifeq ($(BR2_PACKAGE_LIBEPOXY),y)
+CEGUI_DEPENDENCIES += libepoxy
+CEGUI_CONF_OTPS += -DCEGUI_USE_EPOXY=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_USE_EPOXY=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_OGRE),y)
+CEGUI_DEPENDENCIES += ogre
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_OGRE=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_OGRE=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_EXPAT),y)
+CEGUI_DEPENDENCIES += expat
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_EXPAT=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_EXPAT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_IRRLICHT),y)
+CEGUI_DEPENDENCIES += irrlicht
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_IRRLICHT=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_IRRLICHT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_SDL2)$(BR2_PACKAGE_SDL2_IMAGE),yy)
+CEGUI_DEPENDENCIES += sdl2 sdl2_image
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_SDL2=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_SDL2=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_PCRE),y)
+CEGUI_DEPENDENCIES += pcre
+CEGUI_CONF_OTPS += -DCEGUI_HAS_PCRE_REGEX=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_HAS_PCRE_REGEX=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_FREETYPE),y)
+CEGUI_DEPENDENCIES += freetype
+CEGUI_CONF_OTPS += -DCEGUI_HAS_FREETYPE=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_HAS_FREETYPE=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_MINIZIP),y)
+CEGUI_DEPENDENCIES += minizip
+CEGUI_CONF_OTPS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_XERCES),y)
+CEGUI_DEPENDENCIES += xerces
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_XERCES=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+CEGUI_DEPENDENCIES += libxml2
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_RAPIDXML),y)
+CEGUI_DEPENDENCIES += rapidxml
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_TINYXML),y)
+CEGUI_DEPENDENCIES += tinyxml
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_TINYXML2),y)
+CEGUI_DEPENDENCIES += tinyxml2
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LIBFREEIMAGE),y)
+CEGUI_DEPENDENCIES += libfreeimage
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON
+else
+CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF
+endif
+
+$(eval $(cmake-package))
diff --git a/package/cegui06/0001-stddef.h.patch b/package/cegui06/0001-stddef.h.patch
deleted file mode 100644
index cc16effc25..0000000000
--- a/package/cegui06/0001-stddef.h.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-includes: ptrdiff_t is defined in stddef.h
-
-ptrdiff_t is defined in the stddef.h header, so this
-header must be included.
-
-Do the #include in a common header to avoid doing it
-all over the place.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
-
----
-Patch not sent upstream, it's a no-longer-maintained branch.
-To be noted, however, is that the current devel branch is
-still missing that include.
-
-diff -durN cegui06-0.6.2.orig/include/CEGUIBase.h cegui06-0.6.2/include/CEGUIBase.h
---- cegui06-0.6.2.orig//include/CEGUIBase.h 2008-02-11 15:38:27.000000000 +0100
-+++ cegui06-0.6.2/include/CEGUIBase.h 2012-08-19 22:51:50.260385978 +0200
-@@ -34,6 +34,7 @@
- #define _CEGUIBase_h_
-
- #include <cassert>
-+#include <stddef.h>
-
- // bring in configuration options
- #include "CEGUIConfig.h"
diff --git a/package/cegui06/cegui06.hash b/package/cegui06/cegui06.hash
deleted file mode 100644
index f46bcee242..0000000000
--- a/package/cegui06/cegui06.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# Locally computed:
-sha256 eb77741cd9fcc927a876e8116b98691212e973d2264e2071406423f6ca3e305f CEGUI-0.6.2b.tar.gz
-sha256 da1c10009579e3eb8d3b3abc65d538a2890f70ff7fd1f05b73a4f9e3fff5c56e COPYING
diff --git a/package/cegui06/cegui06.mk b/package/cegui06/cegui06.mk
deleted file mode 100644
index d3da3ebc4c..0000000000
--- a/package/cegui06/cegui06.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-#
-# cegui06
-#
-################################################################################
-
-# Do not update the version, we need exactly that one for Spice.
-CEGUI06_VERSION_MAJOR = 0.6.2
-CEGUI06_VERSION = $(CEGUI06_VERSION_MAJOR)b
-CEGUI06_SOURCE = CEGUI-$(CEGUI06_VERSION).tar.gz
-CEGUI06_SITE = http://downloads.sourceforge.net/project/crayzedsgui/CEGUI%20Mk-2/$(CEGUI06_VERSION_MAJOR)
-CEGUI06_LICENSE = MIT
-CEGUI06_LICENSE_FILES = COPYING
-CEGUI06_INSTALL_STAGING = YES
-
-CEGUI06_DEPENDENCIES = \
- expat \
- freetype \
- pcre
-
-CEGUI06_CONF_OPTS = \
- --enable-expat \
- --disable-external-tinyxml \
- --disable-xerces-c \
- --disable-libxml \
- --disable-tinyxml \
- --disable-opengl-renderer \
- --disable-external-glew \
- --disable-irrlicht-renderer \
- --disable-directfb-renderer \
- --disable-samples \
- --disable-lua-module \
- --disable-toluacegui \
- --disable-external-toluapp
-
-$(eval $(autotools-package))
More information about the buildroot
mailing list