cegui: switch to tracking dev branch

src/cegui-1-fixes.patch

@@ -1,52 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Quintus <quintus@quintilianus.eu>
-Date: Fri, 29 Jul 2016 23:11:19 +1000
-Subject: [PATCH] Fix linking order.
-
-Fixed upstream since commit bf699651740a1206c9ce214b91426db1e709ddc4,
-which was after version 0.8.7, so remove this patch when upgrading to
-version 0.8.8 or newer.
-See: https://bitbucket.org/cegui/cegui/issues/1131/opengl-renderers-fail-to-crosscompile-due
-
-diff --git a/cegui/src/RendererModules/OpenGL/CMakeLists.txt b/cegui/src/RendererModules/OpenGL/CMakeLists.txt
-index 1111111..2222222 100644
---- a/cegui/src/RendererModules/OpenGL/CMakeLists.txt
-+++ b/cegui/src/RendererModules/OpenGL/CMakeLists.txt
-@@ -52,9 +52,9 @@ if (${CEGUI_USE_EPOXY})
-     cegui_add_dependency(${CEGUI_TARGET_NAME} GLM)
-     cegui_add_dependency(${CEGUI_TARGET_NAME} EPOXY)
- elseif (${CEGUI_USE_GLEW})
--    cegui_add_dependency(${CEGUI_TARGET_NAME} OPENGL)
-     cegui_add_dependency(${CEGUI_TARGET_NAME} GLM)
-     cegui_add_dependency(${CEGUI_TARGET_NAME} GLEW PUBLIC)
-+    cegui_add_dependency(${CEGUI_TARGET_NAME} OPENGL)
- endif ()
- 
- cegui_target_link_libraries(${CEGUI_TARGET_NAME} ${CEGUI_BASE_LIBNAME})
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Quintus <quintus@quintilianus.eu>
-Date: Fri, 29 Jul 2016 23:12:27 +1000
-Subject: [PATCH] Build .pc files on Windows
-
-CEGUI does not build the .pc files when targetting Windows.
-See upstream ticket: https://bitbucket.org/cegui/cegui/issues/1135
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1111111..2222222 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -599,7 +599,7 @@ configure_file( cegui/include/CEGUI/ModuleConfig.h.in cegui/include/CEGUI/Module
- configure_file( samples/common/include/CEGUISamplesConfig.h.in samples/common/include/CEGUISamplesConfig.h )
- configure_file( doc/doxygen/doxyfile.in doc/doxygen/doxyfile )
- 
--if (UNIX AND NOT APPLE)
-+if (MINGW OR (UNIX AND NOT APPLE))
-     configure_file( cegui/CEGUI.pc.in cegui/CEGUI-${CEGUI_VERSION_MAJOR}.pc @ONLY )
-     install(FILES ${PROJECT_BINARY_DIR}/cegui/CEGUI-${CEGUI_VERSION_MAJOR}.pc DESTINATION ${CEGUI_PKGCONFIG_INSTALL_DIR})
- 

src/cegui.mk

@@ -3,11 +3,11 @@
 
 PKG             := cegui
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.8.7
-$(PKG)_CHECKSUM := b351e8957716d9c170612c13559e49530ef911ae4bac2feeb2dacd70b430e518
-$(PKG)_SUBDIR   := cegui-$($(PKG)_VERSION)
-$(PKG)_FILE     := cegui-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/crayzedsgui/CEGUI%20Mk-2/0.8/$($(PKG)_FILE)?download
+$(PKG)_VERSION  := 9726a2b505fb
+$(PKG)_CHECKSUM := 14b3da7f1f89693192cd9afbf2126f4519508245ed156de893828e31ce676e9e
+$(PKG)_SUBDIR   := $(PKG)-$(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_URL      := https://bitbucket.org/$(PKG)/$(PKG)/get/$($(PKG)_VERSION).tar.bz2
 $(PKG)_DEPS     := gcc expat freeglut freeimage freetype libxml2 pcre xerces devil glm glew
 
 define $(PKG)_UPDATE
@@ -18,11 +18,19 @@ define $(PKG)_UPDATE
     tail -1
 endef
 
+# track dev branch v0-8 until next release
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'https://bitbucket.org/cegui/cegui/commits/branch/v0-8' | \
+    $(SED) -n 's,.*cegui/cegui/commits/\([^?]\{12\}\).*at=.*,\1,p' | \
+    head -1
+endef
+
 # Use pkg-config to set FREEIMAGE_LIB and GLEW_STATIC to prevent "_imp__" errors
 # freeimage and xerces don't have shared builds - disable with $(CMAKE_STATIC_BOOL)
 define $(PKG)_BUILD
     cd '$(BUILD_DIR)' && '$(TARGET)-cmake' \
         -DCEGUI_BUILD_STATIC_CONFIGURATION=$(CMAKE_STATIC_BOOL) \
+        -DCEGUI_INSTALL_PKGCONFIG=ON \
         -DCEGUI_SAMPLES_ENABLED=OFF \
         -DCEGUI_BUILD_TESTS=OFF \
         -DCEGUI_BUILD_APPLICATION_TEMPLATES=OFF \