3.2

2 files changed, 40 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f07769149518..0208245f21a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
+# Generated by mksrcinfo v8
+# Mon Feb 22 20:25:25 UTC 2016
 pkgbase = mingw-w64-assimp
 	pkgdesc = Portable Open Source library to import various well-known 3D model formats in an uniform manner (mingw-w64)
-	pkgver = 3.1.1
+	pkgver = 3.2
 	pkgrel = 1
-	url = http://assimp.sourceforge.net/index.html
+	url = http://www.assimp.org/
 	arch = any
 	license = BSD
 	makedepends = mingw-w64-cmake
-	makedepends = mingw-w64-gcc
-	makedepends = unzip
+	makedepends = mingw-w64-boost
 	depends = mingw-w64-crt
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://github.com/assimp/assimp/archive/v3.1.1.tar.gz
-	md5sums = ab9977edf95e9b2910d7cca286926e85
+	source = https://github.com/assimp/assimp/archive/v3.2.tar.gz
+	md5sums = bb0cfa1513c4e11cf7ba14ba66548072
 
 pkgname = mingw-w64-assimp
 
diff --git a/PKGBUILD b/PKGBUILD
index ee9274fb8241..c12edf9e8212 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,49 @@
-# Maintainer: Daniel Kirchner <daniel at ekpyron dot org>
-
 pkgname=mingw-w64-assimp
-pkgver=3.1.1
+pkgver=3.2
 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-w64-crt')
-makedepends=('mingw-w64-cmake' 'mingw-w64-gcc' 'unzip')
-url=('http://assimp.sourceforge.net/index.html')
+makedepends=('mingw-w64-cmake' 'mingw-w64-boost')
+url='http://www.assimp.org/'
 source=("https://github.com/assimp/assimp/archive/v${pkgver}.tar.gz")
-options=(!strip !buildflags staticlibs)
-md5sums=('ab9977edf95e9b2910d7cca286926e85')
+options=('!strip' '!buildflags' 'staticlibs')
+md5sums=('bb0cfa1513c4e11cf7ba14ba66548072')
 
 _basename=assimp
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
-build() 
+build()
 {
-	unset LDFLAGS
-	
-	for _arch in ${_architectures}; do
-		rm -rf "${srcdir}/build-${_arch}-static"
-		mkdir -p "${srcdir}/build-${_arch}-static"
-		cd "${srcdir}/build-${_arch}-static"
-	
-		${_arch}-cmake ../${_basename}-${pkgver} \
-			-DASSIMP_BUILD_ASSIMP_TOOLS=NO -DBUILD_SHARED_LIBS=ON \
-			-DASSIMP_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=RELEASE
-		make
-	done
-	
-	for _arch in ${_architectures}; do
-		rm -rf "${srcdir}/build-${_arch}"
-		mkdir -p "${srcdir}/build-${_arch}"
-		cd "${srcdir}/build-${_arch}"
-	
-		${_arch}-cmake ../${_basename}-${pkgver} \
-			-DASSIMP_BUILD_ASSIMP_TOOLS=NO -DBUILD_SHARED_LIBS=OFF \
-			-DASSIMP_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=RELEASE
-		make
-	done
+  cd "${srcdir}"/assimp-${pkgver}
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch}-static && pushd build-${_arch}-static
+    ${_arch}-cmake \
+            -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DBUILD_SHARED_LIBS=ON \
+            -DASSIMP_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DASSIMP_ENABLE_BOOST_WORKAROUND=OFF ..
+    make
+    popd
+  done
+
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-cmake \
+            -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DBUILD_SHARED_LIBS=OFF \
+            -DASSIMP_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DASSIMP_ENABLE_BOOST_WORKAROUND=OFF ..
+    make
+    popd
+  done
 }
 
 package () {
-	for _arch in ${_architectures}; do
-		cd "${srcdir}/build-${_arch}"
-		make DESTDIR="${pkgdir}" install
-		cd "${srcdir}/build-${_arch}-static"
-		make DESTDIR="${pkgdir}" install
-		${_arch}-strip -g ${pkgdir}/usr/${_arch}/lib/*.a
-		${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll
-	done	
-
-	install -Dm644 "${srcdir}/${_basename}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  for _arch in ${_architectures}; do
+    cd "${srcdir}/assimp-${pkgver}/build-${_arch}-static"
+    make DESTDIR="${pkgdir}" install
+    cd "${srcdir}/assimp-${pkgver}/build-${_arch}"
+    make DESTDIR="${pkgdir}" install
+    ${_arch}-strip -g ${pkgdir}/usr/${_arch}/lib/*.a
+    ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll
+  done
+  install -Dm644 "${srcdir}/${_basename}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }