assimp: Update to 3.1.1

mingw-w64-assimp/PKGBUILD

@@ -1,42 +1,51 @@
 # Maintainer: Alexey Pavlov <[email protected]>
 
 _realname=assimp
-
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.0.1270
+pkgver=3.1.1
 pkgrel=1
 pkgdesc="Portable Open Source library to import various well-known 3D model formats in an uniform manner (mingw-w64)"
 arch=('any')
 license=('BSD')
-depends=("${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-crt" "${MINGW_PACKAGE_PREFIX}-zlib")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc" 'unzip')
+depends=("${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-zlib")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc")
 url=('http://assimp.sourceforge.net/index.html')
-source=("http://downloads.sourceforge.net/project/assimp/assimp-3.0/assimp--${pkgver}-source-only.zip")
-options=(!strip !buildflags staticlibs)
-sha1sums=('e80a3a4326b649ed6585c0ce312ed6dd68942834')
+source=(https://github.com/assimp/assimp/archive/v${pkgver}.tar.gz
+        build-fixes.patch)
+options=('!strip' 'staticlibs')
+sha1sums=('e8c54a31d16aae77901d4f51c0d09e7148dcba0d'
+          'b4e67630f87feba32c8ca1c4a615b3950cdc53ab')
+
+prepare() {
+  cd ${_realname}-${pkgver}
+  patch -p1 -i ${srcdir}/build-fixes.patch
+}
 
 build() {
-  mkdir -p ${pkgdir}${MINGW_PREFIX}
-  pushd ${pkgdir}${MINGW_PREFIX} > /dev/null
-  export PREFIX_WIN=`pwd -W`
-  popd > /dev/null
+  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
 
-  pushd ${MINGW_PREFIX} > /dev/null
-  export PREFIX_DEPS=`pwd -W`
-  popd > /dev/null
-
-    cd "${srcdir}/${_realname}--${pkgver}-source-only"
-    ${MINGW_PREFIX}/bin/cmake.exe \
+  ${MINGW_PREFIX}/bin/cmake.exe \
     -G"MSYS Makefiles" \
-    -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX_WIN} \
-    -DBUILD_ASSIMP_TOOLS=NO \
-    -DBUILD_STATIC_LIB=ON \
-    -DCMAKE_BUILD_TYPE=RELEASE
-    make
+    -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \
+    -DCMAKE_BUILD_TYPE=RELEASE \
+    -DASSIMP_BUILD_ASSIMP_TOOLS=YES \
+    -DASSIMP_ENABLE_BOOST_WORKAROUND=OFF \
+    -DASSIMP_BUILD_STATIC_LIB=OFF \
+    -DASSIMP_BUILD_TESTS=OFF \
+    -DDirectX_DXERR_LIBRARY=${MINGW_PREFIX}/${MINGW_CHOST}/lib/libdxerr9.a \
+    ../${_realname}-${pkgver}
+  make
 }
 
 package() {
-    cd "${srcdir}/${_realname}--${pkgver}-source-only"
-    make -j1 install #DESTDIR="$pkgdir"
-  install -Dm644 "${srcdir}/${_realname}--${pkgver}-source-only/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${pkgname}/LICENSE"
+  cd "${srcdir}//build-${MINGW_CHOST}"
+  make -j1 install
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
+
+  pushd ${pkgdir}${MINGW_PREFIX} > /dev/null
+  export PREFIX_WIN=`pwd -W`
+  popd > /dev/null
+  sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" \
+    -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/assimp.pc
 }

mingw-w64-assimp/build-fixes.patch

@@ -0,0 +1,26 @@
+--- assimp/tools/assimp_cmd/assimp_cmd.rc.orig	2014-06-12 21:50:48.160000000 +0400
++++ assimp/tools/assimp_cmd/assimp_cmd.rc	2014-06-12 21:54:56.986400000 +0400
+@@ -1,7 +1,7 @@
+ // Microsoft Visual C++ generated resource script.
+ //
+ #include "resource.h"
+-#include "../../revision.h"
++#include "revision.h"
+
+ #define APSTUDIO_READONLY_SYMBOLS
+ /////////////////////////////////////////////////////////////////////////////
+--- assimp/test/unit/Main.cpp.orig	2014-06-12 22:00:03.635600000 +0400
++++ assimp/test/unit/Main.cpp	2014-06-12 22:00:14.150000000 +0400
+@@ -25,10 +25,9 @@
+ 	 	aiDefaultLogStream_DEBUGGER | aiDefaultLogStream_FILE);
+
+ 	// .. and C. They should smoothly work together
++	aiLogStream logS = aiGetPredefinedLogStream(aiDefaultLogStream_FILE, "AssimpLog_C.txt");
+ 	aiEnableVerboseLogging(AI_TRUE);
+-	aiAttachLogStream(&aiGetPredefinedLogStream(
+-		aiDefaultLogStream_FILE,
+-		"AssimpLog_C.txt"));
++	aiAttachLogStream(&logS);
+
+
+ 	// ............................................................................