diff options
Diffstat (limited to 'media-libs/assimp')
| -rw-r--r-- | media-libs/assimp/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/assimp/assimp-5.2.5-r1.ebuild (renamed from media-libs/assimp/assimp-5.2.5.ebuild) | 4 | ||||
| -rw-r--r-- | media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch | 28 |
3 files changed, 34 insertions, 1 deletions
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest index 96d40904ebf3..6afb299698e0 100644 --- a/media-libs/assimp/Manifest +++ b/media-libs/assimp/Manifest @@ -2,11 +2,12 @@ AUX assimp-5.2.2-disable-failing-tests.patch 1889 BLAKE2B 7f1f72ca6851dbe07d2493 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.ebuild 1395 BLAKE2B c4ffdbf1abccc4e5e789a465a8c3e36b8dfa101574edc779c7e1831c206606e2c91d1634a24bea1566911f4969e8e24d9902d69cb5bd68fbb0c130d2a3f72047 SHA512 208b23561b3cd251d013d2c0f53deaccee2128eaf66951bae9b2c5ccf7b88bae0c69bb73d9e04622aaace28daedaef8fcc8f98645c9cae79fb9f77871169c85f +EBUILD assimp-5.2.5-r1.ebuild 1584 BLAKE2B adb3ea569e77f431cac5145dcc6218b76827c08df0b5b923ae185b3d219dbbcec79a1f80217a7795495aca59762f8ce8a1776bb05fa6d03b1a2dd7c9042e274c SHA512 46d1e05e88289811fa298e0a3e6dc4e21f005f8fc40b25f7bfec2870e80c081fc10ddc2b82e82d0234d5b169d9d7f57ffeaed158f9a642a53b3419d7ae166b74 MISC metadata.xml 602 BLAKE2B 37acfeee427b496401cc52d6f424ac33db0d84ebe3052f5d062e52ed0785751f5f693918bbe3388b657329f63b8936c37b7111e88912b376f0db0686320c2b47 SHA512 97813527a76719e99b97c81be7b11b38f5fd31e880a14519973bfa1e32ff08b8010c95ce1e872c2975a446ac567fb69ee2600920b87ead4d17b6584fda29a38a diff --git a/media-libs/assimp/assimp-5.2.5.ebuild b/media-libs/assimp/assimp-5.2.5-r1.ebuild index d002d8d91eaf..83391bc9adf2 100644 --- a/media-libs/assimp/assimp-5.2.5.ebuild +++ b/media-libs/assimp/assimp-5.2.5-r1.ebuild @@ -30,6 +30,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-5.2.5-fix-version.patch "${FILESDIR}"/${PN}-5.2.5-disable-failing-tests.patch + "${FILESDIR}"/${PN}-5.2.5-disable-collada-tests.patch ) DOCS=( CodeConventions.md Readme.md ) @@ -55,6 +56,9 @@ src_configure() { -DASSIMP_IGNORE_GIT_HASH=ON -DASSIMP_UBSAN=OFF -DASSIMP_WARNINGS_AS_ERRORS=OFF + # bug #891787, intentionally not in alphabetic ordering + -DASSIMP_BUILD_COLLADA_IMPORTER=OFF + -DASSIMP_BUILD_COLLADA_EXPORTER=OFF ) if use samples; then 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 new file mode 100644 index 000000000000..971578f0016f --- /dev/null +++ b/media-libs/assimp/files/assimp-5.2.5-disable-collada-tests.patch @@ -0,0 +1,28 @@ +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 + |