diff --git a/0001-Fix-build-with-zlib.patch b/0001-Fix-build-with-zlib.patch deleted file mode 100644 index 188a33e..0000000 --- a/0001-Fix-build-with-zlib.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9ed6834c72971998fce2ea3319b76184969ad93c Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Wed, 12 Jan 2022 10:35:34 +0100 -Subject: [PATCH] Fix build with zlib - ---- - code/Common/ZipArchiveIOSystem.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/code/Common/ZipArchiveIOSystem.cpp b/code/Common/ZipArchiveIOSystem.cpp -index 9870fa9d0..685cc8b5d 100644 ---- a/code/Common/ZipArchiveIOSystem.cpp -+++ b/code/Common/ZipArchiveIOSystem.cpp -@@ -196,7 +196,9 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) { - zlib_filefunc_def mapping; - - mapping.zopen_file = (open_file_func)open; -+#ifdef ZOPENDISK64 - mapping.zopendisk_file = (opendisk_file_func)opendisk; -+#endif - mapping.zread_file = (read_file_func)read; - mapping.zwrite_file = (write_file_func)write; - mapping.ztell_file = (tell_file_func)tell; --- -2.34.1 - diff --git a/_service b/_service index a5fb88f..9cae8c5 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/assimp/assimp - v5.2.4 + v5.2.5 @PARENT_TAG@ v(.*) diff --git a/assimp-5.2.4.tar.xz b/assimp-5.2.4.tar.xz deleted file mode 100644 index c3017a8..0000000 --- a/assimp-5.2.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4849495cf5b16686eb18cbab04b15722c2b68a37b5e754f5100968e9830d42c3 -size 25209108 diff --git a/assimp-5.2.5.tar.xz b/assimp-5.2.5.tar.xz new file mode 100644 index 0000000..f354fa8 --- /dev/null +++ b/assimp-5.2.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c37acd8a0989c1289abacf5c20d3d8b6c87f8d7ed2d0ecde77a3b764b701c7d +size 25154188 diff --git a/assimp.changes b/assimp.changes index f835400..c04d09c 100644 --- a/assimp.changes +++ b/assimp.changes @@ -1,3 +1,76 @@ +------------------------------------------------------------------- +Mon Sep 12 13:37:16 UTC 2022 - Dirk Müller + +- update to 5.2.5: + * Add unittest to reproduce undefined behavior + * Cleanups + * Link static linkage for std_image. + * fix msvc warnings-as-errors + * Remove dll-export tags from static library builds. + * Fix Import a specific FBX model will freeze the app + * Create SECURITY.md + * Pragma warnings cause build fail with MinGW + * Fixed FBXConverter build error when using double precision + * Fix possible nullptr exception + * [Experimental] New skeleton container for bones + * Add support for GCC v12 + * Remove unused variable. + * Infinite loop on bad import files + * Utilize AI_CONFIG_IMPORT_REMOVE_EMPTY_BONES flag for Collada meshes. + * Fix Windows 32-bit builds + * Fix GNUC check on Windows + * Update the name of the package + * Kimkulling/fix invalid opengex token match + * Disable build for tools per default + * Use mingw.include + * Fix a memory leak + * Fix nested animation name being lost in Collada + * Fix possible bad_alloc exception for an invalid file + * Bump JesseTG/rm from 1.0.2 to 1.0.3 + * Bump actions/cache from 2 to 3 + * Kimkulling/fix texture loading 3MF, reladed issue-4568 + * Bump actions/upload-artifact from 2 to 3 + * Bump actions/checkout from 2 to 3 + * Remove assertion test + * Fix memory leak in D3MFOpcPackage + * Fix typo in installation instructions for ubuntu. + * Build fix for compiling against minizip. + * Fix stl for over 4 GB + * Fix uninitialized variable. + * Fixes Crash in Assimp::ObjFileMtlImporter::getFloatValue + * Fixes Heap-buffer-overflow in Assimp::ObjFileParser::getFace + * Fixes Heap-buffer-overflow in std::__1::basic_string diff --git a/assimp.spec b/assimp.spec index d175820..e04df73 100644 --- a/assimp.spec +++ b/assimp.spec @@ -18,15 +18,13 @@ %define sover 5 Name: assimp -Version: 5.2.4 +Version: 5.2.5 Release: 0 Summary: Library to load and process 3D scenes from various data formats License: BSD-3-Clause AND MIT Group: Development/Libraries/C and C++ URL: https://www.assimp.org/ Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch0: 0001-Fix-build-with-zlib.patch BuildRequires: cmake BuildRequires: dos2unix BuildRequires: gcc-c++ @@ -98,7 +96,6 @@ popd %files devel %doc CHANGES CREDITS %{_includedir}/assimp/ -%{_bindir}/assimp %{_libdir}/libassimp.so %{_libdir}/cmake/* %{_libdir}/pkgconfig/assimp.pc