commit: d6da82759343230f6dcb8a3e07c8e1faf06bde57 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Mar 20 17:01:22 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Mar 20 17:01:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6da8275
media-libs/opensubdiv: drop 3.4.3-r1, 3.4.4-r1, 3.4.4-r2 Signed-off-by: David Seifert <soap <AT> gentoo.org> media-libs/opensubdiv/Manifest | 1 - .../opensubdiv-3.3.0-add-CUDA9-compatibility.patch | 25 ------ ...ocumentation-CMakeLists.txt-force-python2.patch | 51 ------------ media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild | 90 --------------------- media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild | 85 -------------------- media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild | 93 ---------------------- 6 files changed, 345 deletions(-) diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest index ab281bfc665a..7d76fbc02ece 100644 --- a/media-libs/opensubdiv/Manifest +++ b/media-libs/opensubdiv/Manifest @@ -1,2 +1 @@ -DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2 DIST opensubdiv-3.4.4.tar.gz 39228037 BLAKE2B 53bada3ff2652c6041a3becaf037b593c0e1e4c1bd57a285e6c068c11060b06f9ab0617284a57d0e8974f80082abd6563930ede8b1d6bfb801bfa61dd3256445 SHA512 fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb 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" <[email protected]> -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 <[email protected]> -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 <[email protected]> ---- - 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 -}
