diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-11-03 06:47:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-11-03 06:47:15 +0000 |
| commit | fc2f1018fc323ef2c6572734a9b130427cba76a6 (patch) | |
| tree | f834bdc9a67923ce75297c09d00d1e7b90791d26 /media-gfx | |
| parent | 162945d2a91899b637bbb9e163b406350de12906 (diff) | |
gentoo resync : 03.11.2021
Diffstat (limited to 'media-gfx')
33 files changed, 1309 insertions, 86 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 62db4c3dc129..6a801727cedd 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest index a080bac1c551..67400d2ddc71 100644 --- a/media-gfx/alembic/Manifest +++ b/media-gfx/alembic/Manifest @@ -1,6 +1,7 @@ AUX alembic-1.8.0-0001-set-correct-libdir.patch 1879 BLAKE2B 2cbcdfee02094745544ebc67e467e452d225a8a9445481f984eaadf399544bfac24a410d8a7f4137f4b73d038e7f5eaf08ea492aa7bb95f15fede87fef081eb6 SHA512 d1ec399048a6baebdbd4eadb5be55281693455d0280dd3ff86d8747d2aaf52eede4c6848d71362e17de2d23d063357ff983bb3a8ecad28e81303f72a76f48a02 +AUX alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch 4247 BLAKE2B 4c921f4774e20ec9739fd6afd0b6e4bdd7fe4cdf3374ef63d9c7ba1ac8d7255ca0bbca4c248465da7445f2b08c72e9425280e44dd64edec95088291c13dec0ed SHA512 45caa1fc850cf14eacef80f9271a07a8c502e1a098bb2cbdbd84bae0f9d80c819a4c058b5cb0d67f848eecd52de4cf9802f12e1c651c0bc2b826a9e56959a913 DIST alembic-1.8.2.tar.gz 861796 BLAKE2B 9ea2dea33b3116331dd02802055e8db7faa736bc2674e6b30209a9e178877523d9f14516b35729eaf6fc348b89367e9830ca1b998a8c7d10766b9b2f265b97d8 SHA512 23fec3d51cfd8ac8bc02749550de53a7b699ebe67654336864a8208a6a1d4f69e8e1a2c8e07832665c203788cbabbb65f346582741bac10ceb0d56c16d6b4217 DIST alembic-1.8.3.tar.gz 862221 BLAKE2B 81639b0968dbcaac0096eac83385b7d6b1dc27b4b1652ede8cf6b6cf3aa3eea3c6f5e53f033708b61f79d99ebfaa766a9cac3345a043d6cc0ba6d6c29dcb9ed0 SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036 EBUILD alembic-1.8.2.ebuild 1234 BLAKE2B 8fc18141031dcbf54bef2d0323c4a4e7f7315a7f2be9297c2af1683ac073530ae34271c97fb7d2f4961afb05baf5625bdb680caaf64f5da25cdc9dfdbaa55707 SHA512 7d2f20abc3d8d656dfe9b41528bf9ed494accd9678b46fd695637df4baa6bf116b770f21a1494f58370190f2af8ec20876b3e5639e9bd5f67bf15b055fdd9cfb -EBUILD alembic-1.8.3.ebuild 1638 BLAKE2B 196b6575fa7c97ac01adf354c6f3345a24ce3304c6099e89de4b41f3e6d9c2d1ff8fce38b76c14ed677f4929fca05bfe73d15c1de1cd710ce8b9c91591884d73 SHA512 42603d6e35d7f1b59d13bbdded3e054405293b89d97e5f33d4001c67c6b813dad75dd1ba1fadbb5fe4232491bcf2f679ce466dad935e54ee5e2b22501b601809 +EBUILD alembic-1.8.3-r1.ebuild 1722 BLAKE2B f0ed2d8cd08d8bb2d5ffa6ad3ebad6b201e0869e9ff894f70e5f252565e0bd8ef0a50c8db06974e509353594d59f259c7435c4859321308a43f7d36eac1a13f0 SHA512 c730dd1ae8dd8ee67a4bf817b1c3fa0d3ef20209c7f26baa790467f50d32eee8ab122f5749c77dbae98cc077df04fef783ac1bbf69959046826dcc7a9069fcf9 MISC metadata.xml 824 BLAKE2B 55b10435d032292b05af14bde6a69772eaf7993bd1686a0f1489313624d14b3572037d6ba7e9caab7bb69ed36cb61d5f1518d6c945e9e7c3853dcde1e80e3e0d SHA512 55c878337d8297cd8d811443d8821835e4ee5096364014bc43c798a34645076dc47ec405bdfd3c62a03481f8539cca9fadd8f7f15a2bb98471c9f7d0d57450a1 diff --git a/media-gfx/alembic/alembic-1.8.3.ebuild b/media-gfx/alembic/alembic-1.8.3-r1.ebuild index c46c467c35e5..3ec597c047e8 100644 --- a/media-gfx/alembic/alembic-1.8.3.ebuild +++ b/media-gfx/alembic/alembic-1.8.3-r1.ebuild @@ -3,15 +3,15 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..9} ) inherit cmake python-single-r1 DESCRIPTION="Open framework for storing and sharing scene data" HOMEPAGE="https://www.alembic.io/" SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD" +LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="examples hdf5 python test" @@ -20,13 +20,8 @@ RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} - || ( - >=dev-libs/imath-3.0.1[python?,${PYTHON_SINGLE_USEDEP}] - ( - >=media-libs/ilmbase-2.5.5 - python? ( >=dev-python/pyilmbase-2.5.5[${PYTHON_SINGLE_USEDEP}] ) - ) - ) + >=media-libs/ilmbase-2.5.5:= + python? ( >=dev-python/pyilmbase-2.5.5[${PYTHON_SINGLE_USEDEP}] ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 @@ -35,7 +30,10 @@ RDEPEND=" " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-1.8.0-0001-set-correct-libdir.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-1.8.0-0001-set-correct-libdir.patch + "${FILESDIR}"/${P}-0001-find-py-ilmbase-in-config-mode.patch +) DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt ) @@ -47,6 +45,10 @@ src_prepare() { src_configure() { local mycmakeargs=( + # Force falling back to ilmbase for now + # bug #818232 + -DCMAKE_DISABLE_FIND_PACKAGE_Imath=ON + -DALEMBIC_BUILD_LIBS=ON -DALEMBIC_SHARED_LIBS=ON # currently does nothing but require doxygen diff --git a/media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch b/media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch new file mode 100644 index 000000000000..bc7ac9f507a8 --- /dev/null +++ b/media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch @@ -0,0 +1,90 @@ +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sat, 30 Oct 2021 11:56:04 +0200 +Subject: [PATCH] find (py)ilmbase in config mode + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> + +diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake +index 9f52ca6..f076e14 100644 +--- a/cmake/AlembicIlmBase.cmake ++++ b/cmake/AlembicIlmBase.cmake +@@ -43,23 +43,27 @@ IF (Imath_FOUND) + ELSE() + MESSAGE(STATUS "Could not find Imath looking for IlmBase instead.") + # What we really want to do is look for libs Imath and half +- FIND_PACKAGE(IlmBase) ++ FIND_PACKAGE(IlmBase CONFIG REQUIRED) + SET(ALEMBIC_USING_IMATH_3 OFF) ++ SET(ILMBASE_FOUND True) ++ GET_TARGET_PROPERTY(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY IlmBase::IlmBaseConfig INTERFACE_INCLUDE_DIRECTORIES) ++ SET(ALEMBIC_ILMBASE_HALF_LIB IlmBase::Half) ++ SET(ALEMBIC_ILMBASE_IEX_LIB IlmBase::Iex) ++ SET(ALEMBIC_ILMBASE_IEXMATH_LIB IlmBase::IexMath) ++ SET(ALEMBIC_ILMBASE_ILMTHREAD_LIB IlmBase::IlmThread) ++ SET(ALEMBIC_ILMBASE_IMATH_LIB IlmBase::Imath) ++ SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_HALF_LIB} ${ALEMBIC_ILMBASE_IEX_LIB} ${ALEMBIC_ILMBASE_IEXMATH_LIB} ++ ${ALEMBIC_ILMBASE_ILMTHREAD_LIB} ${ALEMBIC_ILMBASE_IMATH_LIB}) + + IF (ILMBASE_FOUND) + SET(ALEMBIC_ILMBASE_FOUND 1 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise") +- +- SET(ALEMBIC_ILMBASE_LIBS +- ${ALEMBIC_ILMBASE_IMATH_LIB} +- ${ALEMBIC_ILMBASE_ILMTHREAD_LIB} +- ${ALEMBIC_ILMBASE_IEX_LIB} +- ${ALEMBIC_ILMBASE_HALF_LIB} +- ) +- +- if (${ALEMBIC_ILMBASE_IEXMATH_LIB}) +- SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_LIBS} ${ALEMBIC_ILMBASE_IEXMATH_LIB}) +- endif (${ALEMBIC_ILMBASE_IEXMATH_LIB}) +- ++ MESSAGE(STATUS "Found package IlmBase") ++ MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" ) ++ MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" ) ++ MESSAGE( STATUS "IEX LIB: ${ALEMBIC_ILMBASE_IEX_LIB}" ) ++ MESSAGE( STATUS "IEXMATH LIB: ${ALEMBIC_ILMBASE_IEXMATH_LIB}" ) ++ MESSAGE( STATUS "ILMTHREAD LIB: ${ALEMBIC_ILMBASE_ILMTHREAD_LIB}" ) ++ MESSAGE( STATUS "IMATH LIB: ${ALEMBIC_ILMBASE_IMATH_LIB}" ) + ELSE() + SET(ALEMBIC_ILMBASE_FOUND 0 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise") + ENDIF() +diff --git a/cmake/AlembicPyIlmBase.cmake b/cmake/AlembicPyIlmBase.cmake +index 249e084..3cc6253 100644 +--- a/cmake/AlembicPyIlmBase.cmake ++++ b/cmake/AlembicPyIlmBase.cmake +@@ -43,20 +43,19 @@ IF (Imath_FOUND) + SET(ALEMBIC_PYILMBASE_PYIMATH_LIB Imath::PyImath_Python${PYTHON_VERSION_MAJOR}_${PYTHON_VERSION_MINOR}) + MESSAGE(STATUS "Found package Imath using: ${ALEMBIC_PYILMBASE_PYIMATH_LIB}") + ELSE() +- FIND_PACKAGE(PyIlmBase) ++ MESSAGE(STATUS "Could not find Imath looking for PyIlmBase instead.") ++ FIND_PACKAGE(PyIlmBase CONFIG REQUIRED) ++ SET(PYILMBASE_FOUND True) + IF (PYILMBASE_FOUND) + SET(ALEMBIC_PYILMBASE_FOUND 1 CACHE STRING "Set to 1 if PyIlmBase is found, 0 otherwise") +- +- SET(ALEMBIC_PYILMBASE_LIBS +- ${ALEMBIC_PYILMBASE_PYIMATH_LIB} +- ) +- +- GET_FILENAME_COMPONENT(ALEMBIC_PYILMBASE_LIB_DIRECTORY +- ${ALEMBIC_PYILMBASE_PYIMATH_LIB} +- PATH +- ) +- ++ SET(ALEMBIC_PYILMBASE_PYIMATH_LIB PyIlmBase::PyImath_Python${PYTHON_VERSION_MAJOR}_${PYTHON_VERSION_MINOR}) ++ MESSAGE(STATUS "Found package PyIlmBase using: ${ALEMBIC_PYILMBASE_PYIMATH_LIB}") ++ GET_TARGET_PROPERTY(ALEMBIC_PYILMBASE_INCLUDE_DIRECTORY PyIlmBase::PyImath_Python${PYTHON_VERSION_MAJOR}_${PYTHON_VERSION_MINOR} INTERFACE_INCLUDE_DIRECTORIES) ++ SET(ALEMBIC_PYIMATH_MODULE_DIRECTORY "/usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages") ++ MESSAGE(STATUS "PYILMBASE INCLUDE PATH: ${ALEMBIC_PYILMBASE_INCLUDE_DIRECTORY}") ++ MESSAGE(STATUS "PYIMATH LIB: ${ALEMBIC_PYILMBASE_PYIMATH_LIB}") ++ MESSAGE(STATUS "PYIMATH MODULE: ${ALEMBIC_PYIMATH_MODULE_DIRECTORY}") + ELSE() + SET(ALEMBIC_PYILMBASE_FOUND 0 CACHE STRING "Set to 1 if PyIlmBase is found, 0 otherwise") + ENDIF() +-ENDIF() +\ No newline at end of file ++ENDIF() +-- +2.33.1 diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index b394f0d84a66..83c89aad0f1f 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -10,10 +10,10 @@ DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B a2c2c2e900e401a470208e8e5d00 DIST blender-2.93.0.tar.xz 42967016 BLAKE2B 1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3 SHA512 660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d DIST blender-2.93.1.tar.xz 42960100 BLAKE2B eda0a8c0414d1f7c89d21e34ba238b0cbe337ea755d6f10792e7c3bd5e15934184d3bd853ed636764776095ce1e3f081d63386b7c13fb7ac666580bf9eeb43c8 SHA512 b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1 DIST blender-2.93.2.tar.xz 43028440 BLAKE2B 02ffc5be190445c97e3cb14e4635969df7a7aaf0100ee5ba50f2d283b077ffebf1f139aec86034ed2df03d94290d5a8bb369f88c734db5103869ffa1d3f588a6 SHA512 5dac627b0e5f38af1f861d4fddb01f4ba1e992c704337c56e2ebbfdcbd62e6de83195e3541342603a1ae966e89a06ff98764c817e282401edd792857d577b989 -EBUILD blender-2.83.15-r1.ebuild 11660 BLAKE2B cc7fe1970a21f4c0d4c6a3cd5b4e1229cc80cd205e44edbdad137f4b7be173f5615014d1181a2f2f66fd86b6ba7e1a56bb627f645ca5a552a8d7327451a79054 SHA512 6471c4f4c8006e046eebdd8da3e2696053c6fdf380f7297f0724794cdb7212b8edd7cf16f945a619be4db2b74315f4556121c671efdaa1ca072b6e03feb4a5e5 +EBUILD blender-2.83.15-r1.ebuild 11659 BLAKE2B eed6e7e609c6e1184541bfeb8c318a40793f9c33983b158b107c4dfeec30a5b1c0da7049799d58d65bac01d4069e92f1c3e0c8c92be82b503067f7a3b763326e SHA512 a26bf43c05b89fe648ae96fdfb2f9a80bc1a67fca5a9deb13f06ffbc0376c4ab4a960d1ae176500dfda4c1148792e76568ecb4eddf39426f279b47f1fe9828c4 EBUILD blender-2.83.16-r1.ebuild 11660 BLAKE2B cc7fe1970a21f4c0d4c6a3cd5b4e1229cc80cd205e44edbdad137f4b7be173f5615014d1181a2f2f66fd86b6ba7e1a56bb627f645ca5a552a8d7327451a79054 SHA512 6471c4f4c8006e046eebdd8da3e2696053c6fdf380f7297f0724794cdb7212b8edd7cf16f945a619be4db2b74315f4556121c671efdaa1ca072b6e03feb4a5e5 EBUILD blender-2.83.17-r1.ebuild 11624 BLAKE2B 1a5ba28affb5519563638f641021a87377ee6d0fbff6d433243649452fe22265c751b34a74fc65ba30af7d886362f873a44b4d99a39d96dd612e82eed6865eb7 SHA512 a2741c7721020d3003cbac6df0e832efe083990f5dcb4227c7b586ce96bf149596ad07dd624df0d848f4657effbc82732721cff87c8fcdb39a1582c815d668b2 -EBUILD blender-2.93.0-r1.ebuild 11816 BLAKE2B 1044606914a9aa1f8bd00011addc31f71c3c9bed34e7b5215f4c15182fcfb895e248be3d55cbfc3d49ffea7a6212f38f232c410bf19c1634f3b1ef0c1392dd7a SHA512 b6ffc38f300260a66917c3507762e9830f6fbc0098e3f47c23e9d506ec201511aace83010c6213cc304c3643b63039ec54f3f7cbd9bc076383b0e3d6c1232419 +EBUILD blender-2.93.0-r1.ebuild 11815 BLAKE2B a7edc0c52fba0b9ebec6852aa84c264b28e4e2984ff47baf9d4117723d6a32634c976f4d80d0bd785a6d07b2fc08e6973d53f062505d3043eb7d56ca777acb73 SHA512 2eeae0099f41d11175502f000eb35a41f0351d358d9248f955168932cbfcfade48953a0c68456d3c75950d009f388ddebd8386368c274d3dc86ca820a1f09a7b EBUILD blender-2.93.1-r1.ebuild 11816 BLAKE2B 1044606914a9aa1f8bd00011addc31f71c3c9bed34e7b5215f4c15182fcfb895e248be3d55cbfc3d49ffea7a6212f38f232c410bf19c1634f3b1ef0c1392dd7a SHA512 b6ffc38f300260a66917c3507762e9830f6fbc0098e3f47c23e9d506ec201511aace83010c6213cc304c3643b63039ec54f3f7cbd9bc076383b0e3d6c1232419 EBUILD blender-2.93.2-r1.ebuild 11833 BLAKE2B 70435289cbde457dc6dd5cf6c8f0ecdaeecd5e44bb9afda6c0f36b75d9cadfb03dc72f2c31a013c34a0fdc7bdb5319a348dd6a9be282821af2479e62dda30a7f SHA512 6deb41bcf414687a2f2243eb24b8a4106c62df8b81c2286f820e95410cf7103b724d959eab43e927a871f77d2a9cfa682cffb41642a9c082f5179f9941baf779 EBUILD blender-9999.ebuild 11801 BLAKE2B 0ef6f8d4a4caa9119a943d10933bf1866d9c1a7e87fb2f3f3be19551d94ebcf620fcd7a2ed70116a74dcd051fed699cb211629d95ddf826def162596e7f32fb4 SHA512 b978ee878fbe8464d7c837e5d49d0ce8666f9900dc326114f20aabd30d7c797c66b07c250448d6c2b133d778dd26d6eeca210a510394d57b410c662a2f6c70de diff --git a/media-gfx/blender/blender-2.83.15-r1.ebuild b/media-gfx/blender/blender-2.83.15-r1.ebuild index 6f64aaa0992f..6175ce975261 100644 --- a/media-gfx/blender/blender-2.83.15-r1.ebuild +++ b/media-gfx/blender/blender-2.83.15-r1.ebuild @@ -17,7 +17,7 @@ else SRC_URI="https://download.blender.org/source/${P}.tar.xz" TEST_TARBALL_VERSION=2.83.1 SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi SLOT="${PV%.*}" diff --git a/media-gfx/blender/blender-2.93.0-r1.ebuild b/media-gfx/blender/blender-2.93.0-r1.ebuild index 1bba33bcef4b..4498bca57a46 100644 --- a/media-gfx/blender/blender-2.93.0-r1.ebuild +++ b/media-gfx/blender/blender-2.93.0-r1.ebuild @@ -17,7 +17,7 @@ else SRC_URI="https://download.blender.org/source/${P}.tar.xz" TEST_TARBALL_VERSION=2.93.0 SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )" - KEYWORDS="~amd64" + KEYWORDS="amd64" fi SLOT="${PV%.*}" diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index d117cbf6a254..cc4eace2a80a 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -2,5 +2,5 @@ AUX exiv2-0.27.4-gtest-1.11.patch 1489 BLAKE2B b20cee53dfd712389f553402779d839dc DIST exiv2-0.27.4-Source.tar.gz 32055837 BLAKE2B 9c31c08fafb38895fa7812a8c7a195335e80a6b9c15f7b5f3750f5ab30903c4c3bbf9aee5a7293a7d437d15a49a9cb7b45a3133cbb36ee62081efae0dd67b61a SHA512 f6798baafb36a54ba5bc65c2d28d4f4469e298582c90b417eb437b5dbda8e11963fb3314e8419717b3815ee8c3a68955cddc79e45351d9f2c165a0b73eb7b7be DIST exiv2-0.27.5-Source.tar.gz 32720608 BLAKE2B 803cb853fd049b28d309952c2332589a8544ff90c16fc1a588b6f1a2d4ae5e96da7ae746cf2247954ac54e155b84e0ad1f4f2d89f22d07e7bbd34038f0e292a5 SHA512 0f2d2dfbc976052a428dfeb597225d3ea3c725f584d05b99316bd4aa9cbf0ba5e1e37bcde71f9041975cf003b4fdb578c559adb144268d784bfd64494f451491 EBUILD exiv2-0.27.4-r2.ebuild 2800 BLAKE2B e62691994eee7eece7b24fc4c7e13654e237a9d4858ff166550c4c14a4b01285b303370c98fdade67cc63b2f3ab4d19be7da0a05d6122de4ce451633652d2504 SHA512 74f303ba879c4480dcdfa1eb8a6a9eb718e4b394e1c79d9ba544651e69d07bc3ce0e0fa159ba0e79ea6d9c863c50286293ec01bf51cacb1ba7575468c53e0dc1 -EBUILD exiv2-0.27.5-r1.ebuild 2807 BLAKE2B e906ffa4451a11874ebc1807b0a3a900c30ee244c099b9e956fd8aa99bfe635626149f7bfd637643c85ed06e233f4a9ac011f414f17c0eabd2cee326ce68c888 SHA512 2cc740dd5d6c6f4fed5b32802fd39c50cc82e3e37dc1e2a388dd7a4ae841a4817cdb2daac9ee96ccd81769c191bf248595cec0bb9dc90d46fd2e58620dc5085e +EBUILD exiv2-0.27.5-r1.ebuild 2807 BLAKE2B 6d81ba0674156b72ac76cf5f004549649ed97b4c0cad43deb2747bbf78ccad07b36d4f83bb403223e264aa9da31374415476072a55122ae5435d00ec1c38688d SHA512 363a0142a1b79dea4d07482e17ba0a59d6280084431a942e924721711c2907c27ad59b4c3396213ca0a296e80e74fa4a08399d661a1adce92bba0492841c3c8d MISC metadata.xml 555 BLAKE2B 307d753da1e5a2f09b4d95de756ad3f4ef905a1c2f9b2d7dc1cbc5e0e93718bb376dcbbd7f3abcee20697dce519ab795af7b71f8826ad7d55fa1cd13546dfbbc SHA512 4c504152172835df649036f2aa6f80a7ac12e2c034bc44e762c43bc39a72729e8c7a227ca59066c9b3ec3911b1c8f2a3633449cd611911f8f33a6c07f0a3420d diff --git a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild index 7639b13784f1..1551fcc75e29 100644 --- a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild +++ b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild @@ -13,7 +13,7 @@ else fi CMAKE_ECLASS=cmake -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake-multilib python-any-r1 DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest index eda4a7aefa62..829056f68315 100644 --- a/media-gfx/fbida/Manifest +++ b/media-gfx/fbida/Manifest @@ -5,6 +5,6 @@ AUX fbida-2.14-fno-common.patch 1148 BLAKE2B 108c21e732afaebe6183835732341b814b1 AUX ida-desktop.patch 384 BLAKE2B 627319b163e62af11acc2c0957254cc671145b9df22f27af8988e5f0bcdf383f7cf2ad4fa7b7c97acfbba3181081ee1c025c4b3c82e99bfd7fe4efe69edd59c0 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737 DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 -EBUILD fbida-2.14-r2.ebuild 2502 BLAKE2B 2793d432ba4ee989a163ead1571387cf17e42078c6fb05732504332785e3b6c039997deaf912fda3b882fb8d2539e185b9c12e6d20d0680c056297ffdb4558d2 SHA512 e30e1f5e4f8aae0265662dc52f2fac9ff1815b1a197a1937c44a4858177aa4bfa14efb35410d0dc0c076c7aecc4965b66f2da47b6dee114f33ebe78e2020941a +EBUILD fbida-2.14-r3.ebuild 2505 BLAKE2B df342967cf621c3abcbe9072a17f5601c251202b7d3394342c05aa5e1a22acfc2cb8ae2b78a5d76d52f0ded679b4314f5f4a9d70de12d1f0a11101ee056db0b0 SHA512 d2cd7776da95ca9c0ff719f1709b3a50be2b7170cb33f7380e6bd9cb8f981f53bc303867b2db4797cf887d0b139ea88cb4d2eae2dfec0dea1168ad68064cc33d EBUILD fbida-9999.ebuild 1349 BLAKE2B b011518d4f9816d0440b1bfd853fe97514e236fa20fb5eee942924b7e30751b981e0eb13a9e819627dff1af7b866b10c3712cbe0554d30e96e3bf5e7fddaa285 SHA512 10d5b89d83f020f3c14a9a68c622a96cd864ef8081b8163967938bacf592d1594ee8c09ff248515de246835a0a4e4fb78a768590f459bf53883011bede177ca0 MISC metadata.xml 396 BLAKE2B bb953a472b265979efd469fe16c70bfdcc358aa55393d71479b8105d442daf9dfa940eee8515748587ad3af5ff40684c70ba506468e70c59e30f917192b9d53c SHA512 9053097e148a3538aae6f3a4df83e6ed2580b37f35d82759d9dd72732b39774b92bd3c93e093272827903dc4f9019922749986cab8741f07eb957a921a67cd11 diff --git a/media-gfx/fbida/fbida-2.14-r2.ebuild b/media-gfx/fbida/fbida-2.14-r3.ebuild index 9c979c1b17e7..26920f5b7089 100644 --- a/media-gfx/fbida/fbida-2.14-r2.ebuild +++ b/media-gfx/fbida/fbida-2.14-r3.ebuild @@ -31,7 +31,7 @@ CDEPEND=" curl? ( net-misc/curl ) fbcon? ( app-text/poppler[cairo] - media-libs/mesa[X(+),gbm] + media-libs/mesa[X(+),gbm(+)] x11-libs/libdrm x11-libs/pixman ) diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index 550a6feedce5..7fd77f42c8b1 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -6,8 +6,9 @@ AUX freecad-0.19.2-0003-fix-test-when-built-without-GUI.patch 842 BLAKE2B d1eef0 AUX freecad-0.19.2-0006-add-boost-serialization-to-find_package.patch 1959 BLAKE2B 3863f4f311a4fba648d4503c6b3daecb87d233caea4ce7f22dff47f69435995ff422cd2ee97e8a491ddf85527b325d63543e041ccc91e5c844fede750c6764ef SHA512 b9af575349498393ee78e1c75247e736412d331fb872475c180c4828a6007f9a34ccd379eed8fe2551e53b88eee0b400202c63a1365df8b6069ce3b0727b2056 AUX freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch 1054 BLAKE2B d6a67b22390b64ed566c49af6117de2f34e0f57094a069ccae6cd15da5fa3a53a4cd71d94bd65a201c60042893da713a2d397890c7b072b197e101697cd388fd SHA512 beecd51a4b59890cd162eb76b726bd1e82a32da387ed67d886293930175deaf014445afd4db93e262daa06ced5b6c267218e4d777bd32c940fbc8b057b077fa1 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088 +AUX freecad-9999-Add-memory-header-for-std-shared_ptr.patch 687 BLAKE2B e1b1273b5c98f52539d2788469f49e1b5c57ea06ef1b136e82ddd4655f0a585dd5eee0104dfa1539aeaf1c82b673d681337482b4c9b7ae4d4d9a951637f1f16e SHA512 a15b0b2c49057de39a8efe45ee3460681611b6acf0b53e77ed278af58a0c97f296ca6e5ac1e2efdab39d77d06461c71bde9cf146784b094f2941caf1b0a76914 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2 SHA512 66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72 -EBUILD freecad-0.19.2-r3.ebuild 12318 BLAKE2B 42007a647c90b2c2f2584e663dbb2dfe1a7378067e03fadd42bd5f2fa7196e3669f1dd6a061e5379b279af3162da6c5cf8ea5cdb597341598d9339c4fd3b9991 SHA512 0a0eaf83098b180772d23468fc494838b6e4f8360bbddacbd6f4c86b3b1d414a1f10918d8e9c17d37478e1a2710092c10e58d7143ad0a1ef8b55af026a833b2b -EBUILD freecad-9999.ebuild 12072 BLAKE2B 72c3a32d41b24f8a074f9c839cec133c964e428588c19ce02a60b079caee2534b674438e96f44b1c8754709b70befc52af48cde3e2b982b19e421cf7687c7fd2 SHA512 494ae6bde08c2092831f4d65dfe979afb80bd806af63fb3c56c326a2bd3998918d4183c82d5bba5c065ee652086ca3d800c273aebad413a100a161afa923995f +EBUILD freecad-0.19.2-r4.ebuild 12191 BLAKE2B 5b38525d8621a2b95b7f1ab150d2cc21eb26e30aa3c467a869a8cf027ac47c96008e94b3287786c8e3a529d78fad627700135ee82aff948e8dcc68b038e0c66a SHA512 8afe20234ccc6f6b7dc55aa7f0044fbd6ccda1fee6d031c9ff8ca750d87ad93ec038953265775bd305a1cf5c36af4dc3043c66ba3f6765e588d113091322b9d1 +EBUILD freecad-9999.ebuild 11967 BLAKE2B 43ca123f606f45df6026725b4a220aab723631feb95e485902963b4044704d76589f11e4e374a9bd9d8e31fdff58f3f70cb6ecaeb0329940bb2ee200e19af6c9 SHA512 24bde5e135ff1966171964f5ffc9ea8a31a978ad79dece2a33f3099a2899fb52fc741fc9938471f4f155532eb08a29681f4d842ec1b75b14d69ff487b796d91b MISC metadata.xml 3268 BLAKE2B 4e99f8237c96f96500ec15a0e175684f445c9a68e1080f6f61538ae4e99cb2afccc14d50c626c44764ea4362ed82cc2ccf74f8ae53d713d70b21860eeb39650d SHA512 fbc87f4a401c33de8033b54213026631a9f956918cc256eb9a10cec88b316f71fd98959c79f58acc3d4a75d28117097ea0cc4ee33f333923d4387e9d3af43bb5 diff --git a/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch b/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch new file mode 100644 index 000000000000..81a8f22d8937 --- /dev/null +++ b/media-gfx/freecad/files/freecad-9999-Add-memory-header-for-std-shared_ptr.patch @@ -0,0 +1,31 @@ +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sat, 16 Oct 2021 17:02:19 +0200 +Subject: [PATCH] Add memory header for std::shared_ptr + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + src/App/Metadata.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/App/Metadata.h b/src/App/Metadata.h +index de8be3ea8e..2c5fd8f417 100644 +--- a/src/App/Metadata.h ++++ b/src/App/Metadata.h +@@ -30,6 +30,7 @@ + #include <string> + #include <vector> + #include <map> ++#include <memory> + + #include <xercesc/dom/DOM.hpp> + #include <xercesc/parsers/XercesDOMParser.hpp> +@@ -296,4 +297,4 @@ namespace App { + + } + +-#endif +\ No newline at end of file ++#endif +-- +2.33.1 + diff --git a/media-gfx/freecad/freecad-0.19.2-r3.ebuild b/media-gfx/freecad/freecad-0.19.2-r4.ebuild index 70fb0270fb59..24dc6a703399 100644 --- a/media-gfx/freecad/freecad-0.19.2-r3.ebuild +++ b/media-gfx/freecad/freecad-0.19.2-r4.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8,9} ) -inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg +inherit check-reqs cmake optfeature python-single-r1 xdg DESCRIPTION="QT based Computer Aided Design application" HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD" @@ -174,7 +174,7 @@ src_configure() { -DBUILD_COMPLETE=OFF # deprecated -DBUILD_DRAFT=ON -DBUILD_DRAWING=ON - -DBUILD_ENABLE_CXX_STD:STRING="C++14" # needed for >=boost-1.75.0 + -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for >=boost-1.77.0 -DBUILD_FEM=$(usex fem) -DBUILD_FEM_NETGEN=OFF -DBUILD_FLAT_MESH=ON @@ -230,13 +230,14 @@ src_configure() { -DFREECAD_USE_QT_FILEDIALOG=ON -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" - # Use the version of shiboken2 that matches the selected python version - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - # install python modules to site-packages' dir. True only for the main package, # sub-packages will still be installed inside /usr/lib64/freecad -DINSTALL_TO_SITEPACKAGES=ON + # Use the version of shiboken2 that matches the selected python version + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPython3_EXECUTABLE=${PYTHON} + -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo ) @@ -292,11 +293,13 @@ src_test() { src_install() { cmake_src_install + dobin src/Tools/freecad-thumbnailer + if ! use headless; then - dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad + dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources" fi - dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd + dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ # compile main package in python site-packages as well @@ -329,14 +332,11 @@ pkg_postinst() { einfo "support. Some of them are available in Gentoo. Take a look at" einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD" optfeature_header "Computational utilities" - optfeature "Numerical computations with Python" dev-python/numpy optfeature "BLAS library" sci-libs/openblas optfeature "Statistical computation with Python" dev-python/pandas - optfeature "Use Point Clouds" sci-libs/pcl optfeature "Use scientific computation with Python" dev-python/scipy optfeature "Use symbolic math with Python" dev-python/sympy optfeature_header "Imaging, Plotting and Rendering utilities" - optfeature "Function plotting with Python" dev-python/matplotlib optfeature "Dependency graphs" media-gfx/graphviz optfeature "PBR Rendering" media-gfx/povray optfeature_header "Import / Export" diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 8c0caca6adc6..cef63f28477e 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8,9} ) -inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg +inherit check-reqs cmake optfeature python-single-r1 xdg DESCRIPTION="QT based Computer Aided Design application" HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD" @@ -81,7 +81,7 @@ RDEPEND=" ) fem? ( sci-libs/vtk:=[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] ) openscad? ( media-gfx/openscad ) - pcl? ( ~sci-libs/pcl-${PV}:=[opengl,openni2(+),qt5(+),vtk(+)] ) + pcl? ( sci-libs/pcl:=[opengl,openni2(+),qt5(+),vtk(+)] ) $(python_gen_cond_dep ' dev-libs/boost:=[python,threads(+),${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] @@ -120,6 +120,7 @@ REQUIRED_USE=" PATCHES=( "${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch "${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch + "${FILESDIR}"/${P}-Add-memory-header-for-std-shared_ptr.patch ) DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md ) @@ -168,7 +169,7 @@ src_configure() { -DBUILD_COMPLETE=OFF # deprecated -DBUILD_DRAFT=ON -DBUILD_DRAWING=ON - -DBUILD_ENABLE_CXX_STD:STRING="C++14" # needed for >=boost-1.75.0 + -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for current git master -DBUILD_FEM=$(usex fem) -DBUILD_FEM_NETGEN=OFF -DBUILD_FLAT_MESH=ON @@ -224,14 +225,14 @@ src_configure() { -DFREECAD_USE_QT_FILEDIALOG=ON -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" - # Use the version of shiboken2 that matches the selected python version - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - # install python modules to site-packages' dir. True only for the main package, # sub-packages will still be installed inside /usr/lib64/freecad -DINSTALL_TO_SITEPACKAGES=ON + # Use the version of shiboken2 that matches the selected python version + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" -DPython3_EXECUTABLE=${PYTHON} + -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo ) @@ -289,11 +290,13 @@ src_test() { src_install() { cmake_src_install + dobin src/Tools/freecad-thumbnailer + if ! use headless; then - dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad + dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources" fi - dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd + dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ # compile main package in python site-packages as well @@ -326,14 +329,11 @@ pkg_postinst() { einfo "support. Some of them are available in Gentoo. Take a look at" einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD" optfeature_header "Computational utilities" - optfeature "numerical computations with Python" dev-python/numpy optfeature "BLAS library" sci-libs/openblas optfeature "statistical computation with Python" dev-python/pandas - optfeature "usage of Point Clouds" sci-libs/pcl optfeature "scientific computation with Python" dev-python/scipy optfeature "symbolic math with Python" dev-python/sympy optfeature_header "Imaging, Plotting and Rendering utilities" - optfeature "function plotting with Python" dev-python/matplotlib optfeature "dependency graphs" media-gfx/graphviz optfeature "PBR Rendering" media-gfx/povray optfeature_header "Import / Export" diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest index 76b24ed536c1..c8af8d4aa615 100644 --- a/media-gfx/gscan2pdf/Manifest +++ b/media-gfx/gscan2pdf/Manifest @@ -1,5 +1,7 @@ DIST gscan2pdf-2.12.2.tar.xz 503148 BLAKE2B ed4729207f8b6ae50bc594cc2ad124c6a5e6e3eba83a36649a60c0293687678d2dce2d8e683d50c18cc28ebce8da771e441e6b454cd1d857cd6c776594a641d9 SHA512 7861b22ec3c3011ea6ddb92ccc46661ceda75e1a2c56df2695115a26e7b747de70b97f70ba54751780310930485a8026f2adf4878a05ad2d95328d29f2e454e0 +DIST gscan2pdf-2.12.3.tar.xz 504168 BLAKE2B f3c8b27903db733163114c5c8ea93b10969791fbe04fb2111d1e090e8c627127150cd418eed693d3c61d18e8e6ecf08ddaeebc2ee5b5bc7b49dd633391480f12 SHA512 bb7c9bfd485ae24bbd56a5ca98682455e07fa44d02784a0f3b4b2d3995d704beb0ad146297e92e838dddf8bbdbc37b391e88bf50c98efcd3dfe6b10e761a0693 DIST gscan2pdf-2.9.1.tar.xz 484740 BLAKE2B e75ac6a5296ba2f89838ae9c95dc0ceb592ea8ffaf8d89a0635043e07fedbdcf97df26ac810556da7d0e0306eb7aaff76dc18162c6a5f89cb1953bd623a594a3 SHA512 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237 EBUILD gscan2pdf-2.12.2.ebuild 2972 BLAKE2B 77d46e0238475bd58fc353feb4f0cb664551babb2635fd993efdefc427258bfbad725d343b38d632ccc8489fb31df493a8da9600ae43a33152bf190fa668af2c SHA512 27231c05ae155aab037a1c95969a0205fbc28e95948fc78fa53405bb9449ad8970fdd61377412c51ba03dd751d7da99c67cea0fb5b6940c53b0ea6ab60dbd641 +EBUILD gscan2pdf-2.12.3.ebuild 2981 BLAKE2B 72ddfd255baa1aedfee6a3a51faf8d71d5732f47cc3ec55a3a4c6a2f4688c332064377c9935e097b649ce4326a2dc60c96836af3abf2412590a5ee76318d759a SHA512 2726e25fed0a753a083462540e9e69a221de079fe28adf5bb679ade98d007a34c9766991fdf29a750e6ed933dcbcd0d306d82a98c55caf1c10460ac0b1b69f20 EBUILD gscan2pdf-2.9.1.ebuild 2801 BLAKE2B 5ec319fceae00a20a15caae9cf019691523680bfa734bae36c8cac7117455438beed4c56fc79a570e87b2d4860b12a62c0fe6fdb49e1e26b24c7a58b493cfa91 SHA512 9f7b98317da72d4abeb6cd64719ddb9de39fa5505d955c6543b7ab76ba0db18c0a7e20261c6c0b7e025272d336c98126bc87c2a32f84a811d6d11649a7dd0aec MISC metadata.xml 470 BLAKE2B d9a9ad2f443b0bca02e6b8e91c96f22430543ee82fe8a1174739d4ad59225f73b975d31316fecd4dde6f26002ef6ba9fd39bf5d4adfd2bc82540d14e90d623a6 SHA512 ecd2fe9215c3a65760b8c101989772a73a7e9975dc38a1b11b0334cf6e1d001ccebfca1bc6d7631eb3b3e3e03d1736205563b0c836a2aea026fdfe552d72cbe0 diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.12.3.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.12.3.ebuild new file mode 100644 index 000000000000..c8c914513d5a --- /dev/null +++ b/media-gfx/gscan2pdf/gscan2pdf-2.12.3.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DIST_TEST="do" + +inherit optfeature perl-module virtualx xdg-utils + +DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus" +HOMEPAGE="http://gscan2pdf.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-perl/Config-General + dev-perl/Data-UUID + dev-perl/Date-Calc + dev-perl/Filesys-Df + dev-perl/glib-perl + dev-perl/GooCanvas2 + dev-perl/Gtk3 + >=dev-perl/Gtk3-ImageView-10.0.0 + dev-perl/Gtk3-SimpleList + dev-perl/HTML-Parser + dev-perl/Image-Sane + dev-perl/List-MoreUtils + dev-perl/Locale-Codes + dev-perl/Locale-gettext + dev-perl/Log-Log4perl + >=dev-perl/PDF-Builder-3.23.0 + dev-perl/Proc-ProcessTable + dev-perl/Readonly + dev-perl/Set-IntSpan + dev-perl/Try-Tiny + virtual/perl-Archive-Tar + virtual/perl-Carp + virtual/perl-Data-Dumper + virtual/perl-File-Temp + virtual/perl-Getopt-Long + virtual/perl-threads + virtual/perl-threads-shared + media-gfx/imagemagick[png,tiff,perl] + media-gfx/sane-backends + media-libs/tiff" + +BDEPEND=" + test? ( + ${RDEPEND} + dev-perl/IPC-System-Simple + dev-perl/Sub-Override + media-libs/fontconfig + + app-text/djvu[jpeg,tiff] + app-text/poppler[utils] + app-text/tesseract[-opencl,osd(+),png,tiff] + app-text/unpaper + media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript] + media-gfx/sane-backends[sane_backends_test] + media-gfx/sane-frontends + )" + +PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod}.t ) + +mydoc="History" + +src_test() { + einfo "Using:" + einfo " $(best_version app-text/djvu)" + einfo " $(best_version app-text/poppler)" + einfo " $(best_version app-text/tesseract)" + einfo " $(best_version dev-perl/Gtk3-ImageView)" + einfo " $(best_version dev-perl/Image-Sane)" + einfo " $(best_version dev-perl/PDF-Builder)" + einfo " $(best_version media-gfx/imagemagick)" + einfo " $(best_version media-gfx/sane-backends)" + einfo " $(best_version media-libs/tiff)" + + local confdir="${HOME}/.config/ImageMagick" + mkdir -p "${confdir}" || die + cat > "${confdir}/policy.xml" <<-EOT || die + <policymap> + <policy domain="coder" rights="read|write" pattern="PDF" /> + <policy domain="coder" rights="read" pattern="PS" /> + </policymap> + EOT + NO_AT_BRIDGE=1 virtx perl-module_src_test +} + +pkg_postinst() { + xdg_desktop_database_update + + optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]" + optfeature "encrypting PDFs" app-text/pdftk + optfeature "creating PostScript files from PDFs" app-text/poppler[utils] + optfeature "adding to an existing PDF" app-text/poppler[utils] + optfeature "Optical Character Recognition" app-text/tesseract[tiff] + optfeature "scan post-processing" app-text/unpaper + optfeature "automatic document feeder support" media-gfx/sane-frontends + optfeature "sending PDFs as email attachments" x11-misc/xdg-utils +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 567c61451ef7..d324a6941717 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -3,13 +3,17 @@ AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3ab DIST ImageMagick-6.9.12-20.tar.xz 9174816 BLAKE2B ccdb4775867224d08871b7147fa20e6b09305f6501a07de85ad53b862c47921c5b6b39eaf62fa86258c1a6fea1abe417817b4a4887a981a6f5a786636fa57946 SHA512 2ba849ef7212b0255f1db6509b718f7dd3825d16e45ea115a77ecf6b8afc41cb823ba0ddddc124aa0afe5605f1aa5e2865daa00da88568bf5874225de6620fe3 DIST ImageMagick-6.9.12-21.tar.xz 9173096 BLAKE2B 0d8e0a414f2026539be16873ada2d097ce11beb0becf1e132eb6f7d9e4a69063a46eef4834c55268f5af5abbb87e17bb79c5f1182291d144e5155e5f68393070 SHA512 1ec038d555f0e72b79f830602047019819e36ffeb9053317685ac13a84e83d8d694980ff7203139e222568adab812d7f7b113793031e87cafb94aa75737b0b5d DIST ImageMagick-6.9.12-25.tar.xz 9177972 BLAKE2B d115f6722bdb4122d022182849b7fb40f13320f82909e00675806621511356651f3e9c3f1189fde69276509c0e7916a5127e76b9294da591b8dd963bc8fceec3 SHA512 34b25bb9c46960ffd4258d7476d9111fb2334819dd7bb68e08749c6ac483e0403bd36f8da0ab5ea0fc5838a3cffbd9622649ab95272f9fb56a0092fe0257b8ff +DIST ImageMagick-6.9.12-28.tar.xz 9181044 BLAKE2B 2efc03da9e4c53b82479badfcc9a25f05e2d9766031807500a6bb39cba2a800c39a93a16864ca9af3a0b33d0c1c95cb2f33264c7e00149204ca742673c3d07ff SHA512 ec96fca6b385379873ead007b011d87fb3939ed4e3631d2a9401f1467db59d1d1ced072fd4fefe1577d04302a1060dbc324631b420f41a99bf32465b540ec979 DIST ImageMagick-7.1.0-10.tar.xz 10304648 BLAKE2B 8688c52387c185fd190e98d84d9c285191b9a827058c8e1200a7676399e43b8950a2f8f1cefc99dcfbf967ed3f803d67f2a8677a48932fa7c44ebe5c01ac6993 SHA512 72ef704460473af9c8fbd0d49cb264fc23eaaf24ce3e319916e7f23ad715d45f44f4ecebc02b9edba55a584b59c407f0a777fa9add2e49f7c69341bcac169c4b +DIST ImageMagick-7.1.0-13.tar.xz 10311564 BLAKE2B 7cb3e58f548cbe0b9e1239df47ff4f42af2cd0b6ff4c417a62515ff9bd434ecabed2cc7f7cb7cf8880f20af3f6d7de33d7368f146b9ac7668149959966a463d8 SHA512 dac1fc229599a63703fc3aa1378de313dc94dfbfa71913dc408ef65c88ef33820b5ddab4c9a064a86cc35c0abb0136f0adb626bff9e227b52ed0d90993688044 DIST ImageMagick-7.1.0-5.tar.xz 10308228 BLAKE2B c65f0bb04133a6390770cb06ed4a102fef58647b6d03c09ad840a0b0abf18a5875c244c5d8fb10492f5ccc62d976c170659ead93ad7b8a8178c88fe3778dfa20 SHA512 1fc66c57e4dbe01c2730508c42cd8a8e94be087751b3ad460318e1d4a7aa2c1af95d22b2f432037590af5e7f4a8e3cdeb276278423ed30d485267a907c7006d6 DIST ImageMagick-7.1.0-6.tar.xz 10316740 BLAKE2B a0b6591300d48b648004c9701d2cb21afbb652760230384b4711a8d741875ba28d31b0c1b468f93c33338278a01aeef94eed0dbe14a3670ae7207704bb0eda1a SHA512 951541ad24095a2ac03fa26bfb38363795d7e86f1cae90ede9ab5991b28090dd05cc6c5bec62a0c3d664fa5191021fa01b760cfa7ccd94c80d93f24484afa5d3 EBUILD imagemagick-6.9.12.20.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12 EBUILD imagemagick-6.9.12.21.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20 EBUILD imagemagick-6.9.12.25.ebuild 7187 BLAKE2B 0e3e44083e03f09b94d07e4f8012a62ee4b28835855507daf4375397e12b0f3369705df7b3f83048b0307a6849a8451bec62f066dc7449f20950524d3237f8f6 SHA512 2a8cda81018fb6f45b07026efdcf6e64f04ef82c1d11c56fb5948bab6cfc5f1ef46e3a53f9aadb409ab22524706439631ad581d6f023f19271f6f0e78e813325 +EBUILD imagemagick-6.9.12.28.ebuild 7187 BLAKE2B 0e3e44083e03f09b94d07e4f8012a62ee4b28835855507daf4375397e12b0f3369705df7b3f83048b0307a6849a8451bec62f066dc7449f20950524d3237f8f6 SHA512 2a8cda81018fb6f45b07026efdcf6e64f04ef82c1d11c56fb5948bab6cfc5f1ef46e3a53f9aadb409ab22524706439631ad581d6f023f19271f6f0e78e813325 EBUILD imagemagick-7.1.0.10.ebuild 7401 BLAKE2B 177c88bf09323bc3898bc99c79051f8c73450cc19e063f04f91b079172c22e02d845b94084afd5fd26143aa7f95f670bb7319b80a27dadf83a3650607dc45468 SHA512 4c087fd762f72d88baa8bf8564b3245bd21ca4cf99d009b3537bccba1638ec79623c27cabeec8570f8058e16057ed66b260889db653a949d78c36970796381f0 +EBUILD imagemagick-7.1.0.13.ebuild 7401 BLAKE2B 177c88bf09323bc3898bc99c79051f8c73450cc19e063f04f91b079172c22e02d845b94084afd5fd26143aa7f95f670bb7319b80a27dadf83a3650607dc45468 SHA512 4c087fd762f72d88baa8bf8564b3245bd21ca4cf99d009b3537bccba1638ec79623c27cabeec8570f8058e16057ed66b260889db653a949d78c36970796381f0 EBUILD imagemagick-7.1.0.5.ebuild 7396 BLAKE2B e824e8d1c9b1b1561bcfe59e6bfa2fd6770508453c1a4246b88cdd671470f35a5576d0c0a76803501d76bb31768d87c5066c92f1f9f786ed6d01e77e5792f96e SHA512 bdfeb146f22e581bcab707407229a31debf6623b7861141d8fec50cea8d134232fe83066a9898a2136553edf946bf727d7a8e5724a7f979c0bac39868356b191 EBUILD imagemagick-7.1.0.6.ebuild 7404 BLAKE2B 2a92a400e6b41a28bd9ff356ad4a40656c61df367ec298c685b663a22463cbc090fb368f12aae33a75dda7ade766464822d0293bc302ad11db790b7b3c7a4a8d SHA512 758697ee60c9d674ea02c32d1e997466809f515bd7ea361aaa5ef77528b9705eccb16d906cc548c0df9a3d0054e8a7615be665797cb6d9cb3eab6d06510c5dcf EBUILD imagemagick-9999.ebuild 7401 BLAKE2B 177c88bf09323bc3898bc99c79051f8c73450cc19e063f04f91b079172c22e02d845b94084afd5fd26143aa7f95f670bb7319b80a27dadf83a3650607dc45468 SHA512 4c087fd762f72d88baa8bf8564b3245bd21ca4cf99d009b3537bccba1638ec79623c27cabeec8570f8058e16057ed66b260889db653a949d78c36970796381f0 diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild new file mode 100644 index 000000000000..2475294ebb28 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-6.9.12.28.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit flag-o-matic libtool perl-functions toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://www.imagemagick.org/" + +LICENSE="imagemagick" +SLOT="0/6.9.11-60" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" + +REQUIRED_USE="corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts )" + +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" + +RDEPEND=" + dev-libs/libltdl:0 + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:=[x265] ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:0= ) + png? ( media-libs/libpng:0= ) + postscript? ( app-text/ghostscript-gpl ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:0= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:0= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2:= ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib:= )" + +DEPEND="${RDEPEND} + !media-gfx/graphicsmagick[imagemagick] + X? ( x11-base/xorg-proto )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + # Apply hardening #664236 + cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die + sed -i -e '/^<policymap>$/ { + r policy-hardening.snippet + d + }' \ + config/policy.xml || \ + die "Failed to apply hardening of policy.xml" + einfo "policy.xml hardened" + + elibtoolize # for Darwin modules + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + local openmp=disable + use openmp && { tc-has-openmp && openmp=enable; } + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --${openmp}-openmp + --with-gcc-arch=no-automagic + ) + CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in $HOME for test suite #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt ChangeLog + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +} + +pkg_postinst() { + local _show_policy_xml_notice= + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + _show_policy_xml_notice=yes + else + local v + for v in ${REPLACING_VERSIONS}; do + if ! ver_test "${v}" -gt "6.9.10.10-r2"; then + # This is an upgrade + _show_policy_xml_notice=yes + + # Show this elog only once + break + fi + done + fi + + if [[ -n "${_show_policy_xml_notice}" ]]; then + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" + elog "which will prevent the usage of the following coders by default:" + elog "" + elog " - PS" + elog " - PS2" + elog " - PS3" + elog " - EPS" + elog " - PDF" + elog " - XPS" + fi +} diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild new file mode 100644 index 000000000000..d47b238fb192 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-7.1.0.13.ebuild @@ -0,0 +1,269 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit flag-o-matic libtool perl-functions toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://www.imagemagick.org/" + +LICENSE="imagemagick" +SLOT="0/7.1.0-0" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" + +REQUIRED_USE="corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts )" + +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" + +RDEPEND=" + dev-libs/libltdl:0 + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:=[x265] ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:0= ) + png? ( media-libs/libpng:0= ) + postscript? ( app-text/ghostscript-gpl ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:0= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:0= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2:= ) + lzma? ( app-arch/xz-utils ) + zip? ( dev-libs/libzip:= ) + zlib? ( sys-libs/zlib:= )" + +DEPEND="${RDEPEND} + !media-gfx/graphicsmagick[imagemagick] + X? ( x11-base/xorg-proto )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + # Apply hardening #664236 + cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die + sed -i -e '/^<policymap>$/ { + r policy-hardening.snippet + d + }' \ + config/policy.xml || \ + die "Failed to apply hardening of policy.xml" + einfo "policy.xml hardened" + + elibtoolize # for Darwin modules + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + local openmp=disable + use openmp && { tc-has-openmp && openmp=enable; } + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zip) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + --without-jxl + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --${openmp}-openmp + --with-gcc-arch=no-automagic + ) + CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in $HOME for test suite #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + if [[ ${PV} == "9999" ]] ; then + IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild + else + IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + fi + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt ChangeLog + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +} + +pkg_postinst() { + local _show_policy_xml_notice= + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + _show_policy_xml_notice=yes + else + local v + for v in ${REPLACING_VERSIONS}; do + if ! ver_test "${v}" -gt "7.0.8.10-r2"; then + # This is an upgrade + _show_policy_xml_notice=yes + + # Show this elog only once + break + fi + done + fi + + if [[ -n "${_show_policy_xml_notice}" ]]; then + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" + elog "which will prevent the usage of the following coders by default:" + elog "" + elog " - PS" + elog " - PS2" + elog " - PS3" + elog " - EPS" + elog " - PDF" + elog " - XPS" + fi +} diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index ee2a16ea5ac4..15683e6124f1 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -1,10 +1,17 @@ AUX openvdb-7.1.0-0001-Fix-multilib-header-source.patch 2825 BLAKE2B 089bc79bbb8bd4544889c65d8bf064bf95869990778cb66595a19be402db85b569acb836b5918c902e6f6a10011a1480ef89e03636f951e30e5833eb667478cb SHA512 6968a60737b08bbec96beb8ec3796b7d99a713a798e37d8cd4015eacce7e7197b5befcd6721b310a4cdcfaca1781ab0cd7165958b14b487796a4159e9e214499 AUX openvdb-7.1.0-0002-Fix-doc-install-dir.patch 1014 BLAKE2B 380c26e69da18479266201fd1233d19f3c39b13ee67d11cadca5bba900c470218a7563590f12a400a1f954155bfdfacc00862511ef05f3a61a54679924c57cae SHA512 21d4abf1cae31dfa8e59b6648a7c40f6f5f9572bdb87e6410144b427244ede488e059bf572344efc4e4cea91e7fb59b56364a7df6041f717db759002d09e8ee7 +AUX openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch 836 BLAKE2B e04fe9f6e3a1a44a7b4274dd328f88c0dffe14493bad68c4e30807f44330a4328776eefe600e2f9b6565ee363f1db4228f36da995e18556e678672925f5f89ec SHA512 0599bc38a4e74ecede3d174ecee0f207dd8edd2a6f99f68fdb46488505ff093e9e1a6842fe58e94e5bee93f7c79a72bd043b3d7ca070b26895919b57a808a784 AUX openvdb-8.0.1-glfw-libdir.patch 495 BLAKE2B 6a47bd300b3cd2186be8b749abd1e1fcbcb50e24d1965a783d8f2cec07ef8737ee6287018f40fed4ea4520c2c6be20b5936bdf0bd95ab07f277e728b6fccbb07 SHA512 29cd8d4dfd24f262c8e03a4d55502839a99bdac8eae1738b99cd667292034ea5cddec60303daf3a0c0d76a68021b3b4d6fc2f0e5be108d94243f5c11308c194d +AUX openvdb-8.1.0-glfw-libdir.patch 742 BLAKE2B 2ab1de05da49480584e373dba0f4a8504f6116ee22c46247f72802a9d412df43603b79b9620d0be2efe9745c30d962d1404325f3b09cae4ac9fe1e3bc0052d42 SHA512 beebad98890dc05c7c34594155fcdb163353b3a92c1571c7b017481b1fa167735ec54df019ed5d154e7d0973d3c1d9fd779508d2360f3306eefa6e45d3240d0b +AUX openvdb-9.0.0-numpy.patch 6113 BLAKE2B 1440366ffcc9f62e8c6974aa82b290053c359986789f019e05f718b44c4af60112328283367e92b06cd2a36d3b6ddc6c9cc6fe2cd6360cf43a1f9a33cbcaebe9 SHA512 a8568effcfa0bb10ad23b574a727311f10add7cdb046d94f40842f9a41e8127c8571ae494950730d898c78900917402a793d1433a44eb4eb322edd3ff97133d6 DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7 DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B e65bd4710ff65e20570013399d1e71a32e8f80c5e3b5527fc17d23c7f86ead7e04483cf7ba5266f26343604677d3a0dcafc01474baf7ef09b98f1f41a66119a2 SHA512 6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2 -EBUILD openvdb-7.0.0-r3.ebuild 2921 BLAKE2B 8dda84383521b9c30b6822f7a0d2e116268a2d9ca847896efc3de7129a1d8a01d0c6151b412fbe9f6c53467a0864017f6102244932337ff94fb03afc33646a9d SHA512 5c20bbcfbede429d0c8d0867300dafec3f7cb6daed7701a658721f6e00f8e50c6891e8e47d75b57279701a18c29e2df1e06e948a2e79fa4ad2ef8798ffee2642 -EBUILD openvdb-7.1.0-r3.ebuild 2851 BLAKE2B 785765666df7bd40dbf5f0de169b0454c22bb77d0fec317f001dd765e46342e95eb8b1fe2c134a7207d0a78795d2e60141bac3f03df03fe0677bb567dadeaa07 SHA512 bb72634c7b42751ccb8083b3a63435032329adf2139c324abb2029ff3fe98546d20200c9000d111781878ca751da28ff3413a43fbf22820e2d401c9c41c5f12d -EBUILD openvdb-8.0.1-r2.ebuild 2878 BLAKE2B 51105fa0f2eb3d1e48dcf3d902d6dd69b9a580bf8e4f7e82b570681e309a50b1a2ca3309b113ef03ca24d5c1da6586fc37750267596f4f1eb4806fb6977c676e SHA512 99ceaa5ab2f9125a945401bd8657b32854807cd56b2bd278b59f3f22922f0eb6a7f10fd8fdff2939e623c4615125ec770c27c7d25279e06c791cb16ca9dda377 -MISC metadata.xml 1549 BLAKE2B e8d5f0ca6156371ff45898efcb217d008db1cb9dd041d818da55f2668af2cd53560d9b5c2ccaf1aed4da88f567294fe52940999d658db67a7372161cadb781a6 SHA512 2ba75c98a8cbf0212d4d24f85f8c3c5f8ee3a98be7dc2749acba4c37de14b489d88276608424290406f3a0bf31fc1298b7844320f6ac607b9f033e0f6ad14d46 +DIST openvdb-8.1.0.tar.gz 2619432 BLAKE2B ba06e8dc24876da0ed1a2b5560e8793ad1e42b45b2018734c98c9b8f1d43bdb4aa098243a68de90efb18cb0454a9ea2a59c87f411d2c6492c5bce95dc047a6f0 SHA512 081ccedb122ff9bd73e0cd7ff083ad0ff0165e0cf6305187edcbe90ff12f01ec085c91ad5c52c53596035e0c2afd5b8801e6c00374b0fc4b0cc111f5c7f37eb5 +DIST openvdb-9.0.0.tar.gz 2945040 BLAKE2B c47a8088ba30d3cbecff04dbfd2d48b39a254e54149d8692c3a7157a99a1c555ef9747b77aeab6f8709b61c348d496765f2cfcbb0975e21f533072871f3fa422 SHA512 1410b7b04b03fb09d6775ebe7b95e7c0a484d5f29c84203530ed30ccb7c061470be1abb93189010617342e57f3fecdd66a115c6d222024e68e2384a7fb196194 +EBUILD openvdb-7.0.0-r4.ebuild 2923 BLAKE2B 789ef9fe451697a42848047a72a7dec59ba37959fd92573ff824d92f7768674a231ba4d4e88a81eb3c332deb730fc0fe4c38c383c482f151babb1091752cf062 SHA512 2e268d1892ed9b3c8eaf89d27a7c559327756f26c8f5830d113b404c8c6100536626371b32eb4844da3a7e85c0d9e110cd92dc5dc84957d16c139649fe02f42a +EBUILD openvdb-7.1.0-r5.ebuild 2936 BLAKE2B 08764ebb2337dc453144526e5beb5c022eb2bfd2a68f752ccfb847057c53795ea3bd157f1527f6612bfbdc6faf927304f6dcd460901d4aff302c77a4613a24a6 SHA512 bc9bfbbb770fbafe7611d2df5d432db2d738c1f2118e922c921967328191954ed631a590411350ab15f50924b0b2f00d1501969e77a7c89e0f147e163e65d76c +EBUILD openvdb-8.0.1-r4.ebuild 3034 BLAKE2B ef40d732555b406d4e81c7ad4500033073c10f5b8d81a0c7032d0c02369879fcadbfcbbb0fa4f344ca251fee47ceebe938acd47c70c2a3db2bca405da9cd2526 SHA512 5df7e6f71b8306ec28278839e7dee2ff09b8a7d1555f88a0c0f6ca7f9b5be20f1e572a0b0df6689817fb5fb378b5fc2d1a9729247aa6caf51c942e06fef1d0c6 +EBUILD openvdb-8.1.0.ebuild 3209 BLAKE2B 0db931c94e28135dd1819758f4459588c14498c2bc3121b7d61d223ddb6fb32873f22bf269f1b2afb15a3c1a612cb151b515a54eca2d6e73e56e6406b3df635c SHA512 840c7aac5df4a6cd6edde07c79702cdfb49f70e0b09dd023842884ccd62745202f0e956697ced9fe58cdffc345eba1330c0c006e6b248e60020d5b3193992faf +EBUILD openvdb-9.0.0.ebuild 3307 BLAKE2B 13d77210f9a543719340d622a92d2fb33b0f10c9d5d9c89e4f119a1bef1ce2b420428a8bf9dcd22fa4990481b9673613fa44e7dced0233b4cdd0c43ccebd5371 SHA512 7dd1e5ba218c6be718bf477fcacdb55ddfb0ee7677454f85504ee9643575fbbdce5633b85e2d3f5b4b8594154c04fa738a1d09bd457ee4bb25396e8d9b272c30 +MISC metadata.xml 1646 BLAKE2B 9e25b791388076b419596924e5860d79b1e96503dc8d6e2e6894182919590c9688728636f08162f6cc63a75343c34cab88d62046b573e554d6321444b9ea1be0 SHA512 39c3c0a8f7c94081dba88317ecc11cbdce2fa192373daf2ae62867204d6928ed69687935df05bbd033dc643f01168aec98230909d3c69021eedc489a9f007fbc diff --git a/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch b/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch new file mode 100644 index 000000000000..87d1d24755b4 --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch @@ -0,0 +1,21 @@ +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Thu, 28 Oct 2021 11:34:16 +0200 +Subject: [PATCH] add consistency for NumPy find_package call + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> + +diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt +index b473beb..b468d4f 100644 +--- a/openvdb/openvdb/python/CMakeLists.txt ++++ b/openvdb/openvdb/python/CMakeLists.txt +@@ -94,7 +94,7 @@ else() + OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS}) + + if(USE_NUMPY) +- find_package(Python QUIET COMPONENTS NumPy) ++ find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS} NumPy) + if(NOT TARGET Python::NumPy) + message(FATAL_ERROR "Could NOT find NumPy (Required is at least version " + "\"${MINIMUM_NUMPY_VERSION}\")" +-- +2.33.1 diff --git a/media-gfx/openvdb/files/openvdb-8.1.0-glfw-libdir.patch b/media-gfx/openvdb/files/openvdb-8.1.0-glfw-libdir.patch new file mode 100644 index 000000000000..412785fb0e14 --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-8.1.0-glfw-libdir.patch @@ -0,0 +1,21 @@ +Custom cmake file used to find GLFW always looks at lib/cmake first +ignoring alternate libdirs and leads to using wrong libraries. + +https://bugs.gentoo.org/800200 +[rebased by sam] +--- a/cmake/OpenVDBGLFW3Setup.cmake ++++ b/cmake/OpenVDBGLFW3Setup.cmake +@@ -83,10 +83,10 @@ endif() + + list(APPEND _GLFW3_ROOT_SEARCH_DIR ${SYSTEM_LIBRARY_PATHS}) + +-set(_GLFW3_PATH_SUFFIXES "lib/cmake/glfw3" "cmake/glfw3" "glfw3") ++set(_GLFW3_PATH_SUFFIXES "cmake/glfw3" "glfw3") + + # GLFW 3.1 installs CMake modules into glfw instead of glfw3 +-list(APPEND _GLFW3_PATH_SUFFIXES "lib/cmake/glfw" "cmake/glfw" "glfw") ++list(APPEND _GLFW3_PATH_SUFFIXES "cmake/glfw" "glfw") + + find_path(GLFW3_CMAKE_LOCATION glfw3Config.cmake + ${_FIND_GLFW3_ADDITIONAL_OPTIONS} + diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch b/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch new file mode 100644 index 000000000000..972db42b3556 --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch @@ -0,0 +1,151 @@ +Grabbed relevant parts from upstream PR for 9.x; it's a variant +of https://github.com/gentoo/gentoo/pull/22738 which wa sfor earlier versions. + +https://github.com/AcademySoftwareFoundation/openvdb/pull/1237 + +From 3c5f69efeacca762406a80d74b39b970c7023bd6 Mon Sep 17 00:00:00 2001 +From: Nick Avramoussis <4256455+Idclip@users.noreply.github.com> +Date: Thu, 28 Oct 2021 16:54:10 +0100 +Subject: [PATCH 1/3] Improvements to find_package Python usage. Primarily + fixes an issues where NumPy needs to be specified along with the Development + and Interpreter components in a single call + +Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com> +--- + openvdb/openvdb/python/CMakeLists.txt | 97 +++++++++++++-------------- + 1 file changed, 46 insertions(+), 51 deletions(-) + +diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt +index 7b36379f9..5e9141e8c 100644 +--- a/openvdb/openvdb/python/CMakeLists.txt ++++ b/openvdb/openvdb/python/CMakeLists.txt +@@ -55,25 +55,39 @@ endif() + # be provided to find_package(Python) with differing major versions. e.g. + # calls to find_package(Python 2.7) fails if python3 is found on the system. + function(OPENVDB_CHECK_PYTHON_VERSION) +- set(_PY_VERSION ${ARGV0}) +- set(_PY_PATH ${ARGV1}) +- if(NOT _PY_VERSION) +- message(FATAL_ERROR "Could NOT find Python (Required is at least version " +- "\"${MINIMUM_PYTHON_VERSION}\")" +- ) +- elseif(_PY_VERSION VERSION_LESS MINIMUM_PYTHON_VERSION) +- message(FATAL_ERROR "Could NOT find Python: Found unsuitable version \"${_PY_VERSION}\"" +- "but required is at least \"${MINIMUM_PYTHON_VERSION}\" (found ${_PY_PATH})" +- ) +- else() +- message(STATUS "Found Python: ${_PY_PATH}) (found suitable version \"${_PY_VERSION}\", " +- "minimum required is \"${MINIMUM_PYTHON_VERSION}\")" ++ set(PY_TARGET ${ARGV0}) ++ set(PY_TARGET_VERSION ${ARGV1}) ++ set(PY_TARGET_INCLUDES ${ARGV2}) ++ set(MIN_VERSION ${ARGV3}) ++ set(FUTURE_MIN_VERSION ${ARGV4}) ++ ++ if(NOT TARGET ${PY_TARGET}) ++ message(FATAL_ERROR "Could NOT find ${PY_TARGET} (Required is at least version " ++ "\"${MIN_VERSION}\")" + ) + endif() ++ ++ if(PY_TARGET_VERSION AND MIN_VERSION) ++ if(PY_TARGET_VERSION VERSION_LESS MIN_VERSION) ++ message(FATAL_ERROR "Could NOT find ${PY_TARGET}: Found unsuitable version " ++ "\"${PY_TARGET_VERSION}\" but required is at least \"${MIN_VERSION}\" (found ${PY_TARGET_INCLUDES})" ++ ) ++ endif() ++ endif() ++ ++ message(STATUS "Found ${PY_TARGET}: ${PY_TARGET_INCLUDES}) (found suitable " ++ "version \"${PY_TARGET_VERSION}\", minimum required is \"${MIN_VERSION}\")" ++ ) ++ ++ if(OPENVDB_FUTURE_DEPRECATION AND PY_TARGET_VERSION AND FUTURE_MIN_VERSION) ++ if(PY_TARGET_VERSION VERSION_LESS FUTURE_MIN_VERSION) ++ message(DEPRECATION "Support for ${PY_TARGET} versions < ${FUTURE_MIN_VERSION} " ++ "is deprecated and will be removed.") ++ endif() ++ endif() + endfunction() + + # Configure Python and Numpy. Note that: +-# - find_package(Python NumPy) requires CMake >= 3.14 + # - find_package(Python Development) target Python::Module requires CMake >= 3.15 + # - find_package(Python Development.Module) requires CMake >= 3.18 + # To ensure consistent versions between components Interpreter, Compiler, +@@ -85,38 +99,30 @@ endfunction() + set(OPENVDB_PYTHON_DEPS) + set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development) + if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY) +- list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) ++ list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) + endif() + +-find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) +-OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS}) +- + if(USE_NUMPY) +- find_package(Python QUIET COMPONENTS NumPy) +- if(NOT TARGET Python::NumPy) +- message(FATAL_ERROR "Could NOT find NumPy (Required is at least version " +- "\"${MINIMUM_NUMPY_VERSION}\")" +- ) +- elseif(Python_NumPy_VERSION VERSION_LESS MINIMUM_NUMPY_VERSION) +- message(FATAL_ERROR "Could NOT find NumPy: Found unsuitable version \"${Python_NumPy_VERSION}\"" +- "but required is at least \"${MINIMUM_NUMPY_VERSION}\" (found ${Python_NumPy_INCLUDE_DIRS})" +- ) +- else() +- message(STATUS "Found NumPy: ${Python_NumPy_INCLUDE_DIRS} (found suitable " +- "version \"${Python_NumPy_VERSION}\", minimum required is " +- "\"${MINIMUM_NUMPY_VERSION}\")" +- ) +- endif() +- list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy) ++ list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS NumPy) + endif() + ++# Make sure find_package(Python) is only ever invoked once with all required components ++find_package(Python COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) ++ ++openvdb_check_python_version(Python::Module ++ "${Python_VERSION}" ++ "${Python_INCLUDE_DIRS}" ++ "${MINIMUM_PYTHON_VERSION}" ++ "${FUTURE_MINIMUM_PYTHON_VERSION}") ++list(APPEND OPENVDB_PYTHON_DEPS Python::Module) ++ + if(USE_NUMPY) +- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_NUMPY_VERSION) +- if(Python_NumPy_VERSION VERSION_LESS FUTURE_MINIMUM_NUMPY_VERSION) +- message(DEPRECATION "Support for NumPy versions < ${FUTURE_MINIMUM_NUMPY_VERSION} " +- "is deprecated and will be removed.") +- endif() +- endif() ++ openvdb_check_python_version(Python::NumPy ++ "${Python_NumPy_VERSION}" ++ "${Python_NumPy_INCLUDE_DIRS}" ++ "${MINIMUM_NUMPY_VERSION}" ++ "${FUTURE_MINIMUM_NUMPY_VERSION}") ++ list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy) + endif() + + if(TARGET openvdb_shared AND NOT Boost_USE_STATIC_LIBS) +@@ -230,17 +236,6 @@ elseif(WIN32) + set_target_properties(pyopenvdb PROPERTIES SUFFIX ".pyd") # .pyd on windows + endif() + +-if(TARGET Python::Module) +- list(APPEND OPENVDB_PYTHON_DEPS Python::Module) +-else() +- if(APPLE) +- target_include_directories(pyopenvdb SYSTEM PUBLIC ${Python_INCLUDE_DIRS}) +- target_link_options(pyopenvdb PUBLIC -undefined dynamic_lookup) +- else() +- list(APPEND OPENVDB_PYTHON_DEPS Python::Python) +- endif() +-endif() +- + target_link_libraries(pyopenvdb PUBLIC + ${OPENVDB_LIB} + ${OPENVDB_PYTHON_DEPS} + diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml index e1602ec0aa5f..a4302c6004d8 100644 --- a/media-gfx/openvdb/metadata.xml +++ b/media-gfx/openvdb/metadata.xml @@ -15,6 +15,9 @@ Chance of Meatballs2' and 'How to Train Your Dragon 2'. </longdescription> <use> + <flag name="blosc"> + Allow using blosc compression via <pkg>dev-libs/c-blosc</pkg> + </flag> <flag restrict=">=media-gfx/openvdb-7.0.0" name="numpy"> Build pyopenvdb with support for <pkg>dev-python/numpy</pkg> </flag> diff --git a/media-gfx/openvdb/openvdb-7.0.0-r3.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r4.ebuild index 2d5fa8ff3512..f9b159f4213b 100644 --- a/media-gfx/openvdb/openvdb-7.0.0-r3.ebuild +++ b/media-gfx/openvdb/openvdb-7.0.0-r4.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.openvdb.org" SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0" -SLOT="0" +SLOT="0/7" KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi5-compat abi6-compat +abi7-compat" RESTRICT="!test? ( test )" diff --git a/media-gfx/openvdb/openvdb-7.1.0-r3.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r5.ebuild index 2c6c85a3efc3..ddf724c720fd 100644 --- a/media-gfx/openvdb/openvdb-7.1.0-r3.ebuild +++ b/media-gfx/openvdb/openvdb-7.1.0-r5.ebuild @@ -5,15 +5,15 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit cmake flag-o-matic python-single-r1 +inherit cmake python-single-r1 DESCRIPTION="Library for the efficient manipulation of volumetric data" HOMEPAGE="https://www.openvdb.org" SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +SLOT="0/7" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi6-compat +abi7-compat" RESTRICT="!test? ( test )" @@ -91,9 +91,9 @@ src_configure() { -DOPENVDB_ABI_VERSION_NUMBER="${version}" -DOPENVDB_BUILD_DOCS=$(usex doc) -DOPENVDB_BUILD_UNITTESTS=$(usex test) - -DOPENVDB_BUILD_VDB_LOD=$(usex !utils) - -DOPENVDB_BUILD_VDB_RENDER=$(usex !utils) - -DOPENVDB_BUILD_VDB_VIEW=$(usex !utils) + -DOPENVDB_BUILD_VDB_LOD=$(usex utils) + -DOPENVDB_BUILD_VDB_RENDER=$(usex utils) + -DOPENVDB_BUILD_VDB_VIEW=$(usex utils) -DOPENVDB_CORE_SHARED=ON -DOPENVDB_CORE_STATIC=$(usex static-libs) -DOPENVDB_ENABLE_RPATH=OFF @@ -109,6 +109,8 @@ src_configure() { -DUSE_NUMPY=$(usex numpy) -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" -DPython_EXECUTABLE="${PYTHON}" + -DPython_INCLUDE_DIR="$(python_get_includedir)" + -DPython_LIBRARY="$(python_get_library_path)" ) fi diff --git a/media-gfx/openvdb/openvdb-8.0.1-r2.ebuild b/media-gfx/openvdb/openvdb-8.0.1-r4.ebuild index fc19c87ea4c8..2e3f87c1aa79 100644 --- a/media-gfx/openvdb/openvdb-8.0.1-r2.ebuild +++ b/media-gfx/openvdb/openvdb-8.0.1-r4.ebuild @@ -5,14 +5,14 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit cmake flag-o-matic python-single-r1 +inherit cmake python-single-r1 DESCRIPTION="Library for the efficient manipulation of volumetric data" HOMEPAGE="https://www.openvdb.org" SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0" -SLOT="0" +SLOT="0/8" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi6-compat abi7-compat +abi8-compat" RESTRICT="!test? ( test )" @@ -66,6 +66,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" "${FILESDIR}/${P}-glfw-libdir.patch" + "${FILESDIR}/${P}-add-consistency-for-NumPy-find_package-call.patch" ) pkg_setup() { @@ -92,9 +93,9 @@ src_configure() { -DOPENVDB_ABI_VERSION_NUMBER="${version}" -DOPENVDB_BUILD_DOCS=$(usex doc) -DOPENVDB_BUILD_UNITTESTS=$(usex test) - -DOPENVDB_BUILD_VDB_LOD=$(usex !utils) - -DOPENVDB_BUILD_VDB_RENDER=$(usex !utils) - -DOPENVDB_BUILD_VDB_VIEW=$(usex !utils) + -DOPENVDB_BUILD_VDB_LOD=$(usex utils) + -DOPENVDB_BUILD_VDB_RENDER=$(usex utils) + -DOPENVDB_BUILD_VDB_VIEW=$(usex utils) -DOPENVDB_CORE_SHARED=ON -DOPENVDB_CORE_STATIC=$(usex static-libs) -DOPENVDB_ENABLE_RPATH=OFF @@ -108,8 +109,10 @@ src_configure() { mycmakeargs+=( -DOPENVDB_BUILD_PYTHON_MODULE=ON -DUSE_NUMPY=$(usex numpy) + -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test) -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" -DPython_EXECUTABLE="${PYTHON}" + -DPython_INCLUDE_DIR="$(python_get_includedir)" ) fi diff --git a/media-gfx/openvdb/openvdb-8.1.0.ebuild b/media-gfx/openvdb/openvdb-8.1.0.ebuild new file mode 100644 index 000000000000..5042d7339314 --- /dev/null +++ b/media-gfx/openvdb/openvdb-8.1.0.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit cmake python-single-r1 + +DESCRIPTION="Library for the efficient manipulation of volumetric data" +HOMEPAGE="https://www.openvdb.org" +SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0/8" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc doc numpy python static-libs test utils zlib abi6-compat abi7-compat +abi8-compat" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + numpy? ( python ) + ^^ ( abi6-compat abi7-compat abi8-compat ) + python? ( ${PYTHON_REQUIRED_USE} ) +" +# Check if newer releases work with newer TBB, bug #820788 +RDEPEND=" + <dev-cpp/tbb-2021.4.0:= + dev-libs/boost:= + dev-libs/jemalloc:= + dev-libs/log4cplus:= + media-libs/glfw + media-libs/glu + media-libs/ilmbase:= + media-libs/openexr:0= + sys-libs/zlib:= + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + blosc? ( dev-libs/c-blosc:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}] + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + ') + ) + zlib? ( sys-libs/zlib ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + >=dev-util/cmake-3.16.2-r1 + virtual/pkgconfig + doc? ( + app-doc/doxygen + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + test? ( dev-util/cppunit dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" + "${FILESDIR}/${PN}-8.0.1-add-consistency-for-NumPy-find_package-call.patch" + "${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myprefix="${EPREFIX}/usr/" + + local version + if use abi6-compat; then + version=6 + elif use abi7-compat; then + version=7 + elif use abi8-compat; then + version=8 + else + die "OpenVDB ABI version is not compatible" + fi + + local mycmakeargs=( + -DCHOST="${CHOST}" + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/" + -DOPENVDB_ABI_VERSION_NUMBER="${version}" + -DOPENVDB_BUILD_DOCS=$(usex doc) + -DOPENVDB_BUILD_UNITTESTS=$(usex test) + -DOPENVDB_BUILD_VDB_LOD=$(usex utils) + -DOPENVDB_BUILD_VDB_RENDER=$(usex utils) + -DOPENVDB_BUILD_VDB_VIEW=$(usex utils) + -DOPENVDB_CORE_SHARED=ON + -DOPENVDB_CORE_STATIC=$(usex static-libs) + -DOPENVDB_ENABLE_RPATH=OFF + -DUSE_BLOSC=$(usex blosc) + -DUSE_ZLIB=$(usex zlib) + -DUSE_CCACHE=OFF + -DUSE_COLORED_OUTPUT=ON + # Off for now until 9.0.0 for OpenEXR 3 support + -DUSE_IMATH_HALF=OFF + -DUSE_LOG4CPLUS=ON + ) + + if use python; then + mycmakeargs+=( + -DOPENVDB_BUILD_PYTHON_MODULE=ON + -DUSE_NUMPY=$(usex numpy) + -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test) + -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" + -DPython_EXECUTABLE="${PYTHON}" + -DPython_INCLUDE_DIR="$(python_get_includedir)" + ) + fi + + if use cpu_flags_x86_avx; then + mycmakeargs+=( -DOPENVDB_SIMD=AVX ) + elif use cpu_flags_x86_sse4_2; then + mycmakeargs+=( -DOPENVDB_SIMD=SSE42 ) + fi + + cmake_src_configure +} diff --git a/media-gfx/openvdb/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0.ebuild new file mode 100644 index 000000000000..898e80d496d6 --- /dev/null +++ b/media-gfx/openvdb/openvdb-9.0.0.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10} ) + +inherit cmake python-single-r1 + +DESCRIPTION="Library for the efficient manipulation of volumetric data" +HOMEPAGE="https://www.openvdb.org" +SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0/9" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc doc numpy python static-libs test utils zlib abi6-compat abi7-compat +abi8-compat" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + numpy? ( python ) + ^^ ( abi6-compat abi7-compat abi8-compat ) + python? ( ${PYTHON_REQUIRED_USE} ) +" +RDEPEND=" + >=dev-cpp/tbb-2021.4.0:= + dev-libs/boost:= + dev-libs/jemalloc:= + dev-libs/log4cplus:= + dev-libs/imath:= + media-libs/glfw + media-libs/glu + media-libs/openexr:3= + sys-libs/zlib:= + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + blosc? ( dev-libs/c-blosc:= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}] + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + ') + ) + zlib? ( sys-libs/zlib ) +" + +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-doc/doxygen + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + test? ( dev-util/cppunit dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" + "${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch" + "${FILESDIR}/${PN}-9.0.0-numpy.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # Make sure we find our renamed Imath headers + # bug #820929 + sed -i -e 's:#include <Imath/half.h>:#include <Imath-3/half.h>:' openvdb/openvdb/Types.h || die + + cmake_src_prepare +} + +src_configure() { + local myprefix="${EPREFIX}/usr/" + + local version + if use abi6-compat; then + version=6 + elif use abi7-compat; then + version=7 + elif use abi8-compat; then + version=8 + else + die "OpenVDB ABI version is not compatible" + fi + + # TODO: add NanoVDB? + # https://academysoftwarefoundation.github.io/openvdb/NanoVDB_HowToBuild.html + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/" + -DOPENVDB_ABI_VERSION_NUMBER="${version}" + -DOPENVDB_BUILD_DOCS=$(usex doc) + -DOPENVDB_BUILD_UNITTESTS=$(usex test) + -DOPENVDB_BUILD_VDB_LOD=$(usex utils) + -DOPENVDB_BUILD_VDB_RENDER=$(usex utils) + -DOPENVDB_BUILD_VDB_VIEW=$(usex utils) + -DOPENVDB_CORE_SHARED=ON + -DOPENVDB_CORE_STATIC=$(usex static-libs) + -DOPENVDB_ENABLE_RPATH=OFF + -DUSE_BLOSC=$(usex blosc) + -DUSE_ZLIB=$(usex zlib) + -DUSE_CCACHE=OFF + -DUSE_COLORED_OUTPUT=ON + -DUSE_IMATH_HALF=ON + -DUSE_LOG4CPLUS=ON + ) + + if use python; then + mycmakeargs+=( + -DOPENVDB_BUILD_PYTHON_MODULE=ON + -DUSE_NUMPY=$(usex numpy) + -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test) + -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" + -DPython_EXECUTABLE="${PYTHON}" + -DPython_INCLUDE_DIR="$(python_get_includedir)" + ) + fi + + if use cpu_flags_x86_avx; then + mycmakeargs+=( -DOPENVDB_SIMD=AVX ) + elif use cpu_flags_x86_sse4_2; then + mycmakeargs+=( -DOPENVDB_SIMD=SSE42 ) + fi + + cmake_src_configure +} diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index 28f383685048..17166581406b 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1,5 +1,4 @@ AUX prusaslicer-2.3.0-miniz-zip-header.patch 284 BLAKE2B f73db5727dd6bffc39c658a291602ee6d86609244e9cd55a9eeb92a376cc4a579a94ef9f423e3072dbd01295b173c9291d615a56d5fb512cdccc93b205f665d0 SHA512 36e3c1e5d35f6cda26d8f74db3862cc5206478f7f79f35b28b3b3749291150764d1d907a3ccb67b4dcd1872fa5d0ac612791653dc67f3a56aeb98b68dc873f27 -AUX prusaslicer-2.3.1-gcc11-missing-include.patch 740 BLAKE2B 162981c4ddf74bf55f27adebc8603892da97e60eecc085649d508abf06731969643d0a043e275f8978318b9e2c2603557e03529f8017030da4503a71f5c60171 SHA512 bb7067b20ad07ca4aaa5a20583e8399d61f4e7ca2e9a04fda7bd8929e0b51aa908bfe7a546e82f1d688f2853d14f3c961c65296608aa2e14ccfa6c5e4d8f6a19 DIST prusaslicer-2.3.3.tar.gz 40659538 BLAKE2B 1e1a1f7aeb34934bab03410e004a91e5ed76aaf930ff59e5b373b2e229018b6703d8da8ee7ab9085be25c5b3ce4ef39aeb38204336400867fac4a55f52c76bd4 SHA512 1f6b97e135202ad9de8f0bb212239ce2497de4205ea32f860b483473fb1f1783451d539a67cd97ef31f512a797b29c1067a1eff4134ea4a29b6218e5757657e2 -EBUILD prusaslicer-2.3.3-r1.ebuild 2051 BLAKE2B 4c988b531112c3dbc85b8b99c56069cf5076748f53f559cd456b8f69e1669e9f111f1e08d8690be6ea50c3fae41c766016c061bc98dbe98ff07c0a1391da07b5 SHA512 0b9c8458dfe3e358d7e8fe312ecbc1c1053da41f638159d5cd006f27ffdfc45c858ea5296129f508c28d9f8a42be99fe0352743fe1591fcf9ad6ef21ca6c8538 +EBUILD prusaslicer-2.3.3-r1.ebuild 2091 BLAKE2B b9193ade560bc73c04f5d09cf8ecf41ea58d18a4672df9244420935bea887a101847cc39e44f4bde6318c4091826f511890a2f48c05c682de3f11cebbea192cd SHA512 0892aa78102d8cc6984a379603ffec364750d82b34e07e0c618673e16c4185db8769a3808f3a77c267171537ce4600b2bf364d7755440a9e5c659712c758dd92 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.3.1-gcc11-missing-include.patch b/media-gfx/prusaslicer/files/prusaslicer-2.3.1-gcc11-missing-include.patch deleted file mode 100644 index 6480277bde64..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.3.1-gcc11-missing-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/prusa3d/PrusaSlicer/commit/62592ca -https://bugs.gentoo.org/788196 - -From 62592cab48cfb6a20d84041b1992aecc6a2b659c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hejl?= <hejl.lukas@gmail.com> -Date: Sat, 1 May 2021 22:33:59 +0200 -Subject: [PATCH] Added missing include (GCC 11.1) - ---- - src/libslic3r/Optimize/Optimizer.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libslic3r/Optimize/Optimizer.hpp b/src/libslic3r/Optimize/Optimizer.hpp -index 05191eba26..8ae55c61c5 100644 ---- a/src/libslic3r/Optimize/Optimizer.hpp -+++ b/src/libslic3r/Optimize/Optimizer.hpp -@@ -8,6 +8,7 @@ - #include <functional> - #include <limits> - #include <cassert> -+#include <optional> - - namespace Slic3r { namespace opt { - diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.3-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.3.3-r1.ebuild index 7ce3bc36f884..8504f9ddf60e 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.3.3-r1.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.3.3-r1.ebuild @@ -67,6 +67,8 @@ src_prepare() { } src_configure() { + CMAKE_BUILD_TYPE="Release" + use gui && setup-wxwidgets local mycmakeargs=( @@ -76,6 +78,7 @@ src_configure() { -DSLIC3R_GUI=$(usex gui) -DSLIC3R_PCH=OFF -DSLIC3R_WX_STABLE=ON + -Wno-dev ) cmake_src_configure |