diff --git a/0001-Fix-build-with-zlib.patch b/0001-Fix-build-with-zlib.patch new file mode 100644 index 0000000..188a33e --- /dev/null +++ b/0001-Fix-build-with-zlib.patch @@ -0,0 +1,26 @@ +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 aff483f..5def353 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git git://github.com/assimp/assimp - v5.1.5 + v5.1.6 @PARENT_TAG@ v(.*) diff --git a/assimp-5.1.5.tar.xz b/assimp-5.1.5.tar.xz deleted file mode 100644 index 78d8e85..0000000 --- a/assimp-5.1.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0517e8ea3d2af8063ece23d19456f19c85dbb8040a8243561da90bf50638e14d -size 24574048 diff --git a/assimp-5.1.6.tar.xz b/assimp-5.1.6.tar.xz new file mode 100644 index 0000000..bb9a1fa --- /dev/null +++ b/assimp-5.1.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:876bd1dbc0ed7ab4f9fb42c50c0404d638380e656fb9896a7c6d0cff972c4e28 +size 24595068 diff --git a/assimp.changes b/assimp.changes index 6e2bd46..d019709 100644 --- a/assimp.changes +++ b/assimp.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jan 10 09:28:29 UTC 2022 - Christophe Giboudeaux + +- Update to 5.1.6: + * Add link to used enum for a better understandability + * Fix fuzzer crashes + * Fix nullptr-dereferencing + * Fix bone fitted check in gltf2 exporter +- Add patch: + * 0001-Fix-build-with-zlib.patch (gh#assimp/assimp#4334) + ------------------------------------------------------------------- Tue Jan 4 11:59:17 UTC 2022 - Christophe Giboudeaux diff --git a/assimp.spec b/assimp.spec index 33ecbb1..da40a2a 100644 --- a/assimp.spec +++ b/assimp.spec @@ -18,13 +18,15 @@ %define sover 5 Name: assimp -Version: 5.1.5 +Version: 5.1.6 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++