gentoo auto-resync : 06:10:2024 - 04:27:04

5 files changed, 0 insertions, 303 deletions

diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 8c18d7f521a9..39fa1f48d224 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,7 +1,3 @@
-AUX assimp-5.2.5-disable-collada-tests.patch 798 BLAKE2B 302c2ea2a1152f7bcf71d82378991a2a7259e1a4d81808499b163156ddec2351f441fa7db17886977b1e51c10ba7db70ea68d4cdfcfd2dccea9d0cc06082f429 SHA512 36164420838a5bb21c11dbc3955158b07d561e2da944017a6ce65fd9eab399ddcaddeaa3031727d977a283c2af4dbfec611507251e6a91f6ad475d5ef3763a08
-AUX assimp-5.2.5-disable-failing-tests.patch 3612 BLAKE2B 08dd1585e0d5ea37f5b52a88d364f48865f3b8032eba3cbd875047b7a07a5d9df658631cb5649dc6688112a9ec8809d9dfe75959711b0238b78ed01a5bc2eeb9 SHA512 cef65009eaf04cef82c22d86273dc63a30ae32ecf352b9ce9bfc61ecd9b9c67415d4162a02ffad5337d3d2af4f594b6f4387ad68fb4b4c78500d7ea1a3d42b82
-AUX assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch 5237 BLAKE2B 04f0cf86616afcf0e050ae9d8caf956b389362a667a370a1bfc523b428990e09481c92946cf252c04259d69b1718087aa24c65e645f19a86339fd1d4f359a505 SHA512 76fa57de33bb93722d9c83af7c706a99a3a9e76f1136b63edc7ba4036fd75ada9d7d6df2060563f56963a6ec971023944d6701319bb1c810fd2803fb4fb4afc7
-AUX assimp-5.2.5-fix-version.patch 881 BLAKE2B dd859c3437ea89b35a463e3aef64868f49a7c5d157d86b1c618bc15390b67950d9b40ae8717db0d21d7048b177c1ba61f6f871919cdf49e5576fc5be46553cd5 SHA512 9e1515624bc8f9d4eaa0c5d103b386e5cca12817b26e7002af7b0dd412e744fb1296e513371b9f3b0f87e566c9ca9b1b68e216a7f0e5a2ed11096d89b2fab0ae
 AUX assimp-5.2.5-float-comparison.patch 3809 BLAKE2B 6a0474c759d6a4ff68ced5c7f929062b98ae37594f6bf00a12bdfe787eaeaf24af9704e800114e4f2ccd485547165a09debbbf34820138c047a3830b95cdbc57 SHA512 6e4b55744fe5413e681f67af99f1050695cea15563e5e5f2406f9fd34cfdcfe58b40727e1071ecd98151b756c373d9f189d6e42c0705d4456ca5b676704b5d50
 AUX assimp-5.2.5-gtest.patch 843 BLAKE2B 044019d2036755c52f780e1bc4e842f181e067c1084432efe2fa6ce769fdd3f919224a7aece04a30593b477637e7e3760f023b50139ab9daecb741d5239dc021 SHA512 431ecd0dec29837a97323227311d795d1774cbe645098a945a05a8b5c36d3dd83f79ec99e99c3c27ec89adb5b90add09f030a0fdde6086381affdf91c83150ff
 DIST assimp-5.4.2.tar.gz 53807656 BLAKE2B cfa069cefdddcfdb756db6a72a5f67c528fa2c6a2cc15d8a98432c5a0149288429b76cd125b01471d082caac0a4a13781a853fd0dd8f4de9801e0ef209be0238 SHA512 4bfcc3a1b5a0cf3f382560564cac67088e13c62500c3c77dcef03811e67debe72ff318f5ed145b204d5017b56cb4293f3fe14b4060ca193813cef42b12eebe9d
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-gentoo@posteo.net>
-Date: Mon, 23 Jan 2023 19:54:23 +0100
-Subject: [PATCH] disable collada tests
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@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-gentoo@posteo.net>
-Date: Sat, 24 Dec 2022 11:19:17 +0100
-Subject: [PATCH] disable failing tests
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@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-gentoo@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-gentoo@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-gentoo@posteo.net>
-Date: Sat, 17 Sep 2022 15:15:58 +0200
-Subject: [PATCH] fix version
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@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
-