opencollada-git: Update to r1471.9fea0aa

mingw-w64-opencollada-git/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=opencollada
 pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
-pkgver=r1434.c0bbde3
+pkgver=r1471.9fea0aa
 pkgrel=1
 pkgdesc="Stream based reader and writer library for COLLADA files (mingw-w64)"
 arch=('any')
@@ -17,10 +17,18 @@ conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 options=('staticlibs' 'strip')
 source=("${_realname}"::"git+https://github.com/KhronosGroup/OpenCOLLADA.git"
         fix-mingw-w64.patch
-        fix-missing-include.patch)
+        fix-missing-include.patch
+        opencollada-signed-char.patch
+        fix-inttypes-mingw.patch
+        opencollada-cmake.patch
+        opencollada-no-undefined.patch)
 sha256sums=('SKIP'
             '37e70a63264974c31fde4a94908a60954af454fd28412bd141c41aac9fcbd4c1'
-            '18f1bf9f57d1c67aa35927fb0d1b0b38def52b189742021f1268eb2bdbffc963')
+            '18f1bf9f57d1c67aa35927fb0d1b0b38def52b189742021f1268eb2bdbffc963'
+            '5b7c53cc152fdec12352914010131ce057118565109d2acd88fc5d7e2a39cf45'
+            '6fb7cf3116bdcb93af58a2487c44b298afd11e83c21ec87a8c921eda6dcba766'
+            '928503c46b3b6324986c2a3d8ca1b79597984e559e6d233dfec2e669b772fe20'
+            '20df25d36b616b03b775e200cd28362063a80206e96f47a1fb0a5ac216448d60')
 
 pkgver() {
   cd "${srcdir}/${_realname}"
@@ -31,6 +39,10 @@ prepare() {
   cd "${srcdir}/${_realname}"
   patch -p0 -i ${srcdir}/fix-mingw-w64.patch
   patch -p1 -i ${srcdir}/fix-missing-include.patch
+  patch -p0 -i ${srcdir}/opencollada-signed-char.patch
+  patch -p1 -i ${srcdir}/fix-inttypes-mingw.patch
+  patch -p0 -i ${srcdir}/opencollada-cmake.patch
+  patch -p0 -i ${srcdir}/opencollada-no-undefined.patch
 }
 
 build() {
@@ -52,6 +64,6 @@ package() {
   make DESTDIR=${pkgdir} install
 
   # replace absolute paths in .cmake scripts
-  sed -i '1i get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)' "${pkgdir}${MINGW_PREFIX}/lib/${_realname}/cmake"/*Targets*.cmake
-  sed -i "s;$(cygpath -ma "${pkgdir}${MINGW_PREFIX}");\${PACKAGE_PREFIX_DIR};" "${pkgdir}${MINGW_PREFIX}/lib/${_realname}/cmake"/*Targets*.cmake
+  sed -i '1i get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)' "${pkgdir}${MINGW_PREFIX}/lib/cmake"/*Targets*.cmake
+  sed -i "s;$(cygpath -ma "${pkgdir}${MINGW_PREFIX}");\${PACKAGE_PREFIX_DIR};" "${pkgdir}${MINGW_PREFIX}/lib/cmake"/*Targets*.cmake
 }

mingw-w64-opencollada-git/fix-inttypes-mingw.patch

@@ -0,0 +1,20 @@
+--- opencollada/common/libBuffer/include/CommonFWriteBufferFlusher.h.orig	2016-10-14 12:42:00.737418400 +0300
++++ opencollada/common/libBuffer/include/CommonFWriteBufferFlusher.h	2016-10-14 12:44:02.532358500 +0300
+@@ -40,6 +40,9 @@
+ #endif
+ #endif
+ 
++#ifdef __MINGW32__
++#include <inttypes.h>
++#else
+ #if __cplusplus > 199711L
+ typedef int64_t __int64;
+ #else
+@@ -47,6 +50,7 @@
+ typedef int64_t __int64;
+ #endif
+ #endif
++#endif
+ 
+ namespace Common
+ {

mingw-w64-opencollada-git/opencollada-cmake.patch

@@ -0,0 +1,15 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -190,8 +190,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
+ #-----------------------------------------------------------------------------
+ # Install vars
+ 
+-set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_PREFIX}/include/opencollada)
+-set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/opencollada)
++set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_PREFIX}/include)
++set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib)
+ set(OPENCOLLADA_INST_CMAKECONFIG ${OPENCOLLADA_INST_LIBRARY}/cmake)
+ 
+ 

mingw-w64-opencollada-git/opencollada-no-undefined.patch

@@ -0,0 +1,33 @@
+Index: common/libBuffer/CMakeLists.txt
+===================================================================
+--- common/libBuffer/CMakeLists.txt.orig
++++ common/libBuffer/CMakeLists.txt
+@@ -28,7 +28,10 @@ set(SRC
+ 	include/performanceTest/performanceTest.h
+ )
+ 
+-set(TARGET_LIBS ftoa)
++set(TARGET_LIBS
++	ftoa
++	UTF
++)
+ 
+ include_directories(
+ 	${libBuffer_include_dirs}
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -270,10 +270,10 @@ else ()  # if pcre not found building it
+ endif ()
+ 
+ # building required libs
++add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)                                    
++add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
+ add_subdirectory(common/libftoa)
+ add_subdirectory(common/libBuffer)
+-add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
+-add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
+ 
+ # building OpenCOLLADA libs
+ add_subdirectory(COLLADABaseUtils)

mingw-w64-opencollada-git/opencollada-signed-char.patch

@@ -0,0 +1,13 @@
+Index: COLLADABaseUtils/src/COLLADABUURI.cpp
+===================================================================
+--- COLLADABaseUtils/src/COLLADABUURI.cpp.orig
++++ COLLADABaseUtils/src/COLLADABUURI.cpp
+@@ -32,7 +32,7 @@ namespace COLLADABU
+ 
+ 
+ 
+-	const char HEX2DEC[256] = 
++	const signed char HEX2DEC[256] = 
+ 	{
+ 		/*       0  1  2  3   4  5  6  7   8  9  A  B   C  D  E  F */
+ 		/* 0 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,