diff options
Diffstat (limited to 'media-libs/opensubdiv')
7 files changed, 2 insertions, 352 deletions
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest index d754c6c46c07..7f9f53469d25 100644 --- a/media-libs/opensubdiv/Manifest +++ b/media-libs/opensubdiv/Manifest @@ -1,13 +1,7 @@ -AUX opensubdiv-3.3.0-add-CUDA9-compatibility.patch 897 BLAKE2B 528eaabdbe1613e6fde30f3e0688c64d796c599a7c9efa49575b817de559938344326b8606f9c9ed013a97c46037a49805ee1d1c27fa9beb78b3d9153771e119 SHA512 0a4c20dff82f6500019f45ef88539a32fb7e5b885d48c7108f05d6c018890518cd735e20a020cf058d47cf68e19f74e14e8496c5facabfa90e9401478d315ffa AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82948be891654923adae6a2e4f870857e357478f92cb9a239c282f0d09f75f6f2a58682c50d8f437989859710668071b46b1cde499424 SHA512 4f463fbea3e94e93711888a077faa375054aae193abfbe4c600081fae43efa4adf5dc5687ceb7c59795c20ae97ec158ce4035e72dfdb0c89ee5943e41e58bdef -AUX opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch 1620 BLAKE2B 5c7e721f8754d50fdffb468009a2cc67c926ecb8abe3c0c2e5c60f15cac5f778222074f639b0040b98f405eb392f3d9c97358ed3302832fb32a1417d6bc36311 SHA512 b919c3c3f8c3190b683c5bc02cb523821200bbe951d65e2543d6f0f818ee1bcc4117c3140857becf032c54fd58aa4ee2f06b8f8cf550f72f3df9c5b21f483cb1 AUX opensubdiv-3.4.3-install-tutorials-into-bin.patch 2239 BLAKE2B d35a7118b742244f045aa5c0e5e1ab42a8eea98cac377b9fb0efd8948e2b13d2be973aa17714a8554a97061a8de0769861947cf9c890bcf81acff593b3f34ae5 SHA512 2e86d3f73568c16c839d783574abfb765432b3bf9171b73da8eab9c86be4c736912b892879cb04d974046fb90c5fdf2e60669cc94d468d5aec51573c0ffdcaa6 AUX opensubdiv-3.4.4-add-CUDA11-compatibility.patch 846 BLAKE2B df2611fff3112eff3784306c6811285f895593a954f394d1a41b68a9e44ee2dbaae85b5f4e009dfe8edf95e8806f1c085728130c6e003a63a3918ab1ac586012 SHA512 c5c8e6705c0f93d632b45d3e645ff9b207b102ff7534f51b32400e4d60ab07afb18bf6b99a066d1556c55ba275ad586969d4460a6bd3d9c8a2bef83152183deb AUX opensubdiv-3.4.4-tbb-2021.patch 2147 BLAKE2B 69f1ae0689fa1a21cb6ee74ff1d6cedd474b38881e49cb5887fbc87bd2b2cc71c7b37b782751390426cc200ea2d488909555c698321c50b5891922f6eb7320ae SHA512 adc5a5126bd1433f4edf8239d7cf48755c8c84d688c8d877121598e8833a352cd3da399577dae918c66b1c4f7d90dd5af08e42d86e66a7532e3b0ae2ad59d048 -DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2 DIST opensubdiv-3.4.4.tar.gz 39228037 BLAKE2B 53bada3ff2652c6041a3becaf037b593c0e1e4c1bd57a285e6c068c11060b06f9ab0617284a57d0e8974f80082abd6563930ede8b1d6bfb801bfa61dd3256445 SHA512 fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb -EBUILD opensubdiv-3.4.3-r1.ebuild 2376 BLAKE2B 5662809ca588bfe52c46fcf0c2b3e9c3feb56006a1e1ec1f277add0ef0e485a2c863ff1bc137cc8a05b3395b1a221666966d0c27117db4d962f9c7be57a62852 SHA512 fa96d571158a3f7d6bf3fea1e1478e9a0a5e10a6561235d6e58030fd4bac1007df7348fa589ed1aa8e97a09ca3f9f5263fcb04ca12fbb8d438dbe70962170bbe -EBUILD opensubdiv-3.4.4-r1.ebuild 2252 BLAKE2B 11dc22f927daaee1bbcb8b5014efc303a37228439387ed9c89fc49509b13d46e484b1850c5b46cb95666064dfcae2455feda07295ec0bb04270b170d36f59c0f SHA512 a9a117a29ddb15de9bbfe079e6d5ddc97e3fc81804f0e52052880294f30216f2b1fb6dd7719a62f632ec113f73fe3449d2e997697a4b97391d6cc7f1f54dffc9 -EBUILD opensubdiv-3.4.4-r2.ebuild 2415 BLAKE2B 8191238ef11d63e09fa843dcad76c553d4fb2676f09dec82ad75af8d6075383c47040370259f4174b79d3596763e2c00716397a475a9533bc61e9c202fc1c5b8 SHA512 637f09451ce22279e1b7e1d6f8778dc6937680615e0ee8b500e8cbbda4f836f03f17922f16906bcb92688263725cf5fce70cf6d8a9dac7c9177e22ee6f853118 -EBUILD opensubdiv-3.4.4-r3.ebuild 2447 BLAKE2B c88e2b9c27020a74ceebd76adbc891c3536494039a6d6e1fe2eb4a38023a1de15a68e28c9f445ffb5dfc2890ec563e4abf970b51246e03ae65d6c611a5b2b84d SHA512 47ff663a6ffa2f210844bfa6646c0a404527c20c0e29472808c17647fbac2e5badbbaa6b35be759add2a32928df5ee8ae5665c8c55ac459b2b8f5d118e72a9cc +EBUILD opensubdiv-3.4.4-r3.ebuild 2446 BLAKE2B 0f613fee98fa1feae0aa4dd2f29aec068147ff966d543af80cc5a6cad8c841d2a824f2d70708fdff7b27b3371085fdbcf95eced07d0069386ca521e65684079a SHA512 23e04d277443f66a777acebfed7ca85ac4da09ae53ef5a3eca1eaf4116209227550542a4175cc27c085ca5334033ea5980456ad66ac8c40f53f29b07451773e6 MISC metadata.xml 1036 BLAKE2B cc36d0e341535d825d18bc4485cadd6c46b907bacc5fb52421aecd4e194cae73165d9708502dff6ac748396176df6a29c2920b99cb2eb9f841ff26b5de1eb916 SHA512 057a0aa062daed49dcab313aaf049a1ce41a10fa98e6c73c809e7d441689505db27bc0f52785c407226f642c69f65b54a211bccd1690f43eb6f4246faef94984 diff --git a/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch b/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch deleted file mode 100644 index 9fe81c4ee199..000000000000 --- a/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7b9157bca7138480c387ef3d5b69b6cf1eb498e5 Mon Sep 17 00:00:00 2001 -From: "Daniel M. Weeks" <dan@danweeks.net> -Date: Fri, 15 Dec 2017 22:45:55 -0500 -Subject: [PATCH] CUDA 9 compatible gpu-architecture default - ---- - CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4f3cd9d4..fa438b46 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -513,8 +513,10 @@ if(CUDA_FOUND) - if (NOT DEFINED OSD_CUDA_NVCC_FLAGS) - if (CUDA_VERSION_MAJOR LESS 6) - set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_11 ) -- else() -+ elseif (CUDA_VERSION_MAJOR LESS 9) - set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_20 ) -+ else() -+ set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_30 ) - endif() - endif() - endif() diff --git a/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch b/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch deleted file mode 100644 index 5455ba98e317..000000000000 --- a/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch +++ /dev/null @@ -1,51 +0,0 @@ -From dc9d14c97fc22ad5b00c9ffb0f83931e42cf2eb0 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl@gmail.com> -Date: Fri, 2 Aug 2019 19:27:17 +0200 -Subject: [PATCH] documentation/CMakeLists.txt: force python2 - -The patch forces to use Python-2.x to build the documentation - -Signed-off-by: Bernd Waibel <waebbl@gmail.com> ---- - documentation/CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt -index 32b12a3..a93414e 100644 ---- a/documentation/CMakeLists.txt -+++ b/documentation/CMakeLists.txt -@@ -54,10 +54,10 @@ else() - - endif() - --find_package(PythonInterp 2.6) -+find_package(Python2 COMPONENTS Interpreter) - - # ReST - HTML documentation --if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND) -+if (DOCUTILS_FOUND AND Python2_Interpreter_FOUND) - - set(HTML_FILES - search.html -@@ -198,7 +198,7 @@ if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND) - OUTPUT - "${rstfile}" - COMMAND -- "${PYTHON_EXECUTABLE}" -+ "${Python2_EXECUTABLE}" - ARGS - "${CMAKE_CURRENT_SOURCE_DIR}/processTutorials.py" - "${infile}" -@@ -291,7 +291,7 @@ if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND) - # build search index and insert navigation tab - add_custom_target(search_index - COMMAND -- "${PYTHON_EXECUTABLE}" -+ "${Python2_EXECUTABLE}" - "${CMAKE_CURRENT_SOURCE_DIR}/processHtml.py" - "${CMAKE_CURRENT_BINARY_DIR}" - "${CMAKE_CURRENT_SOURCE_DIR}/nav_template.txt" --- -2.22.0 - - diff --git a/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild deleted file mode 100644 index f9593b44235b..000000000000 --- a/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR=emake -PYTHON_COMPAT=( python2_7 ) - -inherit cmake python-utils-r1 toolchain-funcs - -MY_PV="$(ver_rs "1-3" '_')" -DESCRIPTION="An Open-Source subdivision surface library" -HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html" -SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -# Modfied Apache-2.0 license, where section 6 has been replaced. -# See for example CMakeLists.txt for details. -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" -IUSE="cuda doc examples opencl openmp ptex tbb test tutorials" - -RDEPEND=" - ${PYTHON_DEPS} - media-libs/glew:= - media-libs/glfw:= - x11-libs/libXinerama - cuda? ( dev-util/nvidia-cuda-toolkit:* ) - opencl? ( virtual/opencl ) - ptex? ( media-libs/ptex ) -" -DEPEND=" - ${RDEPEND} - tbb? ( <dev-cpp/tbb-2021.4.0:= ) -" -BDEPEND=" - doc? ( - app-doc/doxygen - dev-python/docutils - ) - cuda? ( <sys-devel/gcc-9[cxx] ) -" - -S="${WORKDIR}/OpenSubdiv-${MY_PV}" - -PATCHES=( - "${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch" - "${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch" - "${FILESDIR}/${PN}-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch" - "${FILESDIR}/${P}-install-tutorials-into-bin.patch" -) - -RESTRICT="!test? ( test )" - -pkg_pretend() { - if use cuda; then - [[ $(gcc-major-version) -gt 8 ]] && \ - eerror "USE=cuda requires gcc < 9. Run gcc-config to switch your default compiler" && \ - die "Need gcc version earlier than 9" - fi - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - # GLTESTS are disabled as portage is unable to open a display during test phase - local mycmakeargs=( - -DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)" - -DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)" - -DNO_CLEW=ON - -DNO_CUDA=$(usex !cuda) - -DNO_DOC=$(usex !doc) - -DNO_EXAMPLES=$(usex !examples) - -DNO_GLTESTS=ON - -DNO_OMP=$(usex !openmp) - -DNO_OPENCL=$(usex !opencl) - -DNO_PTEX=$(usex !ptex) - -DNO_REGRESSION=$(usex !test) - -DNO_TBB=$(usex !tbb) - -DNO_TESTS=$(usex !test) - -DNO_TUTORIALS=$(usex !tutorials) - ) - - # fails with building cuda kernels when using multiple jobs - export MAKEOPTS="-j1" - cmake_src_configure -} diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild deleted file mode 100644 index fe2e02e7075d..000000000000 --- a/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR=emake - -inherit cmake toolchain-funcs - -MY_PV="$(ver_rs "1-3" '_')" -DESCRIPTION="An Open-Source subdivision surface library" -HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html" -SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/OpenSubdiv-${MY_PV}" - -# Modfied Apache-2.0 license, where section 6 has been replaced. -# See for example CMakeLists.txt for details. -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" -IUSE="cuda examples opencl openmp ptex tbb test tutorials" -RESTRICT="!test? ( test )" - -RDEPEND=" - media-libs/glew:= - media-libs/glfw:= - x11-libs/libXinerama - cuda? ( dev-util/nvidia-cuda-toolkit:* ) - opencl? ( virtual/opencl ) - ptex? ( media-libs/ptex ) -" -DEPEND=" - ${RDEPEND} - tbb? ( <dev-cpp/tbb-2021.4.0:= ) -" -BDEPEND=" - cuda? ( <sys-devel/gcc-9[cxx] ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch" - "${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch" - "${FILESDIR}/${PN}-3.4.3-install-tutorials-into-bin.patch" -) - -pkg_pretend() { - if use cuda; then - [[ $(gcc-major-version) -gt 8 ]] && \ - eerror "USE=cuda requires gcc < 9. Run gcc-config to switch your default compiler" && \ - die "Need gcc version earlier than 9" - fi - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - # GLTESTS are disabled as portage is unable to open a display during test phase - # TODO: virtx work? - local mycmakeargs=( - -DGLEW_LOCATION="${ESYSROOT}/usr/$(get_libdir)" - -DGLFW_LOCATION="${ESYSROOT}/usr/$(get_libdir)" - -DNO_CLEW=ON - -DNO_CUDA=$(usex !cuda) - # Docs needed Python 2 so disabled - # bug #815172 - -DNO_DOC=ON - -DNO_EXAMPLES=$(usex !examples) - -DNO_GLTESTS=ON - -DNO_OMP=$(usex !openmp) - -DNO_OPENCL=$(usex !opencl) - -DNO_PTEX=$(usex !ptex) - -DNO_REGRESSION=$(usex !test) - -DNO_TBB=$(usex !tbb) - -DNO_TESTS=$(usex !test) - -DNO_TUTORIALS=$(usex !tutorials) - ) - - # Fails with building cuda kernels when using multiple jobs - export MAKEOPTS="-j1" - - cmake_src_configure -} diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild deleted file mode 100644 index e175e9f49681..000000000000 --- a/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_MAKEFILE_GENERATOR=emake - -inherit cmake cuda toolchain-funcs - -MY_PV="$(ver_rs "1-3" '_')" -DESCRIPTION="An Open-Source subdivision surface library" -HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html" -SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/OpenSubdiv-${MY_PV}" - -# Modfied Apache-2.0 license, where section 6 has been replaced. -# See for example CMakeLists.txt for details. -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="cuda examples opencl openmp ptex tbb test tutorials" -RESTRICT="!test? ( test )" - -RDEPEND=" - media-libs/glew:= - media-libs/glfw:= - x11-libs/libXinerama - cuda? ( dev-util/nvidia-cuda-toolkit:* ) - opencl? ( virtual/opencl ) - ptex? ( media-libs/ptex ) -" -DEPEND=" - ${RDEPEND} - tbb? ( <dev-cpp/tbb-2021.4.0:= ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch" - "${FILESDIR}/${PN}-3.4.3-install-tutorials-into-bin.patch" - "${FILESDIR}/${P}-add-CUDA11-compatibility.patch" -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - cmake_src_prepare - - use cuda && cuda_src_prepare -} - -src_configure() { - # GLTESTS are disabled as portage is unable to open a display during test phase - # TODO: virtx work? - local mycmakeargs=( - -DGLEW_LOCATION="${ESYSROOT}/usr/$(get_libdir)" - -DGLFW_LOCATION="${ESYSROOT}/usr/$(get_libdir)" - -DNO_CLEW=ON - -DNO_CUDA=$(usex !cuda) - # Docs needed Python 2 so disabled - # bug #815172 - -DNO_DOC=ON - -DNO_EXAMPLES=$(usex !examples) - -DNO_GLTESTS=ON - -DNO_OMP=$(usex !openmp) - -DNO_OPENCL=$(usex !opencl) - -DNO_PTEX=$(usex !ptex) - -DNO_REGRESSION=$(usex !test) - -DNO_TBB=$(usex !tbb) - -DNO_TESTS=$(usex !test) - -DNO_TUTORIALS=$(usex !tutorials) - ) - - if use cuda; then - # old cmake CUDA module doesn't use environment variable to initialize flags - mycmakeargs+=( -DCUDA_NVCC_FLAGS="${NVCCFLAGS}" ) - - # check if user provided --gpu-architecture/-arch flag and prevent cmake from overriding it if so - for f in ${NVCCFLAGS}; do - if [[ ${f} == -arch* || ${f} == --gpu-architecture* ]]; then - mycmakeargs+=( -DOSD_CUDA_NVCC_FLAGS="" ) - break - fi - done - fi - - cmake_src_configure -} diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild b/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild index 524b64930836..97c11871340d 100644 --- a/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild +++ b/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/OpenSubdiv-${MY_PV}" # See for example CMakeLists.txt for details. LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="cuda examples opencl openmp ptex tbb test tutorials" RESTRICT="!test? ( test )" |