Skip to contentSkip to conversation

package/cegui: disable minizip support

PATCH New Bartosz Bilas 2 participants 2 messages Apr 7, 2020 – Apr 8, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/cegui: disable minizip support

Disable support for minizip since cegui is not compatible with the existing buildroot's version due to lack of necessary header. It will be restored when upstream will switch to the new version.

Fixes:
- http://autobuild.buildroot.net/results/65fa719e8b2466409a12eb103a8938e1488efc0c
- http://autobuild.buildroot.net/results/ef37a0cc16daacb7206d736c86b511c7d90eefe0

and many more.

---
 package/cegui/cegui.mk | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
package/cegui/cegui.mk +2 -8
index 134b222362..434201b1f8 100644
@@ -9,7 +9,8 @@ CEGUI_SITE = $(call github,cegui,cegui,v$(CEGUI_VERSION))
 CEGUI_LICENSE = MIT
 CEGUI_LICENSE_FILES = COPYING
 CEGUI_INSTALL_STAGING = YES
-CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF \
+		   -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF
 CEGUI_DEPENDENCIES = glm \
 		$(if $(BR2_PACKAGE_LIBGLFW),libglfw) \
 		$(if $(BR2_PACKAGE_HAS_LIBGL),libgl) \
@@ -66,13 +67,6 @@ else
 CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_MINIZIP),y)
-CEGUI_DEPENDENCIES += minizip
-CEGUI_CONF_OPTS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=ON
-else
-CEGUI_CONF_OPTS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF
-endif
-
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
 CEGUI_DEPENDENCIES += libxml2
 CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON
Signature · 1 line
2.26.0
#1 lore raw

PATCH 1/1 package/cegui: disable minizip support

Quoted 9 lines · On Tue, 7 Apr 2020 17:15:16 +0200 Bartosz Bilas <[email protected]>…

Disable support for minizip since cegui is not compatible with the existing buildroot's version due to lack of necessary header. It will be restored when upstream will switch to the new version.

Fixes:
- http://autobuild.buildroot.net/results/65fa719e8b2466409a12eb103a8938e1488efc0c
- http://autobuild.buildroot.net/results/ef37a0cc16daacb7206d736c86b511c7d90eefe0

Quoted 6 lines

and many more.

---
 package/cegui/cegui.mk | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com