diff options
5 files changed, 0 insertions, 298 deletions
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest index 3d73323cadbf..9d551e63ade9 100644 --- a/media-libs/opensubdiv/Manifest +++ b/media-libs/opensubdiv/Manifest @@ -1,2 +1 @@ -DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 05e25f28a6f2194122d9d4e5299e6d68e236c1e78b4e8494a70191dfb37e45da30968322719bbb784a15d698206fea9e26e92d4689668592bc9ec9bccbc0201d SHA512 65cd72b4240eeb3fdb6d52497a2daa2fc68e10c25c41ffa0cf81449ebcb860e303539043c672265916267a0115f250566570b5705fd5da54f46abe7b9f7baf81 DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed SHA512 44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2 diff --git a/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch b/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch deleted file mode 100644 index 2b5c71a37cb5..000000000000 --- a/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e02ce90c..6d4f5342 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -48,7 +48,7 @@ endif() - string(REGEX REPLACE "^v" "" OSD_SONAME ${OSD_SONAME}) - - add_definitions( -- -DOPENSUBDIV_VERSION_STRING="${OSD_SONAME}" -+ -DOPENSUBDIV_VERSION_STRING=\\\"${OSD_SONAME}\\\" - ) - - #------------------------------------------------------------------------------- diff --git a/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch b/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch deleted file mode 100644 index ec63f47b4404..000000000000 --- a/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Naur a/tutorials/far/tutorial_0/CMakeLists.txt b/tutorials/far/tutorial_0/CMakeLists.txt ---- a/tutorials/far/tutorial_0/CMakeLists.txt 2020-05-13 16:06:02.537792402 +1000 -+++ b/tutorials/far/tutorial_0/CMakeLists.txt 2020-05-13 16:06:40.857855388 +1000 -@@ -33,5 +33,5 @@ - $<TARGET_OBJECTS:far_obj> - ) - --install(TARGETS far_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials") -+install(TARGETS far_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}") - -diff -Naur a/tutorials/far/tutorial_1/CMakeLists.txt b/tutorials/far/tutorial_1/CMakeLists.txt ---- a/tutorials/far/tutorial_1/CMakeLists.txt 2020-05-13 16:06:02.537792402 +1000 -+++ b/tutorials/far/tutorial_1/CMakeLists.txt 2020-05-13 16:06:53.137874901 +1000 -@@ -33,5 +33,5 @@ - $<TARGET_OBJECTS:far_obj> - ) - --install(TARGETS far_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials") -+install(TARGETS far_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}") - -diff -Naur a/tutorials/far/tutorial_2/CMakeLists.txt b/tutorials/far/tutorial_2/CMakeLists.txt ---- a/tutorials/far/tutorial_2/CMakeLists.txt 2020-05-13 16:06:02.537792402 +1000 -+++ b/tutorials/far/tutorial_2/CMakeLists.txt 2020-05-13 16:07:04.297892363 +1000 -@@ -33,5 +33,5 @@ - $<TARGET_OBJECTS:far_obj> - ) - --install(TARGETS far_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials") -+install(TARGETS far_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}") - -diff -Naur a/tutorials/far/tutorial_3/CMakeLists.txt b/tutorials/far/tutorial_3/CMakeLists.txt ---- a/tutorials/far/tutorial_3/CMakeLists.txt 2020-05-13 16:06:02.537792402 +1000 -+++ b/tutorials/far/tutorial_3/CMakeLists.txt 2020-05-13 16:07:20.377917078 +1000 -@@ -33,5 +33,5 @@ - $<TARGET_OBJECTS:far_obj> - ) - --install(TARGETS far_tutorial_3 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials") -+install(TARGETS far_tutorial_3 DESTINATION "${CMAKE_BINDIR_BASE}") - -diff -Naur a/tutorials/far/tutorial_4/CMakeLists.txt b/tutorials/far/tutorial_4/CMakeLists.txt ---- a/tutorials/far/tutorial_4/CMakeLists.txt 2020-05-13 16:06:02.537792402 +1000 -+++ b/tutorials/far/tutorial_4/CMakeLists.txt 2020-05-13 16:07:36.727941691 +1000 -@@ -33,5 +33,5 @@ - $<TARGET_OBJECTS:far_obj> - ) - --install(TARGETS far_tutorial_4 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials") -+install(TARGETS far_tutorial_4 DESTINATION "${CMAKE_BINDIR_BASE}") - -diff -Naur a/tutorials/far/tutorial_5/CMakeLists.txt b/tutorials/far/tutorial_5/CMakeLists.txt ---- a/tutorials/far/tutorial_5/CMakeLists.txt 2020-05-13 16:06:02.537792402 +1000 -+++ b/tutorials/far/tutorial_5/CMakeLists.txt 2020-05-13 16:07:44.797953646 +1000 -@@ -33,5 +33,5 @@ - $<TARGET_OBJECTS:far_obj> - ) - --install(TARGETS far_tutorial_5 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials") -+install(TARGETS far_tutorial_5 DESTINATION "${CMAKE_BINDIR_BASE}") - -diff -Naur a/tutorials/far/tutorial_6/CMakeLists.txt b/tutorials/far/tutorial_6/CMakeLists.txt ---- a/tutorials/far/tutorial_6/CMakeLists.txt 2020-05-13 16:06:02.537792402 +1000 -+++ b/tutorials/far/tutorial_6/CMakeLists.txt 2020-05-13 16:07:53.847966914 +1000 -@@ -33,5 +33,5 @@ - $<TARGET_OBJECTS:far_obj> - ) - --install(TARGETS far_tutorial_6 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials") -+install(TARGETS far_tutorial_6 DESTINATION "${CMAKE_BINDIR_BASE}") - -diff -Naur a/tutorials/far/tutorial_7/CMakeLists.txt b/tutorials/far/tutorial_7/CMakeLists.txt ---- a/tutorials/far/tutorial_7/CMakeLists.txt 2020-05-13 16:06:02.537792402 +1000 -+++ b/tutorials/far/tutorial_7/CMakeLists.txt 2020-05-13 16:08:02.047978804 +1000 -@@ -33,5 +33,5 @@ - $<TARGET_OBJECTS:far_obj> - ) - --install(TARGETS far_tutorial_7 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials") -+install(TARGETS far_tutorial_7 DESTINATION "${CMAKE_BINDIR_BASE}") - -diff -Naur a/tutorials/far/tutorial_8/CMakeLists.txt b/tutorials/far/tutorial_8/CMakeLists.txt ---- a/tutorials/far/tutorial_8/CMakeLists.txt 2020-05-13 16:06:02.537792402 +1000 -+++ b/tutorials/far/tutorial_8/CMakeLists.txt 2020-05-13 16:08:16.287999162 +1000 -@@ -33,5 +33,5 @@ - $<TARGET_OBJECTS:far_obj> - ) - --install(TARGETS far_tutorial_8 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials") -+install(TARGETS far_tutorial_8 DESTINATION "${CMAKE_BINDIR_BASE}") - -diff -Naur a/tutorials/hbr/tutorial_0/CMakeLists.txt b/tutorials/hbr/tutorial_0/CMakeLists.txt ---- a/tutorials/hbr/tutorial_0/CMakeLists.txt 2020-05-13 16:06:02.537792402 +1000 -+++ b/tutorials/hbr/tutorial_0/CMakeLists.txt 2020-05-13 16:08:37.278028518 +1000 -@@ -30,5 +30,5 @@ - ${SOURCE_FILES} - ) - --install(TARGETS hbr_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials") -+install(TARGETS hbr_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}") - -diff -Naur a/tutorials/hbr/tutorial_1/CMakeLists.txt b/tutorials/hbr/tutorial_1/CMakeLists.txt ---- a/tutorials/hbr/tutorial_1/CMakeLists.txt 2020-05-13 16:06:02.537792402 +1000 -+++ b/tutorials/hbr/tutorial_1/CMakeLists.txt 2020-05-13 16:08:45.028039168 +1000 -@@ -30,5 +30,5 @@ - ${SOURCE_FILES} - ) - --install(TARGETS hbr_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials") -+install(TARGETS hbr_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}") - -diff -Naur a/tutorials/hbr/tutorial_2/CMakeLists.txt b/tutorials/hbr/tutorial_2/CMakeLists.txt ---- a/tutorials/hbr/tutorial_2/CMakeLists.txt 2020-05-13 16:06:02.537792402 +1000 -+++ b/tutorials/hbr/tutorial_2/CMakeLists.txt 2020-05-13 16:08:54.138051562 +1000 -@@ -30,5 +30,5 @@ - ${SOURCE_FILES} - ) - --install(TARGETS hbr_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials") -+install(TARGETS hbr_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}") - -diff -Naur a/tutorials/osd/tutorial_0/CMakeLists.txt b/tutorials/osd/tutorial_0/CMakeLists.txt ---- a/tutorials/osd/tutorial_0/CMakeLists.txt 2020-05-13 16:06:02.537792402 +1000 -+++ b/tutorials/osd/tutorial_0/CMakeLists.txt 2020-05-13 16:09:10.748073802 +1000 -@@ -35,5 +35,5 @@ - osd_static_cpu - ) - --install(TARGETS osd_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials") -+install(TARGETS osd_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}") - diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild deleted file mode 100644 index 92f1b42c70ad..000000000000 --- a/media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2020 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 ~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 ) -" -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.3.3.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild deleted file mode 100644 index cbbf0be097d8..000000000000 --- a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils toolchain-funcs eapi7-ver - -MY_PV="$(ver_rs "1-3" '_')" -DESCRIPTION="An Open-Source subdivision surface library" -HOMEPAGE="http://graphics.pixar.com/opensubdiv/" -SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="cuda doc opencl openmp ptex tbb" - -RDEPEND="media-libs/glew:= - media-libs/glfw:= - cuda? ( dev-util/nvidia-cuda-toolkit:* ) - opencl? ( virtual/opencl ) - ptex? ( media-libs/ptex )" - -DEPEND="${RDEPEND} - doc? ( - dev-python/docutils - app-doc/doxygen - ) - tbb? ( dev-cpp/tbb )" - -S="${WORKDIR}/OpenSubdiv-${MY_PV}" - -PATCHES=( - "${FILESDIR}/${PN}-3.3.0-fix-quotes.patch" - "${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch" - "${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch" -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - local mycmakeargs=( - -DNO_CLEW=1 - -DNO_DOC=$(usex !doc) - -DNO_TBB=$(usex !tbb) - -DNO_PTEX=$(usex !ptex) - -DNO_OMP=$(usex !openmp) - -DNO_OPENCL=$(usex !opencl) - -DNO_CUDA=$(usex !cuda) - -DNO_REGRESSION=1 # They don't work with certain settings - -DNO_EXAMPLES=1 # Not needed. - -DNO_TUTORIALS=1 # They install illegally. Need to find a better solution. - -DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)" - -DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)" - ) - - cmake-utils_src_configure -} |