From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- media-libs/assimp/Manifest | 4 +- media-libs/assimp/assimp-5.2.3.ebuild | 9 ++ .../assimp-5.2.3-drop-Werror-gcc-option.patch | 25 ++++ ...p-5.2.3-drop-failing-tests-for-abi_x86_32.patch | 134 +++++++++++++++++++++ 4 files changed, 171 insertions(+), 1 deletion(-) create mode 100644 media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch create mode 100644 media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch (limited to 'media-libs/assimp') diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest index 4568d0351dbc..c9bd7c095ac2 100644 --- a/media-libs/assimp/Manifest +++ b/media-libs/assimp/Manifest @@ -8,11 +8,13 @@ AUX assimp-5.0.1-projectversion.patch 686 BLAKE2B 0b521adc80aaa2350a8225c40a2e1a AUX assimp-5.0.1-versiontest.patch 779 BLAKE2B 7d48c4070917589808a04ba370a682a4b96bf7cb116befee9c8c110fafc17878b7cf8729d6321968670ecedb763a93c237ade4af9f1194e6850b34d4dd6a3be3 SHA512 1b29ba91ecd6d4650e1f44ac7dbbd14e508b85adef78c4396d820567fdabf98d9098ea8f3e2be7368ffeb42b220fe4749d459dfb38edc99be2f09b4aefcb80c3 AUX assimp-5.2.2-disable-failing-tests.patch 1889 BLAKE2B 7f1f72ca6851dbe07d2493ee81a3c18e7118658b76ad5a41f31626cf0099b8bc7bb2fec83ef64c7ab6feb4fe01994cf106440d7a284d5af66b06b2a5ccb086d9 SHA512 128e420ae01246f46deab243bf09e4a0012935e34d5273792c22538bc9353641203450388c19aa5a7670d0f1a3a40e1d4e31a550711f64c8e2d4d0b0e6b3fba2 AUX assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch 855 BLAKE2B a6f526719d65b8aeb3c8ec1333973bd273589f7a1bb03a6838331740fd1961d63d121bf07636918dd221ba9af3a32a600c3fed3f0dd3135c7e37655d5bfa1fba SHA512 2103864934bd4a3469b419536da4604839b3b1a1b412612dd5a631f578d7c54538e7c97ca612e28425e5f1dd0ce71c11117165f1cbcb5f3604113ae4be259734 +AUX assimp-5.2.3-drop-Werror-gcc-option.patch 766 BLAKE2B 3e9b4a7fb369752de6a73b72f943c5a5d82b2b57b5e5a4c2c46b43b0a88d5ca7b8cfd36ee50a69389ddfe8e6fec0ac96f4797d7803695cb51585b79f80998f77 SHA512 774abd8d0334605a1d48889036376d16fed683dd0f0f86fcfc39792e97d088383ca7eb49f8df842feedba1d2790b8a86c7d752aab38ca6fcf0f7819cc1a96d73 +AUX assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch 4743 BLAKE2B 93f9bbc8d3bf8d97a3bbcfedabbeaba380055104da8cd776324b6a232ed121242e767de32eeefde6d7a76ddc002397277f7c4edf4fd719dbf17486b21c7b0226 SHA512 dc1767fd121fe3087dc63ee47c87302e2198f97bd8794ef4cbc5815aa5752e00f5ec4450b08553767b2f3c24b2603e444fdedf1edf94efce13c81d1aa988d382 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-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e EBUILD assimp-5.0.1.ebuild 1483 BLAKE2B a0342beeb4a2c258836d8109714887b965c938c8c9503d30a5e7421a0c12a5de7fb7e87a7c75d3770328471aa0308e2461080063c8584a72c7fe8e947b87a6f9 SHA512 f5dd6f5610cb896a25288f9924cd8a52dd0f386934e7c43dec8f8af59ce7d44b21f3a04ded400f2de6679fb83a499b941037dfee9047e526e85a8065b2547b1b EBUILD assimp-5.2.2.ebuild 1170 BLAKE2B 0e87a8edaa8e4fe0b9a33d1dd5c95f63e041eafec91d40af902bc39f5be2aff4c998c4cc43b33b585f3b4a6a302a95f6f288599c29979e60a6aeb04c2c283e24 SHA512 dcc9ee9470c6b63f87c20e1ae2f3d75f8cc9e8b28ef25838b2558f932f0e775b3521380a903f3cffbfc1a9137403d2ffec2ff2386c2d74c227a8789ffcf8166d -EBUILD assimp-5.2.3.ebuild 1225 BLAKE2B 0a59b57212b0324facedd18f2c71941567c6a5801906159e0c0d5810e730e720069422974d2f1c81a504e50cd430d169f6e3747454f1ee363fcbd2249790c170 SHA512 0cbd1b881aab6319321e8cfb73623e02bcda2b8dbe4806d8a967255cdbc9d4eadfca31516fd1349ef6dfb7fc1aeda932258dced0d8e21687961d120a9ed7e833 +EBUILD assimp-5.2.3.ebuild 1404 BLAKE2B b6c7882d2b15060f4ef07eb31133f8bec2241016af23eb5597b3017f8a38905ed601566e4b726e5ac19e5162332836fea784871bfd4c1f07bcd6ce7c920bbf03 SHA512 7e07aa5d4dbd61dd87bfee6c99d3ba01a0709248c68ff861f5fd7fbd6ea2a931250c2d69ee551a71fa6fe9590d789e644180d4def7fc4ee62f78264ca7328007 MISC metadata.xml 602 BLAKE2B 37acfeee427b496401cc52d6f424ac33db0d84ebe3052f5d062e52ed0785751f5f693918bbe3388b657329f63b8936c37b7111e88912b376f0db0686320c2b47 SHA512 97813527a76719e99b97c81be7b11b38f5fd31e880a14519973bfa1e32ff08b8010c95ce1e872c2975a446ac567fb69ee2600920b87ead4d17b6584fda29a38a diff --git a/media-libs/assimp/assimp-5.2.3.ebuild b/media-libs/assimp/assimp-5.2.3.ebuild index ba654ddd393f..d74e3f10d1f0 100644 --- a/media-libs/assimp/assimp-5.2.3.ebuild +++ b/media-libs/assimp/assimp-5.2.3.ebuild @@ -32,11 +32,20 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch + "${FILESDIR}"/${P}-drop-Werror-gcc-option.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 diff --git a/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch b/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch new file mode 100644 index 000000000000..736757693774 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/840616 +https://github.com/assimp/assimp/issues/4433 + +From dea8b4d8c533c131bd546c316f8df8af8897ac75 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Mon, 25 Apr 2022 17:39:33 +0200 +Subject: [PATCH] drop -Werror gcc option + +Temporary hack to allow building with gcc-12 + +Signed-off-by: Bernd Waibel +--- a/code/CMakeLists.txt ++++ b/code/CMakeLists.txt +@@ -1179,8 +1179,6 @@ TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp) + # enable warnings as errors ######################################## + IF (MSVC) + TARGET_COMPILE_OPTIONS(assimp PRIVATE /WX) +-ELSE() +- TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror) + ENDIF() + + # adds C_FLAGS required to compile zip.c on old GCC 4.x compiler +-- +2.35.1 + diff --git a/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch b/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch new file mode 100644 index 000000000000..1de4f661fa55 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch @@ -0,0 +1,134 @@ +https://bugs.gentoo.org/840767 +https://github.com/assimp/assimp/issues/4438 + +From f963a15bbbcfa1e3c4bd0c24173f90151e023469 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Thu, 28 Apr 2022 07:59:26 +0200 +Subject: [PATCH] drop failing tests for abi_x86_32 + +Signed-off-by: Bernd Waibel +--- 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, +--- 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() / 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 + -- cgit v1.2.3