diff options
Diffstat (limited to 'dev-libs/imath')
| -rw-r--r-- | dev-libs/imath/Manifest | 7 | ||||
| -rw-r--r-- | dev-libs/imath/files/imath-3.1.11-fix_cmake_module_export.patch | 22 | ||||
| -rw-r--r-- | dev-libs/imath/files/imath-3.1.11-use-correct-boost_python_version.patch | 17 | ||||
| -rw-r--r-- | dev-libs/imath/imath-3.1.11-r1.ebuild (renamed from dev-libs/imath/imath-3.1.9.ebuild) | 36 | ||||
| -rw-r--r-- | dev-libs/imath/imath-3.1.6.ebuild | 69 |
5 files changed, 68 insertions, 83 deletions
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest index 72162301d3bf..3291bbbddde2 100644 --- a/dev-libs/imath/Manifest +++ b/dev-libs/imath/Manifest @@ -1,7 +1,6 @@ +AUX imath-3.1.11-fix_cmake_module_export.patch 879 BLAKE2B 95ad45eb5011fd24517e510146475c6fd2dac6523143895f6898104f55ba8f178e7531ad5b156069a08ae516644908eacec51ba5d00675a2e3b95900acd270ca SHA512 c1a38c070ae714fc4fcc33f949b4e5dd371221bbad40210b92ae768cb8819cd5142ff8ce4540d808845e38b6f00418108393e2391b46d6aced65042b595fe8e3 +AUX imath-3.1.11-use-correct-boost_python_version.patch 522 BLAKE2B 4522dd6d3911b0593d7300e01108f35cc05759e8a59f6ab7f438234632bcd5d12894e9fc4235e3fa970a4b365e9f7db4cd09e49520dd8b4a4c6b5adbb7186c0d SHA512 dd2d1ff0c7d4fe2236621ea80bcf12697c5398af40b59f1a2631f7a78ffbd2df91337d3f31ad6e50b5631b31c26b23f43b346429e440bb56d465ba84167c4da1 DIST imath-3.1.11.tar.gz 596585 BLAKE2B d5fc8d7607070bc96619e74eb67c60048695023c1baa715e3ab5de84a49bf1f7381cc19e3a047b75f8520e20a9976c58503b2063feb2add7b6dfcc7c73e13ad7 SHA512 0bc86bea3a2aca89d02b501b4fba3c13ca861e914cec558e820fe9e4c43ab14cac34e31ff278b8c35b5fe76f7bea32f2c8105c0d33eb92224eb23d42d7a402e9 -DIST imath-3.1.6.tar.gz 573255 BLAKE2B c4d5a785a2aed9c5b9b1441ab016a5cf47abeb1d44c0625f0654e8c4d1e47dddddd62c61f83fd7b160beae8aaf5db9350d2a3bc43754e795fe75b10c4836a1b8 SHA512 c099a291ed7fd7702a7609575f2f3d2ed7f95256c23c2180e2ef1f76ceb07734365f57da5244b1d6cec81ca9859864eb4c9236df02a64aa783af6639a3b59acd -DIST imath-3.1.9.tar.gz 598497 BLAKE2B fe3afce26c19f5ddace3c420f9b83caca7b4c75902820fc2182ef9fb9f4d27581f27ca72262b63d65f794eeb73af55782412ba846d142072e0090ff7224d8960 SHA512 ad96b2ac306fc13c01e8ea3256f885499c3f545be327feaba0f5e093b70b544bcca6f8b353fa7e35107aae515c19caced44331a95d0414f367ead4691ec73564 +EBUILD imath-3.1.11-r1.ebuild 2044 BLAKE2B 66d73078913010e2680bb009f52ca3138aa5c4fe46aebefb2bf40bb6e6e65981397ddaa220b7e94cb059588fd28364525b918a5d0da74c2b87979ba3073a2f8d SHA512 76e72dfd30d25bc0dafa7e18e1c4652e4e871ccaa01286b6b756caf8d18dec685c045480aab295e21560cbb2db06bda584323c062f8a6b3c3dbdc4a3838333c5 EBUILD imath-3.1.11.ebuild 1899 BLAKE2B 911fa12da74726b9c34b3b7f244eaf9d1931d7ee3007faeb06a34e2a80ac7abb1628959c6964b0d190ba0c4c904ebaf0bd794e4ef08cf5d7a8f8003386023025 SHA512 3902d97107186529b80317a56f21dafea83d7fe947b4bcf52ee4523716cefb97d54ecd81946773e14cc66f8f44db25758f85235d99934a1c99b6619050931e96 -EBUILD imath-3.1.6.ebuild 1730 BLAKE2B b5903bbfc62c5dc143e26e3657328bbaf09d326f50f2c943c2b85fab6703fb3c3df6673d1b8601dd592d02b69dc8211f922033174c47bb403d3c1889ba45843d SHA512 aa54167f88e7ebc248fd066bb8e36edc1487e8747b6637c2c0a9c506277d88eeeafa12bcae5d9ce5700c2fc0d093ce7252c3d840270d7bd588007c2bfcd2b726 -EBUILD imath-3.1.9.ebuild 1714 BLAKE2B d1fb48d3c1649745a56e6d5729582c4031964fc08694c6b615f3352cad335c38d30262cc98f981aa4f293e1eb6e463992f7e3276d6b04c50616db1056aa89c56 SHA512 ee9d5714345b262c68d29a3a07f1797a4ad1c4dd17f8b64ea013d2819e135a6db15b6de2bcf90fe3961423aba2126670f6adbff85f93e5b939b8b7b3f91bf5a6 MISC metadata.xml 821 BLAKE2B dba5ad76f16ed8f83cfde2ce90eab3a0aec0a86e1f34d55e4728b212febb007c45b4af90ee27bce4ae7a144e26dd3f90c43b0e84a8929883a8e03d6d2f24ed00 SHA512 af62fc3e361ff228c9a50211c0be2c05d100b4fb1fb279fa42b8aa97d8f23f305f67ba20c3fc1c6abfe46a8605993e1e285760b62008c266342792963f9f4602 diff --git a/dev-libs/imath/files/imath-3.1.11-fix_cmake_module_export.patch b/dev-libs/imath/files/imath-3.1.11-fix_cmake_module_export.patch new file mode 100644 index 000000000000..3e5c4d59946c --- /dev/null +++ b/dev-libs/imath/files/imath-3.1.11-fix_cmake_module_export.patch @@ -0,0 +1,22 @@ +From 0f7f9f9f32ea178d474325ec1b2576a790e336a1 Mon Sep 17 00:00:00 2001 +From: Lucas Miller <lmiller@imageworks.com> +Date: Wed, 1 May 2024 13:51:30 -0700 +Subject: [PATCH] Address Issue #395 where packages that need to link against + PyImath can no longer find it. + +--- + src/python/config/ModuleDefine.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/python/config/ModuleDefine.cmake b/src/python/config/ModuleDefine.cmake +index adee61c8..b4063623 100644 +--- a/src/python/config/ModuleDefine.cmake ++++ b/src/python/config/ModuleDefine.cmake +@@ -55,6 +55,7 @@ function(PYIMATH_ADD_LIBRARY_PRIV libname) + add_library(${PROJECT_NAME}::${libname} ALIAS ${libname}) + + install(TARGETS ${libname} ++ EXPORT ${PROJECT_NAME} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/dev-libs/imath/files/imath-3.1.11-use-correct-boost_python_version.patch b/dev-libs/imath/files/imath-3.1.11-use-correct-boost_python_version.patch new file mode 100644 index 000000000000..fedd1005f6b6 --- /dev/null +++ b/dev-libs/imath/files/imath-3.1.11-use-correct-boost_python_version.patch @@ -0,0 +1,17 @@ +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: 2024-06-03 +Subject: [PATCH] only try to find versioned boost::python + +diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt +index 1bc1e54..c71ce42 100644 +--- a/src/python/CMakeLists.txt ++++ b/src/python/CMakeLists.txt +@@ -139,8 +139,6 @@ if(Boost_NO_BOOST_CMAKE) + endif() + + find_package(Boost OPTIONAL_COMPONENTS +- python +- python${Python_VERSION_MAJOR} + ${PYIMATH_BOOST_PY_COMPONENT}) + set(_pyimath_have_perver_boost) + if(PYIMATH_BOOST_PY_COMPONENT) diff --git a/dev-libs/imath/imath-3.1.9.ebuild b/dev-libs/imath/imath-3.1.11-r1.ebuild index 875d9a2d87d1..8d3a484e5f00 100644 --- a/dev-libs/imath/imath-3.1.9.ebuild +++ b/dev-libs/imath/imath-3.1.11-r1.ebuild @@ -7,21 +7,20 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-single-r1 -MY_PN="${PN^}" +MY_PN=${PN^} DESCRIPTION="Imath basic math package" HOMEPAGE="https://imath.readthedocs.io" SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="BSD" SLOT="3/29" -IUSE="large-stack python test" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc large-stack python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" -# blocker due to file collision #803347 RDEPEND=" sys-libs/zlib python? ( @@ -35,10 +34,23 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig + doc? ( + app-text/doxygen + $(python_gen_cond_dep ' + dev-python/breathe[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-press-theme[${PYTHON_USEDEP}] + ') + ) python? ( ${PYTHON_DEPS} ) " -DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md ) +DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md ) + +PATCHES=( + "${FILESDIR}/${PN}-3.1.11-fix_cmake_module_export.patch" + "${FILESDIR}/${PN}-3.1.11-use-correct-boost_python_version.patch" +) pkg_setup() { use python && python-single-r1_pkg_setup @@ -46,9 +58,8 @@ pkg_setup() { src_configure() { local mycmakeargs=( - # requires press theme, not available in ::gentoo - -DBUILD_DOCS=OFF - -DIMATH_ENABLE_LARGE_STACK=$(usex large-stack) + -DBUILD_WEBSITE="$(usex doc)" + -DIMATH_ENABLE_LARGE_STACK="$(usex large-stack)" # the following options are at their default value -DIMATH_HALF_USE_LOOKUP_TABLE=ON -DIMATH_INSTALL_PKG_CONFIG=ON @@ -61,10 +72,15 @@ src_configure() { -DBoost_NO_BOOST_CMAKE=OFF -DPYTHON=ON -DPython3_EXECUTABLE="${PYTHON}" - -DPython3_INCLUDE_DIR=$(python_get_includedir) - -DPython3_LIBRARY=$(python_get_library_path) + -DPython3_INCLUDE_DIR="$(python_get_includedir)" + -DPython3_LIBRARY="$(python_get_library_path)" ) fi cmake_src_configure } + +src_install() { + use doc && HTML_DOCS=( "${BUILD_DIR}/website/sphinx/." ) + cmake_src_install +} diff --git a/dev-libs/imath/imath-3.1.6.ebuild b/dev-libs/imath/imath-3.1.6.ebuild deleted file mode 100644 index 35006aa943a2..000000000000 --- a/dev-libs/imath/imath-3.1.6.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake python-single-r1 - -MY_PN="${PN^}" - -DESCRIPTION="Imath basic math package" -HOMEPAGE="https://imath.readthedocs.io" -SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -# re-keywording needed for (according to ilmbase keywords): ~x64-macos ~x86-solaris -KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="BSD" -SLOT="3/29" -IUSE="doc large-stack python test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -# blocker due to file collision #803347 -RDEPEND=" - sys-libs/zlib - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - ') - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_USEDEP}]') ) - python? ( ${PYTHON_DEPS} ) -" - -DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DDOCS=$(usex doc) - -DIMATH_ENABLE_LARGE_STACK=$(usex large-stack) - -DIMATH_HALF_USE_LOOKUP_TABLE=ON - -DIMATH_INSTALL_PKG_CONFIG=ON - -DIMATH_USE_CLANG_TIDY=OFF - -DIMATH_USE_NOEXCEPT=ON - ) - if use python; then - mycmakeargs+=( - -DBoost_NO_BOOST_CMAKE=OFF - -DPYTHON=ON - -DPython3_EXECUTABLE="${PYTHON}" - -DPython3_INCLUDE_DIR=$(python_get_includedir) - -DPython3_LIBRARY=$(python_get_library_path) - ) - fi - - cmake_src_configure -} |