commit: 270edb8f1b09feb8d95d1849980d5dfe75506d35 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Wed Feb 18 13:59:29 2026 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Feb 18 15:03:59 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=270edb8f
media-libs/assimp: fix build with zlib-1.3.2[minizip] Haven't really tested assimp-5, but the minimal patch that used for assimp-6 applies cleanly and is hopefully enough. Closes: https://bugs.gentoo.org/970227 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-libs/assimp/assimp-5.4.3-r1.ebuild | 3 ++- media-libs/assimp/assimp-6.0.2.ebuild | 3 ++- media-libs/assimp/files/assimp-6.0.2-zlib-1.3.2.patch | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/media-libs/assimp/assimp-5.4.3-r1.ebuild b/media-libs/assimp/assimp-5.4.3-r1.ebuild index 4e55d15e5395..6c96c0471ac2 100644 --- a/media-libs/assimp/assimp-5.4.3-r1.ebuild +++ b/media-libs/assimp/assimp-5.4.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,6 +33,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${PN}-5.2.5-gtest.patch" "${FILESDIR}/${PN}-5.2.5-float-comparison.patch" + "${FILESDIR}/${PN}-6.0.2-zlib-1.3.2.patch" ) DOCS=( CodeConventions.md Readme.md ) diff --git a/media-libs/assimp/assimp-6.0.2.ebuild b/media-libs/assimp/assimp-6.0.2.ebuild index ac6337050926..09ef7e92d52c 100644 --- a/media-libs/assimp/assimp-6.0.2.ebuild +++ b/media-libs/assimp/assimp-6.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,6 +35,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.2.5-gtest.patch" "${FILESDIR}/${PN}-5.2.5-float-comparison.patch" "${FILESDIR}/${PN}-6.0.2-optional-collada-tests.patch" + "${FILESDIR}/${PN}-6.0.2-zlib-1.3.2.patch" ) DOCS=( CodeConventions.md Readme.md ) diff --git a/media-libs/assimp/files/assimp-6.0.2-zlib-1.3.2.patch b/media-libs/assimp/files/assimp-6.0.2-zlib-1.3.2.patch new file mode 100644 index 000000000000..6299cf2bcb4f --- /dev/null +++ b/media-libs/assimp/files/assimp-6.0.2-zlib-1.3.2.patch @@ -0,0 +1,18 @@ +Just a minimal fix, needs to be properly looked at given there +are a lot of instances of usage. + +https://bugs.gentoo.org/970227 +--- a/code/AssetLib/IFC/IFCLoader.cpp ++++ b/code/AssetLib/IFC/IFCLoader.cpp +@@ -52,3 +52,3 @@ + #ifndef ASSIMP_BUILD_NO_COMPRESSED_IFC +-#ifdef ASSIMP_USE_HUNTER ++#if 1 + #include <minizip/unzip.h> +--- a/code/Common/ZipArchiveIOSystem.cpp ++++ b/code/Common/ZipArchiveIOSystem.cpp +@@ -53,3 +53,3 @@ + +-#ifdef ASSIMP_USE_HUNTER ++#if 1 + # include <minizip/unzip.h>
