Update version.

3 files changed, 10 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99f809fec464..029356a1df1e 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.2.4
-	pkgrel = 2
+	pkgver = 5.2.5
+	pkgrel = 1
 	url = http://www.assimp.org/
 	arch = any
 	license = BSD
@@ -13,9 +13,7 @@ pkgbase = mingw-w64-assimp
 	options = !buildflags
 	options = staticlibs
 	options = !lto
-	source = https://github.com/assimp/assimp/archive/v5.2.4.tar.gz
-	source = zlib.patch
-	sha256sums = 6a4ff75dc727821f75ef529cea1c4fc0a7b5fc2e0a0b2ff2f6b7993fe6cb54ba
-	sha256sums = 91ce3c534de415c786212416861b7b13964bfb88da1af22553ef23d8b7aa02fc
+	source = https://github.com/assimp/assimp/archive/v5.2.5.tar.gz
+	sha256sums = b5219e63ae31d895d60d98001ee5bb809fb2c7b2de1e7f78ceeb600063641e1a
 
 pkgname = mingw-w64-assimp
diff --git a/PKGBUILD b/PKGBUILD
index 6cb9fe9040ef..e34a7d0c3c5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,46 +2,32 @@
 
 _pkgname=assimp
 pkgname=mingw-w64-${_pkgname}
-pkgver=5.2.4
-pkgrel=2
+pkgver=5.2.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/${_pkgname}/${_pkgname}/archive/v${pkgver}.tar.gz"
-	'zlib.patch')
+source=("https://github.com/${_pkgname}/${_pkgname}/archive/v${pkgver}.tar.gz")
 options=('!strip' '!buildflags' 'staticlibs' '!lto')
-sha256sums=('6a4ff75dc727821f75ef529cea1c4fc0a7b5fc2e0a0b2ff2f6b7993fe6cb54ba'
-            '91ce3c534de415c786212416861b7b13964bfb88da1af22553ef23d8b7aa02fc')
-
+sha256sums=('b5219e63ae31d895d60d98001ee5bb809fb2c7b2de1e7f78ceeb600063641e1a')
 _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'
+	-Wno-dev -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE='-DNDEBUG' -DCMAKE_C_FLAGS_RELEASE='-DNDEBUG'
 	-DASSIMP_BUILD_SAMPLES=OFF )
 _srcdir="${_pkgname}-${pkgver}"
 
 prepare ()
 {
 	cd "${_srcdir}"
-	patch -ulbf 'code/Common/ZipArchiveIOSystem.cpp' < '../zlib.patch'
-	sed -i 's/fprintf(pFile, this->szPlainText.c_str());/fprintf(pFile, "%s", this->szPlainText.c_str());/' 'tools/assimp_view/LogWindow.cpp'
+	sed -i 's/fprintf(pFile, this->szPlainText.c_str());/std::fputs(this->szPlainText.c_str(), pFile);/' 'tools/assimp_view/LogWindow.cpp'
 	sed -i 's/set(LIBRARY_SUFFIX/#nope/' 'code/CMakeLists.txt'
-	#sed -i 's/-static-libgcc -static-libstdc++ -Wl,-Bstatic//' 'code/CMakeLists.txt'
 	sed -i 's/TARGET_LINK_LIBRARIES ( assimp_viewer/#nope/' 'code/CMakeLists.txt'
 	sed -i 's/LINK_DIRECTORIES/#nope/' 'tools/assimp_cmd/CMakeLists.txt'
 	sed -i 's/LINK_DIRECTORIES/#nope/' 'tools/assimp_view/CMakeLists.txt'
 	sed -i 's/LINK_DIRECTORIES/#nope/' 'test/CMakeLists.txt'
-
-	# Correct obvious bug
-	sed -i 's/vlist.push_back(\*tlist_i.end())/vlist.push_back(tlist_i.back())/' 'code/AssetLib/X3D/X3DImporter_Geometry2D.cpp'
-	sed -i 's/vlist.push_back(\*tlist_o.end())/vlist.push_back(tlist_o.back())/' 'code/AssetLib/X3D/X3DImporter_Geometry2D.cpp'	
-	sed -i 's/if (sheen.sheenColorFactor == defaultSheenFactor)/if (sheen.sheenColorFactor[0] == defaultSheenFactor[0] \&\& sheen.sheenColorFactor[1] == defaultSheenFactor[1] \&\& sheen.sheenColorFactor[2] == defaultSheenFactor[2])/' 'code/AssetLib/glTF2/glTF2Exporter.cpp'
-
-	# Obviously incorrect code
-	sed -i 's|aaiFaces\[(\*iFace).iTexture\].push_back( 0 )|//nope|' 'code/AssetLib/SMD/SMDLoader.cpp'
 }
 
 build()
diff --git a/zlib.patch b/zlib.patch
deleted file mode 100644
index 055290ff64e2..000000000000
--- a/zlib.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-@@ -198,3 +198,5 @@
-     mapping.zopen_file = (open_file_func)open;
-+#ifdef ZOPENDISK64
-     mapping.zopendisk_file = (opendisk_file_func)opendisk;
-+#endif
-     mapping.zread_file = (read_file_func)read;