diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /media-libs/assimp | |
parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) |
gentoo resync : 15.12.2019
Diffstat (limited to 'media-libs/assimp')
-rw-r--r-- | media-libs/assimp/Manifest | 11 | ||||
-rw-r--r-- | media-libs/assimp/assimp-4.0.1-r1.ebuild | 1 | ||||
-rw-r--r-- | media-libs/assimp/assimp-4.0.1.ebuild | 1 | ||||
-rw-r--r-- | media-libs/assimp/assimp-4.1.0.ebuild | 1 | ||||
-rw-r--r-- | media-libs/assimp/assimp-5.0.0.ebuild | 67 | ||||
-rw-r--r-- | media-libs/assimp/files/assimp-5.0.0-disabletest.patch | 13 | ||||
-rw-r--r-- | media-libs/assimp/files/assimp-5.0.0-findassimp.patch | 28 | ||||
-rw-r--r-- | media-libs/assimp/files/assimp-5.0.0-unzip-of.patch | 11 |
8 files changed, 130 insertions, 3 deletions
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest index 013edda01da5..b8b9398af158 100644 --- a/media-libs/assimp/Manifest +++ b/media-libs/assimp/Manifest @@ -3,10 +3,15 @@ AUX assimp-4.0.1-qt-5.11.0.patch 2230 BLAKE2B e99a1e8dcd5f3c5d8f2b5f116ccd2b5f9a AUX assimp-4.1.0-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8720707bb6f569d9697cd82303df7edf08d909ef8d8926b17203ad1126f13a6445080191649a96af837d1d7e02fa7667 SHA512 320f2f76ffbebf3a5d3064faa3bc16e0cb597ad994c35b1344aa3a60a07839e67a9d68b80f8723b663d491c6a37b6c95510e987acd04dd519d489a82e3d7e729 AUX assimp-4.1.0-findassimp.patch 744 BLAKE2B b78cbd88d16d58defbe2970d4969cc9296956c70469521dac7fbb90d2e8e478e077c401224739f6a5f343a2f4579c212cedf939dab482c9235e1065fbf37ed6a SHA512 7523363a5fe387cdfe3f927ede667718ae42223ebb615234f1b3c0cd80d17cd3590ac7af27279748685a263522029784b089f34765c9f5a7e98873a3ad62bd2a AUX assimp-4.1.0-unzip-of.patch 242 BLAKE2B c977c94d4ef44d9e185738e7f3c2e5bda59ea52e11c5900387f9e590201f4ffff3aa6dc9a60452f8f782ce37a510cb85cecd1f8df8b23b331688b75f69ea3890 SHA512 e8908f0c44afc4969b9fe670de418ae9df592cab47b0c9a67958c37414740c527a7ee1ef6d61de19c926f08bf20663be66dc54fc6e3d9164e6ecf34360dff37b +AUX assimp-5.0.0-disabletest.patch 392 BLAKE2B 1654fb964c738aaa343abd1905616648c85ab0793d3450d4a05358c9463d00655f0a1b7aa5f1444d90e12ce51341b9a52e75fd81090a65607c3a21efcd374360 SHA512 25856886bae9cef071317880d8d677a3241c74c0cf288a5677f3be492d640d6db3ba5de3d53cf3f41f78e12ee9f544bf37de7ba82e98d9f4e3f699e38f053bd4 +AUX assimp-5.0.0-findassimp.patch 744 BLAKE2B b78cbd88d16d58defbe2970d4969cc9296956c70469521dac7fbb90d2e8e478e077c401224739f6a5f343a2f4579c212cedf939dab482c9235e1065fbf37ed6a SHA512 7523363a5fe387cdfe3f927ede667718ae42223ebb615234f1b3c0cd80d17cd3590ac7af27279748685a263522029784b089f34765c9f5a7e98873a3ad62bd2a +AUX assimp-5.0.0-unzip-of.patch 242 BLAKE2B c977c94d4ef44d9e185738e7f3c2e5bda59ea52e11c5900387f9e590201f4ffff3aa6dc9a60452f8f782ce37a510cb85cecd1f8df8b23b331688b75f69ea3890 SHA512 e8908f0c44afc4969b9fe670de418ae9df592cab47b0c9a67958c37414740c527a7ee1ef6d61de19c926f08bf20663be66dc54fc6e3d9164e6ecf34360dff37b AUX findassimp-3.3.1.patch 624 BLAKE2B 6e1df31dc55739e01807eacf90558be6af791c4054b438f765cd733639c5c6fb34046871577ddbc7194284f81228000e48218a5a890d21390976778928362d94 SHA512 5f8f7e061da89e7fb4705148b171e631e16a3b7ba7156b1cd3a4b8987adc066f0b4a36f7d70a9b174f3bb27ebe13353435d81cbe85a1166c75148e8419311be1 DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb DIST assimp-4.1.0.tar.gz 45417293 BLAKE2B 74170ab48b64ab357ddd9da58f1218d0c3c0a4039345dcd7ae396aca3bb47c2f5ea2ee8b61b7d81c68c2e1237cd3ba516b816038400e9960b6c0cfe031a41e54 SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a -EBUILD assimp-4.0.1-r1.ebuild 1385 BLAKE2B c658a4892def26404509ced1538aa9635da5b5dda3ba00b53d5bfcc14efce0803e045aa687bb116dcdda93ad933fdaeea655dbb6f9c25160ded30d90638338db SHA512 8e003f3e6bb196f1085a7903add296153119d1fbb948f87c00332f3c970853f429406d037eed52449126fdc5566cc19b6650a518ba8fc9a6129735dda0ecfede -EBUILD assimp-4.0.1.ebuild 1334 BLAKE2B 69cba811c5f5b0957c36b257c1bc52c30b15c58ade44c5cff8a1e3697eeda607d8ed5885362a5ad8e1b8ba1c982dd8155f325ae3798a982a39a8d0132e68cd4d SHA512 c47fddb39ed30f9c8cdd9fcdf5b43703c07134a8e7dd187518eaec8392792614716252d39f19262278b8cfe832cf92df602b08855d1d0724b74796f851068d7a -EBUILD assimp-4.1.0.ebuild 1335 BLAKE2B 32beb38eb69125088c91f83c06261c4009010293b983334cd52244909eac316e4e8df042fa9a4450a0e53a67994240a0de3b55f7174b1e5d2703e62854ea9d10 SHA512 eac34e7a57c085d9b51d9415f9a4a09eeee0da8d88bc0b8e119208ef6f49f5262bfc2729275f2a2689efc5dfdd66641190b343113365a3a7968d217f2591027b +DIST assimp-5.0.0.tar.gz 46604597 BLAKE2B 850c84cce6c24c01c2db00d76337797f3e4a4e819e133cf194cac0a7344fa58cb4805e0d5eb29b434f651c0b977e2c0fc5dbe083557f19bb9fe7ccb6977428d1 SHA512 0f73b6e961cd8455d6b6c8c10ed8b99485d846c96377b5d4fcc3b83f737647207c1306aa3dd51dad9654fbfa61bfe1119b34646f90288ae7ecab45efa6fa418a +EBUILD assimp-4.0.1-r1.ebuild 1412 BLAKE2B 6887461a143ac6864da211607bfb4ca8c98cbf092150c8f67c61806680faa414a29c8da199a0da434a1ab0a094f5a524730289d5d2091d1b8a64d7c21ffc5710 SHA512 a218a38b0c6c4b4b2d97a5f6260381c33beb0c3d46e32f7ee08e7c6651ddbabe0d729410673aa0f9027fa653e7207397b9957e7e3841140b098f40d15180e1de +EBUILD assimp-4.0.1.ebuild 1361 BLAKE2B 3e443ab7c085b57d15f426b591d23975e18ad4c2951ce3a71d7210a4ad9851cc916425de6ed8aa0e434dd7f3c49488fa83a7f419f6d2f80aa6a76313719812b1 SHA512 627808af638bb489fcc341ea9ff502a7bda81137292fa48e707f9c1f83b381295485ecf22f212de45ca66a789f2641f30aa4ef0b54ed2f8b267a558c05085e95 +EBUILD assimp-4.1.0.ebuild 1362 BLAKE2B 672412dc4acc3c48f4d376d9a3787442050e32a639fa901ad2952b6d7442709d6d89856eae5f9a23ce67e8ff2a7823a2b242020f26eb081674d04719716c91df SHA512 a538b4e10a5406a01f1f0e60fbd50630679c44a56d1de474aa5d0b6ba3db55e3f22c4fb1bc26e23f4457114080fc08f23d10b45c0660df844466f83891a953d9 +EBUILD assimp-5.0.0.ebuild 1362 BLAKE2B 672412dc4acc3c48f4d376d9a3787442050e32a639fa901ad2952b6d7442709d6d89856eae5f9a23ce67e8ff2a7823a2b242020f26eb081674d04719716c91df SHA512 a538b4e10a5406a01f1f0e60fbd50630679c44a56d1de474aa5d0b6ba3db55e3f22c4fb1bc26e23f4457114080fc08f23d10b45c0660df844466f83891a953d9 MISC metadata.xml 463 BLAKE2B e8815466468672f2ebf597e0155adf205234f603ae9287a5743005d26ec240429ea5b98d006554abc69e08251613257130a258fe6cd5e1a79865005d98475eb5 SHA512 8daf9f83564ce1357b6a99441fc733b9d7a00db2071cb2fc47f1a0c6a1842cea57a1ec4aa628b86271abbdaaf5c17c60092f1e2de42e9604a5165e81b2f4bf2a diff --git a/media-libs/assimp/assimp-4.0.1-r1.ebuild b/media-libs/assimp/assimp-4.0.1-r1.ebuild index 0e4e53c35722..2454b233cb62 100644 --- a/media-libs/assimp/assimp-4.0.1-r1.ebuild +++ b/media-libs/assimp/assimp-4.0.1-r1.ebuild @@ -13,6 +13,7 @@ LICENSE="BSD" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="samples static test tools" SLOT="0" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/boost:= diff --git a/media-libs/assimp/assimp-4.0.1.ebuild b/media-libs/assimp/assimp-4.0.1.ebuild index 954e9f5f3a09..5ad3d5d68370 100644 --- a/media-libs/assimp/assimp-4.0.1.ebuild +++ b/media-libs/assimp/assimp-4.0.1.ebuild @@ -13,6 +13,7 @@ LICENSE="BSD" KEYWORDS="amd64 ~arm arm64 x86" IUSE="samples static test tools" SLOT="0" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/boost:= diff --git a/media-libs/assimp/assimp-4.1.0.ebuild b/media-libs/assimp/assimp-4.1.0.ebuild index 00b042528bb6..f52e8180a882 100644 --- a/media-libs/assimp/assimp-4.1.0.ebuild +++ b/media-libs/assimp/assimp-4.1.0.ebuild @@ -13,6 +13,7 @@ LICENSE="BSD" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="samples static test tools" SLOT="0" +RESTRICT="!test? ( test )" RDEPEND=" dev-libs/boost:= diff --git a/media-libs/assimp/assimp-5.0.0.ebuild b/media-libs/assimp/assimp-5.0.0.ebuild new file mode 100644 index 000000000000..f52e8180a882 --- /dev/null +++ b/media-libs/assimp/assimp-5.0.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +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" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="samples static test tools" +SLOT="0" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/boost:= + sys-libs/zlib:=[minizip] + samples? ( + media-libs/freeglut + virtual/opengl + x11-libs/libX11 + ) + tools? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + media-libs/devil + virtual/opengl + ) +" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/${P}-disabletest.patch" # bug 659122 + "${FILESDIR}/${P}-unzip-of.patch" + "${FILESDIR}/${P}-findassimp.patch" +) + +src_configure() { + local mycmakeargs=( + -DASSIMP_BUILD_SAMPLES=$(usex samples) + -DASSIMP_BUILD_STATIC_LIB=$(usex static) + -DASSIMP_BUILD_TESTS=$(usex test) + -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools) + -DCMAKE_DEBUG_POSTFIX="" + -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/" + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + insinto /usr/share/cmake/Modules + doins cmake-modules/Findassimp.cmake +} + +src_test() { + "${BUILD_DIR}/test/unit" || die +} diff --git a/media-libs/assimp/files/assimp-5.0.0-disabletest.patch b/media-libs/assimp/files/assimp-5.0.0-disabletest.patch new file mode 100644 index 000000000000..d5343c113668 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.0-disabletest.patch @@ -0,0 +1,13 @@ +--- a/test/unit/utVersion.cpp 2019-11-18 11:39:09.655298634 +0100 ++++ b/test/unit/utVersion.cpp 2019-11-18 11:39:25.823299035 +0100 +@@ -66,10 +66,6 @@ + EXPECT_NE( aiGetCompileFlags(), 0U ); + } + +-TEST_F( utVersion, aiGetVersionRevisionTest ) { +- EXPECT_NE( aiGetVersionRevision(), 0U ); +-} +- + TEST_F( utVersion, aiGetBranchNameTest ) { + EXPECT_NE( nullptr, aiGetBranchName() ); + } diff --git a/media-libs/assimp/files/assimp-5.0.0-findassimp.patch b/media-libs/assimp/files/assimp-5.0.0-findassimp.patch new file mode 100644 index 000000000000..6056f4973c55 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.0-findassimp.patch @@ -0,0 +1,28 @@ +--- a/cmake-modules/Findassimp.cmake 2019-10-08 08:08:29.025321121 +0200 ++++ b/cmake-modules/Findassimp.cmake 2019-10-08 08:09:47.976323079 +0200 +@@ -54,14 +54,17 @@ + + find_path( + assimp_INCLUDE_DIRS +- NAMES postprocess.h scene.h version.h config.h cimport.h ++ NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h + PATHS /usr/local/include/ ++ PATHS /usr/include/ + ) + + find_library( + assimp_LIBRARIES + NAMES assimp + PATHS /usr/local/lib/ ++ PATHS /usr/lib/ ++ PATHS /usr/lib64/ + ) + + if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) +@@ -78,4 +81,4 @@ + endif (assimp_FIND_REQUIRED) + endif (assimp_FOUND) + +-endif(WIN32) +\ Brak znaku nowej linii na końcu pliku ++endif(WIN32) diff --git a/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch b/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch new file mode 100644 index 000000000000..e75b47a1af4b --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.0-unzip-of.patch @@ -0,0 +1,11 @@ +--- a/contrib/unzip/unzip.h 2019-08-21 21:38:10.991542891 +0200 ++++ b/contrib/unzip/unzip.h 2019-08-21 21:38:24.507543226 +0200 +@@ -45,6 +45,8 @@ + #ifndef _unz_H + #define _unz_H + ++#define OF _Z_OF ++ + #ifdef __cplusplus + extern "C" { + #endif |