From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jun 2020 17:50:24 +0100 Subject: gentoo resync : 21.06.2020 --- media-libs/assimp/Manifest | 13 +---- media-libs/assimp/assimp-4.0.1-r1.ebuild | 68 ---------------------- media-libs/assimp/assimp-4.0.1.ebuild | 67 --------------------- media-libs/assimp/assimp-4.1.0.ebuild | 67 --------------------- .../assimp/files/assimp-4.0.1-disabletest.patch | 10 ---- .../assimp/files/assimp-4.0.1-qt-5.11.0.patch | 59 ------------------- .../assimp/files/assimp-4.1.0-disabletest.patch | 10 ---- .../assimp/files/assimp-4.1.0-findassimp.patch | 28 --------- .../assimp/files/assimp-4.1.0-unzip-of.patch | 11 ---- media-libs/assimp/files/findassimp-3.3.1.patch | 25 -------- media-libs/assimp/metadata.xml | 1 - 11 files changed, 1 insertion(+), 358 deletions(-) delete mode 100644 media-libs/assimp/assimp-4.0.1-r1.ebuild delete mode 100644 media-libs/assimp/assimp-4.0.1.ebuild delete mode 100644 media-libs/assimp/assimp-4.1.0.ebuild delete mode 100644 media-libs/assimp/files/assimp-4.0.1-disabletest.patch delete mode 100644 media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch delete mode 100644 media-libs/assimp/files/assimp-4.1.0-disabletest.patch delete mode 100644 media-libs/assimp/files/assimp-4.1.0-findassimp.patch delete mode 100644 media-libs/assimp/files/assimp-4.1.0-unzip-of.patch delete mode 100644 media-libs/assimp/files/findassimp-3.3.1.patch (limited to 'media-libs/assimp') diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest index 29a2ddc43935..36b4de023b80 100644 --- a/media-libs/assimp/Manifest +++ b/media-libs/assimp/Manifest @@ -1,8 +1,3 @@ -AUX assimp-4.0.1-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8720707bb6f569d9697cd82303df7edf08d909ef8d8926b17203ad1126f13a6445080191649a96af837d1d7e02fa7667 SHA512 320f2f76ffbebf3a5d3064faa3bc16e0cb597ad994c35b1344aa3a60a07839e67a9d68b80f8723b663d491c6a37b6c95510e987acd04dd519d489a82e3d7e729 -AUX assimp-4.0.1-qt-5.11.0.patch 2230 BLAKE2B e99a1e8dcd5f3c5d8f2b5f116ccd2b5f9a7377e3c17f9d7fc6d4962c4a573c5fa68fced8a714c94cdc1e0bdeb7f2a0b2c4fb714f7c54bbe776efc68911ad5455 SHA512 44bd08a59de45bd6431e97c8165ab7d9c08fccc2bcf704fbf063db143152f9e4aa1e9f5ff7c104bd312a643a42259af6e370caaac92f40d369972b21e692c928 -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 @@ -11,13 +6,7 @@ AUX assimp-5.0.1-fix-aiGetLegalStringTest.patch 2919 BLAKE2B 4c5111f11b4d0de92c1 AUX assimp-5.0.1-fix-unittests.patch 1062 BLAKE2B 3e1e2a236f5f4fc9aa901001a526261569513b221082480bcb366e208489b00df33f7da38245293a17e8aac846ca715a86d10c1a7362137c4afd30f63782fdb0 SHA512 66f52cc5f809eb6987e1c6298730ae6bf89e1d0fb1c7665834448494121f79c1602277ac6eabb69a302171cf1048b54560ade3bc00a8e1adb4fe464bdb71d9de AUX assimp-5.0.1-projectversion.patch 686 BLAKE2B 0b521adc80aaa2350a8225c40a2e1a918831e7fbbd3c9e46cb654c94c370d95ac5622f3c95ab161debeee92234548778de494640f88e4d8131f0bf91b76b07c9 SHA512 981d62f20448cc47c732dd4c0bd24ad43c2bb02a9a765ea1da12e834cd50a1675bdbed94d37d1f60c011ba237327be953db89ec1d509dcfeaf30ed480eb9217f AUX assimp-5.0.1-versiontest.patch 779 BLAKE2B 7d48c4070917589808a04ba370a682a4b96bf7cb116befee9c8c110fafc17878b7cf8729d6321968670ecedb763a93c237ade4af9f1194e6850b34d4dd6a3be3 SHA512 1b29ba91ecd6d4650e1f44ac7dbbd14e508b85adef78c4396d820567fdabf98d9098ea8f3e2be7368ffeb42b220fe4749d459dfb38edc99be2f09b4aefcb80c3 -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 DIST assimp-5.0.1.tar.gz 46607553 BLAKE2B 7f8cdf2bc602398fbdb675094d135e955716deb8f6469a4b68f7a8c735ecaa3120ee023c5c1f95c5a79c0606ed9a3cb3491c5011e2b409da523b56cd193ebb60 SHA512 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0 DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e -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.1.ebuild 1476 BLAKE2B d7cf3d256493e8a6aae269f1a131378755ed12342bf7d73505acedf22dc6beb6af5bda074a9062b816ba38106c5633be1f895f463f554507eb473621730c14a6 SHA512 c5b5f457e87069841d4b2bfd6c2a66c1717f05e98f676a811afffec034bc07ac47e1ca64ee05660b99f471055bdf74abf403d5c9327169286600b81ea97bb94e -MISC metadata.xml 415 BLAKE2B 66f2082a72d1c299f8d93b13a2139538096f6fd609768f5600f523eaa3a031793cbb0d70817201cea85af8c3d082905fe8c5594817fab7190da387002feeab37 SHA512 5c1688db3bf253c842d996f17bf596260e618eb50aaea9f639eb92fb00c5391e1a5c9337d992e78952d074484d7de25c179fe3dbf47e4d9ac01daf69d94227ae +MISC metadata.xml 362 BLAKE2B 7a2e578189dd0932529ceb85203c83cc8b64b39d3dcd20e27dcd2590ebc3febc75d5ec121041a0a119e37282352ebd567b452911d00cdbf8565ef263b44d4e2b SHA512 c2cb23027c4fe2d95e5f97ca789ed97dbe77ca0d29adfb8ae1945be12bd08e86f13a2126961ef3d1e23e21cc89fd612db6ae1cc3c1c63720ac4053380ee4bb97 diff --git a/media-libs/assimp/assimp-4.0.1-r1.ebuild b/media-libs/assimp/assimp-4.0.1-r1.ebuild deleted file mode 100644 index 2454b233cb62..000000000000 --- a/media-libs/assimp/assimp-4.0.1-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic - -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}/findassimp-3.3.1.patch" - "${FILESDIR}/${P}-qt-5.11.0.patch" - "${FILESDIR}/${P}-disabletest.patch" # bug 659122 -) - -src_configure() { - append-flags -fno-strict-aliasing - 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/assimp-4.0.1.ebuild b/media-libs/assimp/assimp-4.0.1.ebuild deleted file mode 100644 index 5ad3d5d68370..000000000000 --- a/media-libs/assimp/assimp-4.0.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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}/findassimp-3.3.1.patch" - "${FILESDIR}/${P}-qt-5.11.0.patch" - "${FILESDIR}/${P}-disabletest.patch" # bug 659122 -) - -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/assimp-4.1.0.ebuild b/media-libs/assimp/assimp-4.1.0.ebuild deleted file mode 100644 index f52e8180a882..000000000000 --- a/media-libs/assimp/assimp-4.1.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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-4.0.1-disabletest.patch b/media-libs/assimp/files/assimp-4.0.1-disabletest.patch deleted file mode 100644 index 4afe5bbd26ba..000000000000 --- a/media-libs/assimp/files/assimp-4.0.1-disabletest.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/test/unit/utVersion.cpp 2017-07-28 22:33:41.000000000 +0200 -+++ b/test/unit/utVersion.cpp 2018-08-26 01:48:54.935116440 +0200 -@@ -65,7 +65,3 @@ - EXPECT_NE( aiGetCompileFlags(), 0U ); - } - --TEST_F( utVersion, aiGetVersionRevisionTest ) { -- EXPECT_NE( aiGetVersionRevision(), 0U ); --} -- diff --git a/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch b/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch deleted file mode 100644 index ef5a50249396..000000000000 --- a/media-libs/assimp/files/assimp-4.0.1-qt-5.11.0.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7251c3c51a774c2828f62787e3aa6ad743ca5628 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 16 May 2018 13:45:25 +0200 -Subject: [PATCH 1/2] Fix build with Qt 5.11.0_beta3 (qt5_use_modules is gone) - ---- - tools/assimp_qt_viewer/CMakeLists.txt | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/tools/assimp_qt_viewer/CMakeLists.txt b/tools/assimp_qt_viewer/CMakeLists.txt -index 42ef0fb3..9f1b68ca 100644 ---- a/tools/assimp_qt_viewer/CMakeLists.txt -+++ b/tools/assimp_qt_viewer/CMakeLists.txt -@@ -3,7 +3,7 @@ project(assimp_qt_viewer) - - cmake_minimum_required(VERSION 2.6) - --find_package(Qt5Widgets REQUIRED) -+find_package(Qt5 COMPONENTS Gui Widgets OpenGL REQUIRED) - find_package(DevIL REQUIRED) - find_package(OpenGL REQUIRED) - -@@ -25,9 +25,8 @@ qt5_wrap_ui(UISrcs mainwindow.ui) - qt5_wrap_cpp(MOCrcs mainwindow.hpp glview.hpp) - - add_executable(${PROJECT_NAME} ${assimp_qt_viewer_SRCS} ${UISrcs} ${MOCrcs}) --target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${IL_LIBRARIES} ${OPENGL_LIBRARIES} assimp) -+target_link_libraries(${PROJECT_NAME} Qt5::Gui Qt5::Widgets Qt5::OpenGL ${IL_LIBRARIES} ${OPENGL_LIBRARIES} assimp) - --qt5_use_modules(${PROJECT_NAME} Widgets OpenGL) - if(WIN32) # Check if we are on Windows - if(MSVC) # Check if we are using the Visual Studio compiler - #set_target_properties(TestProject PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS") --- -2.17.0 - - -From 5bbf0a8afa5a3cbaa9281e47cc327b0d9560b03f Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 16 May 2018 13:58:30 +0200 -Subject: [PATCH 2/2] Add missing assimp_qt_viewer install target - ---- - tools/assimp_qt_viewer/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tools/assimp_qt_viewer/CMakeLists.txt b/tools/assimp_qt_viewer/CMakeLists.txt -index 9f1b68ca..b41291e3 100644 ---- a/tools/assimp_qt_viewer/CMakeLists.txt -+++ b/tools/assimp_qt_viewer/CMakeLists.txt -@@ -42,3 +42,5 @@ else() - endif() - - set_property(TARGET ${PROJECT_NAME} PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) -+ -+install(TARGETS assimp_qt_viewer DESTINATION "${ASSIMP_BIN_INSTALL_DIR}") --- -2.17.0 - diff --git a/media-libs/assimp/files/assimp-4.1.0-disabletest.patch b/media-libs/assimp/files/assimp-4.1.0-disabletest.patch deleted file mode 100644 index 4afe5bbd26ba..000000000000 --- a/media-libs/assimp/files/assimp-4.1.0-disabletest.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/test/unit/utVersion.cpp 2017-07-28 22:33:41.000000000 +0200 -+++ b/test/unit/utVersion.cpp 2018-08-26 01:48:54.935116440 +0200 -@@ -65,7 +65,3 @@ - EXPECT_NE( aiGetCompileFlags(), 0U ); - } - --TEST_F( utVersion, aiGetVersionRevisionTest ) { -- EXPECT_NE( aiGetVersionRevision(), 0U ); --} -- diff --git a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch deleted file mode 100644 index 6056f4973c55..000000000000 --- a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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-4.1.0-unzip-of.patch b/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch deleted file mode 100644 index e75b47a1af4b..000000000000 --- a/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/media-libs/assimp/files/findassimp-3.3.1.patch b/media-libs/assimp/files/findassimp-3.3.1.patch deleted file mode 100644 index 0f36fafb0152..000000000000 --- a/media-libs/assimp/files/findassimp-3.3.1.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/cmake-modules/Findassimp.cmake 2016-09-26 07:52:09.719727490 +0200 -+++ b/cmake-modules/Findassimp.cmake 2016-09-26 07:52:28.509727838 +0200 -@@ -55,13 +55,13 @@ - find_path( - assimp_INCLUDE_DIRS - NAMES postprocess.h scene.h version.h config.h cimport.h -- PATHS /usr/local/include/ -+ PATHS /usr/include/ - ) - - find_library( - assimp_LIBRARIES - NAMES assimp -- PATHS /usr/local/lib/ -+ PATHS /usr/lib/ - ) - - if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) -@@ -78,4 +78,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/metadata.xml b/media-libs/assimp/metadata.xml index a9d38618addb..6eafc14b8fba 100644 --- a/media-libs/assimp/metadata.xml +++ b/media-libs/assimp/metadata.xml @@ -4,7 +4,6 @@ Build viewer library - Build assimp tool binary assimp -- cgit v1.2.3