cegui: WIP update to 0.8.7

mingw-w64-cegui/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=cegui
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.8.4
+pkgver=0.8.7
 pkgrel=1
 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines (mingw-w64)"
 arch=('any')
@@ -11,45 +11,48 @@ url="http://cegui.org.uk"
 license=("MIT")
 #makedepends=('doxygen' 'gtk2' 'graphviz' 'irrlicht' 'glm' 'tolua++')
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-    "${MINGW_PACKAGE_PREFIX}-pkg-config"
-    "${MINGW_PACKAGE_PREFIX}-cmake"
-    "${MINGW_PACKAGE_PREFIX}-python2"
-    "mercurial")
+             "${MINGW_PACKAGE_PREFIX}-pkg-config"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-doxygen"
+             "${MINGW_PACKAGE_PREFIX}-python2"
+             "mercurial")
 depends=("${MINGW_PACKAGE_PREFIX}-tinyxml"
-    "${MINGW_PACKAGE_PREFIX}-boost"
-    "${MINGW_PACKAGE_PREFIX}-DevIL"
-    "${MINGW_PACKAGE_PREFIX}-expat"
-    "${MINGW_PACKAGE_PREFIX}-FreeImage"
-    "${MINGW_PACKAGE_PREFIX}-freetype"
-    "${MINGW_PACKAGE_PREFIX}-fribidi"
-    "${MINGW_PACKAGE_PREFIX}-glew"
-    #"${MINGW_PACKAGE_PREFIX}-glfw"
-    "${MINGW_PACKAGE_PREFIX}-glm"
-    "${MINGW_PACKAGE_PREFIX}-irrlicht"
-    "${MINGW_PACKAGE_PREFIX}-libxml2"
-    "${MINGW_PACKAGE_PREFIX}-libiconv"
-    "${MINGW_PACKAGE_PREFIX}-lua51"
-    "${MINGW_PACKAGE_PREFIX}-ogre3d"
-    "${MINGW_PACKAGE_PREFIX}-ois"
-    "${MINGW_PACKAGE_PREFIX}-pcre"
-    #"${MINGW_PACKAGE_PREFIX}-tolua"
-    "${MINGW_PACKAGE_PREFIX}-xerces-c"
-    "${MINGW_PACKAGE_PREFIX}-zlib")
+         "${MINGW_PACKAGE_PREFIX}-boost"
+         "${MINGW_PACKAGE_PREFIX}-devil"
+         "${MINGW_PACKAGE_PREFIX}-expat"
+         "${MINGW_PACKAGE_PREFIX}-FreeImage"
+         "${MINGW_PACKAGE_PREFIX}-freetype"
+         "${MINGW_PACKAGE_PREFIX}-fribidi"
+         "${MINGW_PACKAGE_PREFIX}-glew"
+         "${MINGW_PACKAGE_PREFIX}-glfw"
+         "${MINGW_PACKAGE_PREFIX}-glm"
+         "${MINGW_PACKAGE_PREFIX}-irrlicht"
+         "${MINGW_PACKAGE_PREFIX}-libxml2"
+         "${MINGW_PACKAGE_PREFIX}-libiconv"
+         "${MINGW_PACKAGE_PREFIX}-lua51"
+         "${MINGW_PACKAGE_PREFIX}-ogre3d"
+         "${MINGW_PACKAGE_PREFIX}-ois"
+         "${MINGW_PACKAGE_PREFIX}-pcre"
+         "${MINGW_PACKAGE_PREFIX}-SDL2"
+         "${MINGW_PACKAGE_PREFIX}-tinyxml"
+         #"${MINGW_PACKAGE_PREFIX}-tolua"
+         "${MINGW_PACKAGE_PREFIX}-xerces-c"
+         "${MINGW_PACKAGE_PREFIX}-zlib")
 options=('staticlibs' 'strip')
 source=("https://downloads.sourceforge.net/crayzedsgui/cegui-${pkgver}.tar.bz2"
-    freetype.patch
-    mingw-w64-fix.patch
-    fix-finding-glew.patch
-    fix-finding-directx.patch
-    fix-finding-glfw3.patch
-    fix-dxerr-libname.patch)
-sha256sums=('b5fcbd548b83045e92c4da413928113be77ebee0117368925e1904b3b957a388'
+        freetype.patch
+        mingw-w64-fix.patch
+        fix-finding-glew.patch
+        fix-finding-directx.patch
+        fix-finding-glfw3.patch
+        fix-dxerr-libname.patch)
+sha256sums=('b351e8957716d9c170612c13559e49530ef911ae4bac2feeb2dacd70b430e518'
             '83e84d862a195c61901b0dd53a1c47434b812fff15fb977f390a45f19dcc4a64'
             '31e666ea015b30b9ee939b69994255eacb2e75fa9dec86538715e4b9a026863a'
-            'c7ad92f3ce9ba0f23ca1a6928b69c7ad041af94ece860de59ddce616c1ec311c'
-            'c4e16b620b3881e35333bef41b4c38378d965bfdd215b32cc94c73816bb9d24f'
+            '3aa712304267353afe103cd8efa5f6f7b87fa98423d77610716d15a425194f2e'
+            '1ae821516efaeecce5b27579d5236b11b3eb8075d3e173d1b3b973e81c1ee22e'
             '181385b172f952265a0be6a96eccd0ab9d4cb8846f7e07cd5d5e5095a0a591a0'
-            '85d5dec0ff7d6a7cd3b98057b910a0ab4eafaedd68d45bfd5fd70093fa0c35a1')
+            '4c22f176f0fa430eeaf2ac6b21d587c7e1f3c04d8d3c03e957a35a95f077531b')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"

mingw-w64-cegui/fix-dxerr-libname.patch

@@ -5,16 +5,7 @@
  
      # This works around an issue in the prebuilt deps and can be removed once those are fixed :)
 -    if (WIN32)
-+    if (WIN32 AND NOT MINGW)
++    if (MSVC)
          set_target_properties(${CEGUI_TARGET_NAME}_Static PROPERTIES LINK_FLAGS_DEBUG /NODEFAULTLIB:freeglut.lib)
      endif()
- 
-@@ -221,7 +221,7 @@
- endif()
- 
- if (CEGUI_BUILD_RENDERER_DIRECT3D9 OR CEGUI_BUILD_RENDERER_DIRECT3D10 OR CEGUI_BUILD_RENDERER_DIRECT3D11)
--    cegui_target_link_libraries(${CEGUI_TARGET_NAME} dxerr)
-+    cegui_target_link_libraries(${CEGUI_TARGET_NAME} dxerr9)
- 
-     if (CEGUI_BUILD_RENDERER_DIRECT3D9)
-         cegui_target_link_libraries(${CEGUI_TARGET_NAME} ${CEGUI_DIRECT3D9_RENDERER_LIBNAME} d3d9)
+ 

mingw-w64-cegui/fix-finding-directx.patch

@@ -1,23 +1,23 @@
 --- cegui-0.8.3/cmake/FindDirectXSDK.cmake.orig	2014-04-21 10:46:47.705000000 +0400
 +++ cegui-0.8.3/cmake/FindDirectXSDK.cmake	2014-04-21 11:13:02.642600000 +0400
 @@ -9,15 +9,15 @@
-     set (DIRECTXSDK_ARCH x64)
- endif()
+         set (DIRECTXSDK_ARCH x64)
+     endif()
  
--find_path(DIRECTXSDK_H_PATH NAMES d3d10.h PATHS ENV DXSDK_DIR PATH_SUFFIXES Include NO_DEFAULT_PATH)
--find_path(DIRECTXSDK_LIB_PATH NAMES d3dx10d.lib PATHS ENV DXSDK_DIR PATH_SUFFIXES "Lib/${DIRECTXSDK_ARCH}")
-+find_path(DIRECTXSDK_H_PATH NAMES d3d10.h PATHS ENV DXSDK_DIR PATH_SUFFIXES include NO_DEFAULT_PATH)
-+find_path(DIRECTXSDK_LIB_PATH NAMES libd3dx10.a PATHS ENV DXSDK_DIR PATH_SUFFIXES lib)
+-    find_path(DIRECTXSDK_H_PATH NAMES d3d10.h PATHS ENV DXSDK_DIR PATH_SUFFIXES Include NO_DEFAULT_PATH)
+-    find_path(DIRECTXSDK_LIB_PATH NAMES d3dx10d.lib PATHS ENV DXSDK_DIR PATH_SUFFIXES "Lib/${DIRECTXSDK_ARCH}")
++    find_path(DIRECTXSDK_H_PATH NAMES d3d10.h PATHS ENV DXSDK_DIR PATH_SUFFIXES include NO_DEFAULT_PATH)
++    find_path(DIRECTXSDK_LIB_PATH NAMES libd3dx10.a PATHS ENV DXSDK_DIR PATH_SUFFIXES lib)
  
- # now test for the specific d3d lib versions and set MAX_D3D accordingly
--if (EXISTS "${DIRECTXSDK_LIB_PATH}/d3d11.lib")
-+if (EXISTS "${DIRECTXSDK_LIB_PATH}/libd3d11.a")
-     set (DIRECTXSDK_MAX_D3D 11)
--elseif (EXISTS "${DIRECTXSDK_LIB_PATH}/d3d10.lib")
-+elseif (EXISTS "${DIRECTXSDK_LIB_PATH}/libd3d10.a")
-     set (DIRECTXSDK_MAX_D3D 10)
--elseif (EXISTS "${DIRECTXSDK_LIB_PATH}/d39.lib")
-+elseif (EXISTS "${DIRECTXSDK_LIB_PATH}/libd3d9.a")
-     set (DIRECTXSDK_MAX_D3D 9)
- else()
-     set (DIRECTXSDK_MAX_D3D)
+     # now test for the specific d3d lib versions and set MAX_D3D accordingly
+-    if (EXISTS "${DIRECTXSDK_LIB_PATH}/d3d11.lib")
++    if (EXISTS "${DIRECTXSDK_LIB_PATH}/libd3d11.a")
+         set (DIRECTXSDK_MAX_D3D 11)
+-    elseif (EXISTS "${DIRECTXSDK_LIB_PATH}/d3d10.lib")
++    elseif (EXISTS "${DIRECTXSDK_LIB_PATH}/libd3d10.a")
+         set (DIRECTXSDK_MAX_D3D 10)
+-    elseif (EXISTS "${DIRECTXSDK_LIB_PATH}/d3d9.lib")
++    elseif (EXISTS "${DIRECTXSDK_LIB_PATH}/libd3d9.a")
+         set (DIRECTXSDK_MAX_D3D 9)
+     else()
+         set (DIRECTXSDK_MAX_D3D)

mingw-w64-cegui/fix-finding-glew.patch

@@ -4,14 +4,14 @@
  include(FindPackageHandleStandardArgs)
  
  find_path(GLEW_H_PATH NAMES GL/glew.h)
--find_library(GLEW_LIB NAMES GLEW libGLEW PATH_SUFFIXES dynamic)
+-find_library(GLEW_LIB NAMES GLEW libGLEW glew libglew PATH_SUFFIXES dynamic)
 +find_library(GLEW_LIB NAMES GLEW libGLEW libglew32 glew32 PATH_SUFFIXES dynamic)
- find_library(GLEW_LIB_DBG NAMES GLEW_d libGLEW_d PATH_SUFFIXES dynamic)
+ find_library(GLEW_LIB_DBG NAMES GLEW_d libGLEW_d glew_d libglew_d PATH_SUFFIXES dynamic)
  mark_as_advanced(GLEW_H_PATH GLEW_LIB GLEW_LIB_DBG)
  
  if (WIN32 OR APPLE)
--    find_library(GLEW_LIB_STATIC NAMES GLEW libGLEW PATH_SUFFIXES static)
+-    find_library(GLEW_LIB_STATIC NAMES GLEW libGLEW glew libglew PATH_SUFFIXES static)
 +    find_library(GLEW_LIB_STATIC NAMES GLEW libGLEW libglew32 glew32 PATH_SUFFIXES static)
-     find_library(GLEW_LIB_STATIC_DBG NAMES GLEW_d libGLEW_d PATH_SUFFIXES static)
+     find_library(GLEW_LIB_STATIC_DBG NAMES GLEW_d libGLEW_d glew_d libglew_d PATH_SUFFIXES static)
      mark_as_advanced(GLEW_LIB_STATIC GLEW_LIB_STATIC_DBG)
  endif()