commit: 533ab30faf4f4e76fd1cc8cd032969cb8f001954
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Oct 3 15:46:40 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 5 22:58:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=533ab30f
media-libs/assimp: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/assimp-5.2.5-disable-collada-tests.patch | 28 ----
.../files/assimp-5.2.5-disable-failing-tests.patch | 95 --------------
...p-5.2.5-drop-failing-tests-for-abi_x86_32.patch | 143 ---------------------
.../assimp/files/assimp-5.2.5-fix-version.patch | 33 -----
4 files changed, 299 deletions(-)
diff --git a/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch
b/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch
deleted file mode 100644
index 971578f0016f..000000000000
--- a/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3bd65679f7db2ec95abb22fef7a30a15dcc1c297 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gen...@posteo.net>
-Date: Mon, 23 Jan 2023 19:54:23 +0100
-Subject: [PATCH] disable collada tests
-
-Signed-off-by: Bernd Waibel <waebbl-gen...@posteo.net>
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -63,7 +63,6 @@ SET( COMMON
- unit/utSimd.cpp
- unit/utIOSystem.cpp
- unit/utIOStreamBuffer.cpp
-- unit/utIssues.cpp
- unit/utAnim.cpp
- unit/AssimpAPITest.cpp
- unit/AssimpAPITest_aiMatrix3x3.cpp
-@@ -137,8 +136,6 @@ SET( IMPORTERS
- unit/utBlendImportMaterials.cpp
- unit/utBlenderWork.cpp
- unit/utBVHImportExport.cpp
-- unit/utColladaExport.cpp
-- unit/utColladaImportExport.cpp
- unit/utCSMImportExport.cpp
- unit/utB3DImportExport.cpp
- #unit/utM3DImportExport.cpp
---
-2.39.1
-
diff --git a/media-libs/assimp/files/assimp-5.2.5-disable-failing-tests.patch
b/media-libs/assimp/files/assimp-5.2.5-disable-failing-tests.patch
deleted file mode 100644
index 92936e6442eb..000000000000
--- a/media-libs/assimp/files/assimp-5.2.5-disable-failing-tests.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From aaace4ca2e2d4f46b7dce0940af6e332563c5a21 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gen...@posteo.net>
-Date: Sat, 24 Dec 2022 11:19:17 +0100
-Subject: [PATCH] disable failing tests
-
-Signed-off-by: Bernd Waibel <waebbl-gen...@posteo.net>
---- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-@@ -127,25 +127,9 @@ 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);
- aiMatrix3Translation(&result_c, &axis);
- EXPECT_EQ(result_cpp, result_c);
- }
--
--TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromToTest) {
-- // Use predetermined vectors to prevent running into division by zero.
-- const auto from = aiVector3D(1,2,1).Normalize(), to =
aiVector3D(-1,1,1).Normalize();
-- aiMatrix3x3::FromToMatrix(from, to, result_cpp);
-- aiMatrix3FromTo(&result_c, &from, &to);
-- EXPECT_EQ(result_cpp, result_c);
--}
---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-@@ -228,14 +228,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);
-@@ -249,11 +241,3 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4ScalingTest) {
- aiMatrix4Scaling(&result_c, &scaling);
- EXPECT_EQ(result_cpp, result_c);
- }
--
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromToTest) {
-- // Use predetermined vectors to prevent running into division by zero.
-- const auto from = aiVector3D(1,2,1).Normalize(), to =
aiVector3D(-1,1,1).Normalize();
-- aiMatrix4x4::FromToMatrix(from, to, result_cpp);
-- aiMatrix4FromTo(&result_c, &from, &to);
-- EXPECT_EQ(result_cpp, result_c);
--}
---- a/test/unit/AssimpAPITest_aiQuaternion.cpp
-+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
-@@ -84,13 +84,6 @@ TEST_F(AssimpAPITest_aiQuaternion,
aiQuaternionFromAxisAngleTest) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromNormalizedQuaternionTest) {
-- const auto qvec3 = random_unit_vec3();
-- result_cpp = aiQuaternion(qvec3);
-- aiQuaternionFromNormalizedQuaternion(&result_c, &qvec3);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionAreEqualTest) {
- result_c = result_cpp = random_quat();
- EXPECT_EQ(result_cpp == result_c,
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -68,10 +68,6 @@ TEST_F( utVersion, aiGetCompileFlagsTest ) {
- EXPECT_NE( aiGetCompileFlags(), 0U );
- }
-
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
-- EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
- TEST_F( utVersion, aiGetBranchNameTest ) {
- EXPECT_NE( nullptr, aiGetBranchName() );
- }
---
-2.39.0
-
diff --git
a/media-libs/assimp/files/assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch
b/media-libs/assimp/files/assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch
deleted file mode 100644
index 1ee315ab28be..000000000000
---
a/media-libs/assimp/files/assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From f3d40e0bd8b7134f963adc08b8c2bb043a385c6f Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gen...@posteo.net>
-Date: Sun, 25 Dec 2022 09:46:58 +0100
-Subject: [PATCH] drop failing tests for abi_x86_32
-
-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,
-@@ -102,18 +95,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiTransposeMatrix3Test) {
- EXPECT_EQ(result_cpp, result_c);
- }
-
--TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3InverseTest) {
-- // Use a predetermined matrix to prevent arbitrary
-- // cases where it could have a null determinant.
-- result_c = result_cpp = aiMatrix3x3(
-- 5, 2, 7,
-- 4, 6, 9,
-- 1, 8, 3);
-- result_cpp.Inverse();
-- aiMatrix3Inverse(&result_c);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3DeterminantTest) {
- result_c = result_cpp = random_mat3();
- EXPECT_EQ(result_cpp.Determinant(),
---- 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));
---- 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()),
-@@ -115,14 +102,3 @@ TEST_F(AssimpAPITest_aiQuaternion,
aiQuaternionMultiplyTest) {
- aiQuaternionMultiply(&result_c, &temp);
- EXPECT_EQ(result_cpp, result_c);
- }
--
--TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionInterpolateTest) {
-- // Use predetermined quaternions to prevent division by zero
-- // during slerp calculations.
-- const float INTERPOLATION(0.5f);
-- const auto q1 = aiQuaternion(aiVector3D(-1,1,1).Normalize(),
Math::aiPi<float>() / 4.0f);
-- const auto q2 = aiQuaternion(aiVector3D(1,2,1).Normalize(),
Math::aiPi<float>() / 2.0f);
-- aiQuaternion::Interpolate(result_cpp, q1, q2, INTERPOLATION);
-- aiQuaternionInterpolate(&result_c, &q1, &q2, INTERPOLATION);
-- EXPECT_EQ(result_cpp, result_c);
--}
---- a/test/unit/AssimpAPITest_aiVector2D.cpp
-+++ b/test/unit/AssimpAPITest_aiVector2D.cpp
-@@ -74,28 +74,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2AddTest) {
- 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);
-- aiVector2SymMul(&result_c, &temp);
-- EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByScalarTest) {
- const float DIVISOR = RandNonZero.next();
- result_c = result_cpp = random_vec2();
---
-2.39.0
-
diff --git a/media-libs/assimp/files/assimp-5.2.5-fix-version.patch
b/media-libs/assimp/files/assimp-5.2.5-fix-version.patch
deleted file mode 100644
index 71b58c4808d1..000000000000
--- a/media-libs/assimp/files/assimp-5.2.5-fix-version.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/assimp/assimp/pull/4730
-
-From b526d7a4b82be6d8c1481459975350b94384e805 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gen...@posteo.net>
-Date: Sat, 17 Sep 2022 15:15:58 +0200
-Subject: [PATCH] fix version
-
-Signed-off-by: Bernd Waibel <waebbl-gen...@posteo.net>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED)
- add_definitions(-DASSIMP_USE_HUNTER)
- ENDIF()
-
--PROJECT(Assimp VERSION 5.2.4)
-+PROJECT(Assimp VERSION 5.2.5)
-
- # All supported options ###############################################
-
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest ) {
- }
-
- TEST_F( utVersion, aiGetVersionPatchTest ) {
-- EXPECT_EQ(aiGetVersionPatch(), 4U );
-+ EXPECT_EQ(aiGetVersionPatch(), 5U );
- }
-
- TEST_F( utVersion, aiGetCompileFlagsTest ) {
---
-2.37.3
-
