diff options
Diffstat (limited to 'media-libs/assimp')
6 files changed, 0 insertions, 348 deletions
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest index df0187c3ad22..8d207db52269 100644 --- a/media-libs/assimp/Manifest +++ b/media-libs/assimp/Manifest @@ -1,13 +1,7 @@ -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.4-drop-failing-tests-for-abi_x86_32.patch 5956 BLAKE2B 68efeb940358df092250a30233c137c625e8b50575323d3120e09f393ff71f3d5411f3447693ab952ab9d782df5e542bd74c601f63c27efd494c27ab7fce6791 SHA512 6f5272dde69888417deba00b49b325e58f42bc385633e2be5cf922d75a7b83d8337bccd1f39c60741deb850bd59d1209ab9404fd6ed84472552352d50cde804d -AUX assimp-5.2.4-update-version.patch 932 BLAKE2B 641c1c745b385acf83ddbc2c3e1d21b40b43a68934bbb637aba3a61b626668c423c6bc81d4e2a94cf602a24d9a6fef89b96fe56696c925b88531c059f7240f1a SHA512 68e14391feecac4fc8ae91cedd9a902d593d3d964e7827fd9661277bd39c5de64f97a832247cfb5cd807a75d07016820caad75e70e6e04a7714ba3422206013a 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 -DIST assimp-5.2.4.tar.gz 49613683 BLAKE2B d99243ce84a76ea237becd0b0982619e8f948ebc75784d8ea35e3800b9ca5084291fa58484433e4f2a7c3cd7ec2869033cf458daf94ee0fc4fe3283592721e73 SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf DIST assimp-5.2.5.tar.gz 49543936 BLAKE2B 77e0eecd1307646211a86244a371e24401dffd03dceb569acdd63751cdb38bd169c8b12c942efd2e77b5f541653f2775739150b9fe352b8c903dcc4fe7bccca8 SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb -EBUILD assimp-5.2.4-r1.ebuild 1372 BLAKE2B d8b3b36c33040a4db2bf2e1496a4fc1fec68be1cb8bf6e39db36753da297c88d5d1ac6d638697bfe8ad0a526c4bf8aa275eec28b8b03d16499dd952e766f3780 SHA512 8a6880e26604ed4c74818ad15140b44346dfc5b0983a7c410d33fd78ab1380448ae36292266f7c54e5bf635aaf4fa284f63fb9b677571d74c9d76e9efabee727 EBUILD assimp-5.2.5-r1.ebuild 1581 BLAKE2B 5379bd0912873efe04c375844cc6b8be15731128d4744b9153e3a8de285798b7f6339a0c678dda6d30e7647760ee231daf8f08b5a342f3f9e45a5ee428d81f67 SHA512 235f93bea9e1a0c9aef5266b37a7d225512e245a26a06c328d36d95f23636c1d20592c53102a440de5866254b170562169c7410e36b0fb760521dd7d7f5442ed MISC metadata.xml 602 BLAKE2B 37acfeee427b496401cc52d6f424ac33db0d84ebe3052f5d062e52ed0785751f5f693918bbe3388b657329f63b8936c37b7111e88912b376f0db0686320c2b47 SHA512 97813527a76719e99b97c81be7b11b38f5fd31e880a14519973bfa1e32ff08b8010c95ce1e872c2975a446ac567fb69ee2600920b87ead4d17b6584fda29a38a diff --git a/media-libs/assimp/assimp-5.2.4-r1.ebuild b/media-libs/assimp/assimp-5.2.4-r1.ebuild deleted file mode 100644 index 135d40e3ca95..000000000000 --- a/media-libs/assimp/assimp-5.2.4-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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 - "${FILESDIR}"/${P}-update-version.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.2-disable-failing-tests.patch b/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch deleted file mode 100644 index 3c423ac5107a..000000000000 --- a/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 8bff102329461e88a879472672b584585c6fbd7e Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Fri, 11 Mar 2022 11:24:13 +0100 -Subject: [PATCH] disable failing tests - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp -+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp -@@ -249,11 +249,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.35.1 - diff --git a/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch b/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch deleted file mode 100644 index 6d48161646ef..000000000000 --- a/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch +++ /dev/null @@ -1,24 +0,0 @@ -From https://github.com/assimp/assimp/issues/4334#issue-1097591121 -From: Brecht Sanders (@brechtsanders) -Date: Fri, 11 Mar 2022 10:01:15 +0100 -Subject: [PATCH] fix usage of incompatible minizip data structure - -Suggested-by: Brecht Sanders (@brechtsanders) -Bug: https://github.com/assimp/assimp/issues/4334 - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/code/Common/ZipArchiveIOSystem.cpp -+++ b/code/Common/ZipArchiveIOSystem.cpp -@@ -196,7 +196,9 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) { - zlib_filefunc_def mapping; - - mapping.zopen_file = (open_file_func)open; -+#ifdef ZOPENDISK64 - mapping.zopendisk_file = (opendisk_file_func)opendisk; -+#endif - mapping.zread_file = (read_file_func)read; - mapping.zwrite_file = (write_file_func)write; - mapping.ztell_file = (tell_file_func)tell; --- -2.35.1 - 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 deleted file mode 100644 index fba27be45315..000000000000 --- a/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch +++ /dev/null @@ -1,165 +0,0 @@ -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-gentoo@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-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, -@@ -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 - diff --git a/media-libs/assimp/files/assimp-5.2.4-update-version.patch b/media-libs/assimp/files/assimp-5.2.4-update-version.patch deleted file mode 100644 index cc70165bc2e0..000000000000 --- a/media-libs/assimp/files/assimp-5.2.4-update-version.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://github.com/assimp/assimp/issues/4655 -https://github.com/assimp/assimp/pull/4656 - -From 304b0f61d7c9ef7e2e5ca2eed185b32a2951aa90 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sat, 30 Jul 2022 09:39:12 +0200 -Subject: [PATCH] update 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.0) -+PROJECT(Assimp VERSION 5.2.4) - - # 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(), 0U ); -+ EXPECT_EQ(aiGetVersionPatch(), 4U ); - } - - TEST_F( utVersion, aiGetCompileFlagsTest ) { --- -2.35.1 - |