opencollada-git: Update to r1680

mingw-w64-opencollada-git/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=opencollada
 pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
-pkgver=r1471.9fea0aa
+pkgver=r1680.e1f8a406
 pkgrel=1
 pkgdesc="Stream based reader and writer library for COLLADA files (mingw-w64)"
 arch=('any')
@@ -21,14 +21,14 @@ source=("${_realname}"::"git+https://github.com/KhronosGroup/OpenCOLLADA.git"
         opencollada-signed-char.patch
         fix-inttypes-mingw.patch
         opencollada-cmake.patch
-        opencollada-no-undefined.patch)
+        opencollada-disable-test-mingw.patch)
 sha256sums=('SKIP'
             '37e70a63264974c31fde4a94908a60954af454fd28412bd141c41aac9fcbd4c1'
             '18f1bf9f57d1c67aa35927fb0d1b0b38def52b189742021f1268eb2bdbffc963'
             '5b7c53cc152fdec12352914010131ce057118565109d2acd88fc5d7e2a39cf45'
             '6fb7cf3116bdcb93af58a2487c44b298afd11e83c21ec87a8c921eda6dcba766'
             '928503c46b3b6324986c2a3d8ca1b79597984e559e6d233dfec2e669b772fe20'
-            '20df25d36b616b03b775e200cd28362063a80206e96f47a1fb0a5ac216448d60')
+            '51306dc69f4f30536be9bb1beb63a88b524a297f9f58297c60fa2e34f14cb90a')
 
 pkgver() {
   cd "${srcdir}/${_realname}"
@@ -42,7 +42,7 @@ prepare() {
   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
+  patch -p0 -i ${srcdir}/opencollada-disable-test-mingw.patch
 }
 
 build() {

mingw-w64-opencollada-git/opencollada-disable-test-mingw.patch

@@ -0,0 +1,32 @@
+Index: DAEValidator/CMakeLists.txt
+===================================================================
+--- DAEValidator/CMakeLists.txt.orig
++++ DAEValidator/CMakeLists.txt
+@@ -91,16 +91,16 @@
+ target_link_libraries(DAEValidatorExecutable ${Libraries})
+ set_target_properties(DAEValidatorExecutable PROPERTIES OUTPUT_NAME DAEValidator)
+ 
+-if (WIN32)
++if (MSVC)
+ # C4505: 'function' : unreferenced local function has been removed
+ # C4514: 'function' : unreferenced inline function has been removed
+ # C4592: symbol will be dynamically initialized (implementation limitation)
+ # C4710: 'function' : function not inlined
+ # C4711: function 'function' selected for inline expansion
+ # C4820: 'bytes' bytes padding added after construct 'member_name'
+ 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /WX /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820")
+ else ()
+-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
+ endif ()
+ 
+ add_custom_command(
+@@ -128,7 +128,7 @@
+     endforeach(templateFile)
+ endmacro(configure_files)
+ 
+-if (WIN32 AND ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} GREATER 3.0.1)
++if (MSVC AND ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} GREATER 3.0.1)
+ 	set(DAEValidatorTestsSources
+ 		tests/src/ArgumentParserTests.cpp
+ 		tests/src/Common.cpp

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

@@ -1,33 +0,0 @@
-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)