commit: 6a97131300269627ef811261f8c822130e433506 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> AuthorDate: Sat May 21 14:44:52 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Jun 3 12:34:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a971313
media-libs/assimp: add 5.2.4 Closes: https://bugs.gentoo.org/846698 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> Closes: https://github.com/gentoo/gentoo/pull/25589 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-libs/assimp/Manifest | 1 + media-libs/assimp/assimp-5.2.4.ebuild | 66 +++++++++ ...p-5.2.4-drop-failing-tests-for-abi_x86_32.patch | 165 +++++++++++++++++++++ 3 files changed, 232 insertions(+) diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest index c8a058fd549a..b5c0f828ac95 100644 --- a/media-libs/assimp/Manifest +++ b/media-libs/assimp/Manifest @@ -1,4 +1,5 @@ DIST assimp-5.0.1.tar.gz 46607553 BLAKE2B 7f8cdf2bc602398fbdb675094d135e955716deb8f6469a4b68f7a8c735ecaa3120ee023c5c1f95c5a79c0606ed9a3cb3491c5011e2b409da523b56cd193ebb60 SHA512 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0 DIST assimp-5.2.2.tar.gz 49600909 BLAKE2B f5f8b5fc43a44c59c95ac3a1f2ce861a5198851ca910ec7688a818550aa0cde787901f7a7beb9f90f7fe731e18f3c31c7350d3b3070f7437153ff9d041f6ffdf SHA512 7f11f3e53bdcd43a81be49ce2ad90d97769ae1c3c6157f57e8a0b2b41c72f394ad1afcdc5f5fa6fbfa1a44233fed4b9a578d5548ec5b9aae2113ef88c2ec843a DIST assimp-5.2.3.tar.gz 49606233 BLAKE2B d6904769f1812b875a3b30de9edf35d9ca1774aecefe4d84edaaaa2975be1350de46e259e14b40f7749921c398490e7aea08c30c0ee89a69aedeab8f02a3e863 SHA512 accc1020877b631431bd0bc2de20b530d7e8d234e960904070292a4a08e768c55d1d0cf614c68d38f099fab2d086420c3ffd3f729cb538b169c1275ef0be1eaa +DIST assimp-5.2.4.tar.gz 49613683 BLAKE2B d99243ce84a76ea237becd0b0982619e8f948ebc75784d8ea35e3800b9ca5084291fa58484433e4f2a7c3cd7ec2869033cf458daf94ee0fc4fe3283592721e73 SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e diff --git a/media-libs/assimp/assimp-5.2.4.ebuild b/media-libs/assimp/assimp-5.2.4.ebuild new file mode 100644 index 000000000000..c89ba2b0796b --- /dev/null +++ b/media-libs/assimp/assimp-5.2.4.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Importer library to import assets from 3D files" +HOMEPAGE="https://github.com/assimp/assimp"; +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/5.2.4" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +IUSE="samples test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/boost:= + sys-libs/zlib[minizip] + samples? ( + media-libs/freeglut + virtual/opengl + x11-libs/libX11 + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch + "${FILESDIR}"/${PN}-5.2.2-disable-failing-tests.patch +) + +DOCS=( CodeConventions.md Readme.md ) + +src_prepare() { + if use x86 ; then + eapply "${FILESDIR}"/${P}-drop-failing-tests-for-abi_x86_32.patch + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DASSIMP_ASAN=OFF + -DASSIMP_BUILD_DOCS=OFF + -DASSIMP_BUILD_SAMPLES=$(usex samples) + -DASSIMP_BUILD_TESTS=$(usex test) + -DASSIMP_INJECT_DEBUG_POSTFIX=OFF + -DASSIMP_IGNORE_GIT_HASH=ON + -DASSIMP_UBSAN=OFF + -DASSIMP_WARNINGS_AS_ERRORS=OFF + ) + + if use samples; then + mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" ) + fi + + cmake_src_configure +} + +src_test() { + "${BUILD_DIR}/bin/unit" || die +} diff --git a/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch b/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch new file mode 100644 index 000000000000..fba27be45315 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch @@ -0,0 +1,165 @@ +https://bugs.gentoo.org/840767 +https://github.com/assimp/assimp/issues/4438 + +From 48cb5451383855755debfc17cb5e3428cba2d94e Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gen...@posteo.net> +Date: Sat, 21 May 2022 17:37:04 +0200 +Subject: [PATCH] drop failing tests for abi_x86_32 + +Drop two additional test wrt 5.2.3 +Signed-off-by: Bernd Waibel <waebbl-gen...@posteo.net> +--- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp ++++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp +@@ -68,13 +68,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromMatrix4Test) { + EXPECT_EQ(result_cpp, result_c); + } + +-TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromQuaternionTest) { +- const auto q = random_quat(); +- result_cpp = q.GetMatrix(); +- aiMatrix3FromQuaternion(&result_c, &q); +- EXPECT_EQ(result_cpp, result_c); +-} +- + TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3AreEqualTest) { + result_c = result_cpp = random_mat3(); + EXPECT_EQ(result_cpp == result_c, +@@ -127,14 +120,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3RotationZTest) { + EXPECT_EQ(result_cpp, result_c); + } + +-TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromRotationAroundAxisTest) { +- const float angle(RandPI.next()); +- const auto axis = random_unit_vec3(); +- aiMatrix3x3::Rotation(angle, axis, result_cpp); +- aiMatrix3FromRotationAroundAxis(&result_c, &axis, angle); +- EXPECT_EQ(result_cpp, result_c); +-} +- + TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3TranslationTest) { + const auto axis = random_vec2(); + aiMatrix3x3::Translation(axis, result_cpp); +--- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp ++++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp +@@ -78,15 +78,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromMatrix3Test) { + EXPECT_EQ(result_cpp, result_c); + } + +-TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromScalingQuaternionPositionTest) { +- const aiVector3D s = random_vec3(); +- const aiQuaternion q = random_quat(); +- const aiVector3D t = random_vec3(); +- result_cpp = aiMatrix4x4(s, q, t); +- aiMatrix4FromScalingQuaternionPosition(&result_c, &s, &q, &t); +- EXPECT_EQ(result_cpp, result_c); +-} +- + TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4AddTest) { + const aiMatrix4x4 temp = random_mat4(); + result_c = result_cpp = random_mat4(); +@@ -135,12 +126,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4InverseTest) { + EXPECT_EQ(result_cpp, result_c); + } + +-TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4DeterminantTest) { +- result_c = result_cpp = random_mat4(); +- EXPECT_EQ(result_cpp.Determinant(), +- aiMatrix4Determinant(&result_c)); +-} +- + TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4IsIdentityTest) { + EXPECT_EQ(result_cpp.IsIdentity(), + (bool)aiMatrix4IsIdentity(&result_c)); +@@ -228,14 +213,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4RotationZTest) { + EXPECT_EQ(result_cpp, result_c); + } + +-TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromRotationAroundAxisTest) { +- const float angle(RandPI.next()); +- const auto axis = random_unit_vec3(); +- aiMatrix4x4::Rotation(angle, axis, result_cpp); +- aiMatrix4FromRotationAroundAxis(&result_c, &axis, angle); +- EXPECT_EQ(result_cpp, result_c); +-} +- + TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4TranslationTest) { + const auto axis = random_vec3(); + aiMatrix4x4::Translation(axis, result_cpp); +--- a/test/unit/AssimpAPITest_aiQuaternion.cpp ++++ b/test/unit/AssimpAPITest_aiQuaternion.cpp +@@ -54,19 +54,6 @@ protected: + aiQuaternion result_c, result_cpp; + }; + +-TEST_F(AssimpAPITest_aiQuaternion, aiCreateQuaternionFromMatrixTest) { +- // Use a predetermined transformation matrix +- // to prevent running into division by zero. +- aiMatrix3x3 m, r; +- aiMatrix3x3::Translation(aiVector2D(14,-25), m); +- aiMatrix3x3::RotationZ(Math::aiPi<float>() / 4.0f, r); +- m = m * r; +- +- result_cpp = aiQuaternion(m); +- aiCreateQuaternionFromMatrix(&result_c, &m); +- EXPECT_EQ(result_cpp, result_c); +-} +- + TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromEulerAnglesTest) { + const float x(RandPI.next()), + y(RandPI.next()), +--- a/test/unit/AssimpAPITest_aiVector2D.cpp ++++ b/test/unit/AssimpAPITest_aiVector2D.cpp +@@ -67,28 +67,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2AreEqualEpsilonTest) { + (bool)aiVector2AreEqualEpsilon(&result_cpp, &result_c, Epsilon)); + } + +-TEST_F(AssimpAPITest_aiVector2D, aiVector2AddTest) { +- result_c = result_cpp = random_vec2(); +- result_cpp += temp; +- aiVector2Add(&result_c, &temp); +- EXPECT_EQ(result_cpp, result_c); +-} +- +-TEST_F(AssimpAPITest_aiVector2D, aiVector2SubtractTest) { +- result_c = result_cpp = random_vec2(); +- result_cpp -= temp; +- aiVector2Subtract(&result_c, &temp); +- EXPECT_EQ(result_cpp, result_c); +-} +- +-TEST_F(AssimpAPITest_aiVector2D, aiVector2ScaleTest) { +- const float FACTOR = RandNonZero.next(); +- result_c = result_cpp = random_vec2(); +- result_cpp *= FACTOR; +- aiVector2Scale(&result_c, FACTOR); +- EXPECT_EQ(result_cpp, result_c); +-} +- + TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) { + result_c = result_cpp = random_vec2(); + result_cpp = result_cpp.SymMul(temp); +@@ -96,21 +74,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) { + EXPECT_EQ(result_cpp, result_c); + } + +-TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByScalarTest) { +- const float DIVISOR = RandNonZero.next(); +- result_c = result_cpp = random_vec2(); +- result_cpp /= DIVISOR; +- aiVector2DivideByScalar(&result_c, DIVISOR); +- EXPECT_EQ(result_cpp, result_c); +-} +- +-TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByVectorTest) { +- result_c = result_cpp = random_vec2(); +- result_cpp = result_cpp / temp; +- aiVector2DivideByVector(&result_c, &temp); +- EXPECT_EQ(result_cpp, result_c); +-} +- + TEST_F(AssimpAPITest_aiVector2D, aiVector2LengthTest) { + result_c = result_cpp = random_vec2(); + EXPECT_EQ(result_cpp.Length(), aiVector2Length(&result_c)); +-- +2.35.1 +
