Bump version and revamp.

2 files changed, 46 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 24871155b81e..9459546a8a5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-assimp
 	pkgdesc = Portable Open Source library to import various well-known 3D model formats in an uniform manner (mingw-w64)
-	pkgver = 5.0.1
-	pkgrel = 3
+	pkgver = 5.1.5
+	pkgrel = 1
 	url = http://www.assimp.org/
 	arch = any
 	license = BSD
@@ -12,9 +12,7 @@ pkgbase = mingw-w64-assimp
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://github.com/assimp/assimp/archive/v5.0.1.tar.gz
-	source = dll-export.patch::https://github.com/assimp/assimp/pull/2698/commits/81d125a2cca748ef3f79f1f0a6731d7e6d694ec1.patch
-	sha256sums = 11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc
-	sha256sums = 986af7dda8625e6d9cbea787dcdab57fd1e00f8d171c76acece7187a032ca46c
+	source = https://github.com/assimp/assimp/archive/v5.1.5.tar.gz
+	sha256sums = d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced
 
 pkgname = mingw-w64-assimp
diff --git a/PKGBUILD b/PKGBUILD
index ddf32b459670..a6f4c306dfd1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,63 @@
-pkgname=mingw-w64-assimp
-pkgver=5.0.1
-pkgrel=3
+# Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
+
+_pkgname=assimp
+pkgname=mingw-w64-${_pkgname}
+pkgver=5.1.5
+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-zlib' 'mingw-w64-boost' 'mingw-w64-minizip')
 makedepends=('mingw-w64-cmake')
 url='http://www.assimp.org/'
-source=("https://github.com/assimp/assimp/archive/v${pkgver}.tar.gz"
-       'dll-export.patch::https://github.com/assimp/assimp/pull/2698/commits/81d125a2cca748ef3f79f1f0a6731d7e6d694ec1.patch')
+source=("https://github.com/${_pkgname}/${_pkgname}/archive/v${pkgver}.tar.gz")
 options=('!strip' '!buildflags' 'staticlibs')
-sha256sums=('11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc'
-            '986af7dda8625e6d9cbea787dcdab57fd1e00f8d171c76acece7187a032ca46c')
+sha256sums=('d62b58ed3b35c20f89570863a5415df97cb1b301b444d39687140fc883717ced')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_flags=( -Wno-dev -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE='-O2 -DNDEBUG' -DCMAKE_C_FLAGS_RELEASE='-O2 -DNDEBUG'
+         -DASSIMP_BUILD_SAMPLES=OFF )
+_srcdir="${_pkgname}-${pkgver}"
 
 prepare ()
 {
-  cd "${srcdir}"/assimp-${pkgver}
-  # master is ok
-  sed -i 's|set(sharedLibraryName "libassimp\${ASSIMP_LIBRARY_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")|set(sharedLibraryName "libassimp.dll.a")|g' assimpTargets-release.cmake.in
-  sed -i 's|IMPORTED_LOCATION_RELEASE|IMPORTED_LOCATION|g' assimpTargets-release.cmake.in
-  sed -i 's|set(sharedLibraryName "libassimp\${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")|set(sharedLibraryName "libassimp.dll.a")|g' assimpTargets-debug.cmake.in
-  sed -i 's|IMPORTED_LOCATION_DEBUG|IMPORTED_LOCATION|g' assimpTargets-debug.cmake.in
-  patch -p1 -i ../dll-export.patch
+	cd "${_srcdir}"
+	sed -i "s/5.1.4/${pkgver}/" 'CMakeLists.txt'
+	# master is ok
+	#sed -i 's|set(sharedLibraryName "libassimp\${ASSIMP_LIBRARY_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")|set(sharedLibraryName "libassimp.dll.a")|g' assimpTargets-release.cmake.in
+	#sed -i 's|IMPORTED_LOCATION_RELEASE|IMPORTED_LOCATION|g' assimpTargets-release.cmake.in
+	#sed -i 's|set(sharedLibraryName "libassimp\${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")|set(sharedLibraryName "libassimp.dll.a")|g' assimpTargets-debug.cmake.in
+	#sed -i 's|IMPORTED_LOCATION_DEBUG|IMPORTED_LOCATION|g' assimpTargets-debug.cmake.in
 }
 
 build()
 {
-  cd "${srcdir}"/assimp-${pkgver}
-  for _arch in ${_architectures}; do
-    mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-cmake \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DASSIMP_BUILD_ASSIMP_TOOLS=OFF \
-            -DASSIMP_BUILD_TESTS=OFF -DASSIMP_ENABLE_BOOST_WORKAROUND=OFF ..
-    make
-    popd
+	for _arch in ${_architectures}; do
+		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}-static" "${_flags[@]}" -DASSIMP_BUILD_TESTS=OFF -DASSIMP_BUILD_ASSIMP_TOOLS=OFF \
+			-DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr/${_arch}/static"
+    cmake --build "build-${_arch}-static"
+    
+    ${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}" "${_flags[@]}" -DASSIMP_BUILD_TESTS=OFF
+    cmake --build "build-${_arch}"
   done
 }
 
+#check() {
+#	for _arch in ${_architectures}; do
+#		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}" "${_flags[@]}" -DASSIMP_BUILD_TESTS=ON
+#		cmake --build "build-${_arch}"
+#		cmake --build "build-${_arch}" --target test
+#	done
+#}
+
 package () {
-  for _arch in ${_architectures}; do
-    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
+	for _arch in ${_architectures}; do
+		DESTDIR="${pkgdir}" cmake --install "build-${_arch}-static"
+		${_arch}-strip -g "$pkgdir"/usr/${_arch}/static/lib/*.a
+		
+		DESTDIR="${pkgdir}" cmake --install "build-${_arch}"
+		${_arch}-strip "$pkgdir"/usr/${_arch}/bin/*.exe
+		${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+		${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
+	done
 }