From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- media-libs/assimp/Manifest | 10 +- media-libs/assimp/assimp-5.0.0.ebuild | 67 ------ media-libs/assimp/assimp-5.0.1.ebuild | 66 ++++++ .../assimp/files/assimp-5.0.1-GNUInstallDirs.patch | 239 +++++++++++++++++++++ .../assimp-5.0.1-fix-aiGetLegalStringTest.patch | 76 +++++++ .../assimp/files/assimp-5.0.1-fix-unittests.patch | 37 ++++ .../assimp/files/assimp-5.0.1-projectversion.patch | 22 ++ .../assimp/files/assimp-5.0.1-versiontest.patch | 23 ++ 8 files changed, 471 insertions(+), 69 deletions(-) delete mode 100644 media-libs/assimp/assimp-5.0.0.ebuild create mode 100644 media-libs/assimp/assimp-5.0.1.ebuild create mode 100644 media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch create mode 100644 media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch create mode 100644 media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch create mode 100644 media-libs/assimp/files/assimp-5.0.1-projectversion.patch create mode 100644 media-libs/assimp/files/assimp-5.0.1-versiontest.patch (limited to 'media-libs/assimp') diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest index c1cdd002d152..29a2ddc43935 100644 --- a/media-libs/assimp/Manifest +++ b/media-libs/assimp/Manifest @@ -6,12 +6,18 @@ AUX assimp-4.1.0-unzip-of.patch 242 BLAKE2B c977c94d4ef44d9e185738e7f3c2e5bda59e 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 assimp-5.0.1-GNUInstallDirs.patch 11844 BLAKE2B f426b1aa400a840bc9c3768d5becd527bd8ec4408158923002a941c0f7a25c5c213f6bc7481ba0263cdf24d8cdfc3f42121191ae3c5d2de1ded90483f31801ae SHA512 1ac1c74dfd971b5a6502d3a6df9e6f069da50a9e00ff1c837616774117adc5ac9b266b772a6be18c8367d07f195dce39ba301dbd7756960cba6853b951b3ce70 +AUX assimp-5.0.1-fix-aiGetLegalStringTest.patch 2919 BLAKE2B 4c5111f11b4d0de92c169d0f50eafddb35582a93a6e4bd56ebab8560aa32f7e486866c449884fadc50d0e9b48c714ec0bd743a585d82b62622363cb99c921a8c SHA512 301827d1f134e4f18fdfd05aa6f83cd0020b4788e840d766a589eec7962e48e6f401d87dc41cd344abb3d08145e326b6e9a16970e46b5bbc67dbdacc3985fe2e +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.0.tar.gz 46604597 BLAKE2B 850c84cce6c24c01c2db00d76337797f3e4a4e819e133cf194cac0a7344fa58cb4805e0d5eb29b434f651c0b977e2c0fc5dbe083557f19bb9fe7ccb6977428d1 SHA512 0f73b6e961cd8455d6b6c8c10ed8b99485d846c96377b5d4fcc3b83f737647207c1306aa3dd51dad9654fbfa61bfe1119b34646f90288ae7ecab45efa6fa418a +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.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 diff --git a/media-libs/assimp/assimp-5.0.0.ebuild b/media-libs/assimp/assimp-5.0.0.ebuild deleted file mode 100644 index f52e8180a882..000000000000 --- a/media-libs/assimp/assimp-5.0.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/assimp-5.0.1.ebuild b/media-libs/assimp/assimp-5.0.1.ebuild new file mode 100644 index 000000000000..95aa293ace46 --- /dev/null +++ b/media-libs/assimp/assimp-5.0.1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 +doc? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-docs-${PV}.pdf )" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 x86" +IUSE="doc samples test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/boost:= + sys-libs/zlib[minizip] + samples? ( + media-libs/freeglut + virtual/opengl + x11-libs/libX11 + ) +" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.0.0-disabletest.patch" # bug 659122 + "${FILESDIR}/${PN}-5.0.0-unzip-of.patch" + "${FILESDIR}/${PN}-5.0.0-findassimp.patch" + "${FILESDIR}/${P}-GNUInstallDirs.patch" # bug 701912 + "${FILESDIR}/${P}-projectversion.patch" + "${FILESDIR}/${P}-fix-unittests.patch" + "${FILESDIR}/${P}-fix-aiGetLegalStringTest.patch" + "${FILESDIR}/${P}-versiontest.patch" +) + +src_configure() { + local mycmakeargs=( + -DASSIMP_BUILD_STATIC_LIB=OFF + -DCMAKE_DEBUG_POSTFIX="" + -DASSIMP_BUILD_SAMPLES=$(usex samples) + -DASSIMP_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + use doc && dodoc "${DISTDIR}"/${PN}-docs-${PV}.pdf + + 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.1-GNUInstallDirs.patch b/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch new file mode 100644 index 000000000000..134edc7d7da1 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch @@ -0,0 +1,239 @@ +From cbf94fd62ff831879d10f99aa7766d391ae8a9b7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Victor=20Matar=C3=A9?= +Date: Tue, 31 Mar 2020 21:30:07 +0200 +Subject: [PATCH] use GNUInstallDirs where possible + +Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and +disable redefining FHS-mandated install locations via user-editable +ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary, +Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables. +--- + CMakeLists.txt | 36 ++++++++++++++++++++++------------ + assimp.pc.in | 6 ++---- + assimpTargets-debug.cmake.in | 20 +++++++++---------- + assimpTargets-release.cmake.in | 18 ++++++++--------- + assimpTargets.cmake.in | 15 +------------- + 5 files changed, 45 insertions(+), 50 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dcafb649f5..c23c0df33e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -230,11 +230,6 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M + SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev) + SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names") + +-IF( UNIX ) +- # Use GNUInstallDirs for Unix predefined directories +- INCLUDE(GNUInstallDirs) +-ENDIF( UNIX ) +- + # Grouped compiler settings + IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW) + IF(NOT HUNTER_ENABLED) +@@ -329,14 +324,6 @@ IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) + SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" ) + ENDIF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) + +-# Cache these to allow the user to override them manually. +-SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING +- "Path the built library files are installed to." ) +-SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING +- "Path the header files are installed to." ) +-SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING +- "Path the tool executables are installed to." ) +- + get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG) + + IF (INJECT_DEBUG_POSTFIX AND (is_multi_config OR CMAKE_BUILD_TYPE STREQUAL "Debug")) +@@ -391,6 +378,29 @@ IF(HUNTER_ENABLED) + ) + ELSE(HUNTER_ENABLED) + # cmake configuration files ++ ++ IF( UNIX ) ++ # Use GNUInstallDirs for Unix predefined directories ++ INCLUDE(GNUInstallDirs) ++ ++ SET( ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) ++ SET( ASSIMP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}) ++ SET( ASSIMP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}) ++ ELSE( UNIX ) ++ # Cache these to allow the user to override them on non-Unix platforms ++ SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING ++ "Path the built library files are installed to." ) ++ SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING ++ "Path the header files are installed to." ) ++ SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING ++ "Path the tool executables are installed to." ) ++ ++ SET(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_INCLUDE_INSTALL_DIR}) ++ SET(CMAKE_INSTALL_FULL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR}) ++ SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_BIN_INSTALL_DIR}) ++ ENDIF( UNIX ) ++ ++ + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE) + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE) + IF (is_multi_config) +diff --git a/assimp.pc.in b/assimp.pc.in +index c659e19f2c..555a3a1d3b 100644 +--- a/assimp.pc.in ++++ b/assimp.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@CMAKE_INSTALL_PREFIX@/ +-libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@ +-includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: @CMAKE_PROJECT_NAME@ + Description: Import various well-known 3D model formats in an uniform manner. +diff --git a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in +index 1ebe2a6081..f5034c9349 100644 +--- a/assimpTargets-debug.cmake.in ++++ b/assimpTargets-debug.cmake.in +@@ -42,22 +42,22 @@ if(MSVC) + # Import target "assimp::assimp" for configuration "Debug" + set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/${importLibraryName}" +- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ++ IMPORTED_IMPLIB_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}" ++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}") +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}") ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" ) + else() + set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@") + + # Import target "assimp::assimp" for configuration "Debug" + set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}") ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}") + endif() + + else() +@@ -66,17 +66,17 @@ else() + set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@") + set_target_properties(assimp::assimp PROPERTIES + IMPORTED_SONAME_DEBUG "${sharedLibraryName}" +- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" ) + else() + set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@") + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" ) + endif() + endif() + +diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in +index f3db8f12cd..a416e8899b 100644 +--- a/assimpTargets-release.cmake.in ++++ b/assimpTargets-release.cmake.in +@@ -42,12 +42,12 @@ if(MSVC) + # Import target "assimp::assimp" for configuration "Release" + set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}" +- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ++ IMPORTED_IMPLIB_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}" ++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}") +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}") ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" ) + else() + set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@") + +@@ -57,7 +57,7 @@ if(MSVC) + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}") ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}") + endif() + + else() +@@ -70,17 +70,17 @@ else() + endif() + set_target_properties(assimp::assimp PROPERTIES + IMPORTED_SONAME_RELEASE "${sharedLibraryName}" +- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" ) + else() + set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@") + set_target_properties(assimp::assimp PROPERTIES +- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" + ) + list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) +- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ) ++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" ) + endif() + endif() + +diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in +index ab1a8d2c7b..ef90c834a6 100644 +--- a/assimpTargets.cmake.in ++++ b/assimpTargets.cmake.in +@@ -40,16 +40,6 @@ unset(_targetsDefined) + unset(_targetsNotDefined) + unset(_expectedTargets) + +- +-# Compute the installation prefix relative to this file. +-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +-if(_IMPORT_PREFIX STREQUAL "/") +- set(_IMPORT_PREFIX "") +-endif() +- + # Create imported target assimp::assimp + if(@BUILD_SHARED_LIBS@) + add_library(assimp::assimp SHARED IMPORTED) +@@ -60,7 +50,7 @@ endif() + set_target_properties(assimp::assimp PROPERTIES + COMPATIBLE_INTERFACE_STRING "assimp_MAJOR_VERSION" + INTERFACE_assimp_MAJOR_VERSION "1" +- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include" ++ INTERFACE_INCLUDE_DIRECTORIES "@CMAKE_INSTALL_FULL_INCLUDEDIR@" + #INTERFACE_LINK_LIBRARIES "TxtUtils::TxtUtils;MealyMachine::MealyMachine" + ) + +@@ -75,9 +65,6 @@ foreach(f ${CONFIG_FILES}) + include(${f}) + endforeach() + +-# Cleanup temporary variables. +-set(_IMPORT_PREFIX) +- + # Loop over all imported files and verify that they actually exist + foreach(target ${_IMPORT_CHECK_TARGETS} ) + foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) diff --git a/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch b/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch new file mode 100644 index 000000000000..b0db38a0e8a1 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.1-fix-aiGetLegalStringTest.patch @@ -0,0 +1,76 @@ +From 059ee0e091f1c658c20202a9123bdf90fc7fa307 Mon Sep 17 00:00:00 2001 +From: RichardTea <31507749+RichardTea@users.noreply.github.com> +Date: Fri, 11 Oct 2019 16:28:14 +0100 +Subject: [PATCH] Update assimp legal and version + +Will now report the major and minor versions specified in cmakelists +--- + code/Common/Version.cpp | 14 +++++--------- + test/unit/utVersion.cpp | 2 +- + 2 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/code/Common/Version.cpp b/code/Common/Version.cpp +index 868cfb06af..cf1da7d5ba 100644 +--- a/code/Common/Version.cpp ++++ b/code/Common/Version.cpp +@@ -46,8 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include "ScenePrivate.h" + +-static const unsigned int MajorVersion = 5; +-static const unsigned int MinorVersion = 0; ++#include "revision.h" + + // -------------------------------------------------------------------------------- + // Legal information string - don't remove this. +@@ -56,9 +55,9 @@ static const char* LEGAL_INFORMATION = + "Open Asset Import Library (Assimp).\n" + "A free C/C++ library to import various 3D file formats into applications\n\n" + +-"(c) 2008-2020, assimp team\n" ++"(c) 2006-2020, assimp team\n" + "License under the terms and conditions of the 3-clause BSD license\n" +-"https://github.com/assimp/assimp\n" ++"http://assimp.org\n" + ; + + // ------------------------------------------------------------------------------------------------ +@@ -70,13 +69,13 @@ ASSIMP_API const char* aiGetLegalString () { + // ------------------------------------------------------------------------------------------------ + // Get Assimp minor version + ASSIMP_API unsigned int aiGetVersionMinor () { +- return MinorVersion; ++ return VER_MINOR; + } + + // ------------------------------------------------------------------------------------------------ + // Get Assimp major version + ASSIMP_API unsigned int aiGetVersionMajor () { +- return MajorVersion; ++ return VER_MAJOR; + } + + // ------------------------------------------------------------------------------------------------ +@@ -104,9 +103,6 @@ ASSIMP_API unsigned int aiGetCompileFlags () { + return flags; + } + +-// include current build revision, which is even updated from time to time -- :-) +-#include "revision.h" +- + // ------------------------------------------------------------------------------------------------ + ASSIMP_API unsigned int aiGetVersionRevision() { + return GitVersion; +diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp +index 233b2fb0b2..66e832baae 100644 +--- a/test/unit/utVersion.cpp ++++ b/test/unit/utVersion.cpp +@@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) { + EXPECT_NE( lv, nullptr ); + std::string text( lv ); + +- size_t pos( text.find( std::string( "2017" ) ) ); ++ size_t pos( text.find( std::string( "2019" ) ) ); + EXPECT_NE( pos, std::string::npos ); + } + diff --git a/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch b/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch new file mode 100644 index 000000000000..1b1efa027427 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.1-fix-unittests.patch @@ -0,0 +1,37 @@ +From ecd413c86c031900832028c94c0d55488cf26a0a Mon Sep 17 00:00:00 2001 +From: Kim Kulling +Date: Sun, 6 Oct 2019 20:19:59 +0200 +Subject: [PATCH] Update utVersion.cpp + +Fix the unittests as well. +--- + test/unit/utVersion.cpp | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp +index 5cfc91ccdd..233b2fb0b2 100644 +--- a/test/unit/utVersion.cpp ++++ b/test/unit/utVersion.cpp +@@ -4,8 +4,6 @@ Open Asset Import Library (assimp) + + Copyright (c) 2006-2019, assimp team + +- +- + All rights reserved. + + Redistribution and use of this software in source and binary forms, +@@ -55,11 +53,11 @@ TEST_F( utVersion, aiGetLegalStringTest ) { + } + + TEST_F( utVersion, aiGetVersionMinorTest ) { +- EXPECT_EQ( aiGetVersionMinor(), 1U ); ++ EXPECT_EQ( aiGetVersionMinor(), 0U ); + } + + TEST_F( utVersion, aiGetVersionMajorTest ) { +- EXPECT_EQ( aiGetVersionMajor(), 4U ); ++ EXPECT_EQ( aiGetVersionMajor(), 5U ); + } + + TEST_F( utVersion, aiGetCompileFlagsTest ) { diff --git a/media-libs/assimp/files/assimp-5.0.1-projectversion.patch b/media-libs/assimp/files/assimp-5.0.1-projectversion.patch new file mode 100644 index 000000000000..ed82e1b0b4b0 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.1-projectversion.patch @@ -0,0 +1,22 @@ +From 13a2f22835cfe4093860de3e3d33782f854a2e58 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc?= +Date: Tue, 14 Jan 2020 16:26:24 +0100 +Subject: [PATCH] Fix Assimp patch version to match the last bug fix release + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23b6f6d618..e14c4aa21f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,7 @@ IF(HUNTER_ENABLED) + add_definitions(-DASSIMP_USE_HUNTER) + ENDIF(HUNTER_ENABLED) + +-PROJECT( Assimp VERSION 5.0.0 ) ++PROJECT( Assimp VERSION 5.0.1 ) + + # All supported options ############################################### + diff --git a/media-libs/assimp/files/assimp-5.0.1-versiontest.patch b/media-libs/assimp/files/assimp-5.0.1-versiontest.patch new file mode 100644 index 000000000000..8267fc004d61 --- /dev/null +++ b/media-libs/assimp/files/assimp-5.0.1-versiontest.patch @@ -0,0 +1,23 @@ +From 9aea72f70e3f10f7db903c24a2c19a7fd769e3b8 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Lortie +Date: Mon, 20 Jan 2020 09:14:04 -0500 +Subject: [PATCH] Changed date in test aiGetLegalStringTest to the appropriate + year. + +--- + test/unit/utVersion.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/unit/utVersion.cpp b/test/unit/utVersion.cpp +index ca54620533..aa75a26d85 100644 +--- a/test/unit/utVersion.cpp ++++ b/test/unit/utVersion.cpp +@@ -48,7 +48,7 @@ TEST_F( utVersion, aiGetLegalStringTest ) { + EXPECT_NE( lv, nullptr ); + std::string text( lv ); + +- size_t pos( text.find( std::string( "2019" ) ) ); ++ size_t pos( text.find( std::string( "2020" ) ) ); + EXPECT_NE( pos, std::string::npos ); + } + -- cgit v1.2.3