gentoo resync : 25.12.2017

6 files changed, 28 insertions, 163 deletions

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 202e3450f554..f4d00b9945e0 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1,10 +1,6 @@
-AUX opensubdiv-3.1.0-skip-osd-regression.patch 1104 BLAKE2B cee6c6541ab125bee6c3e98e7322eb5b672fc564bb247146d785b2888948728da585b542d7381e674011e7f59a88aae12c85fcad11bf194400c92084cf17a217 SHA512 8e6ec60e10209b39ad9ebb66c4c43496250bf93a0fdfc4bebb502dd71fb3ada2b685521d94fb05eab3a09f5ced9c288292a338bb7e0159c940dd379ff05f873b
+AUX opensubdiv-3.3.0-add-CUDA9-compatibility.patch 897 BLAKE2B 528eaabdbe1613e6fde30f3e0688c64d796c599a7c9efa49575b817de559938344326b8606f9c9ed013a97c46037a49805ee1d1c27fa9beb78b3d9153771e119 SHA512 0a4c20dff82f6500019f45ef88539a32fb7e5b885d48c7108f05d6c018890518cd735e20a020cf058d47cf68e19f74e14e8496c5facabfa90e9401478d315ffa
 AUX opensubdiv-3.3.0-fix-quotes.patch 432 BLAKE2B e2b80762392cfe6b9ddb714780adbfffed3eb05feb5072c4b1856164eb01896eb9298723aac4bc032e0aaba8ec55d84bb1dfa6664f1def32af2bd93b553c396b SHA512 89eca174bf991920f71fd278e61f04bb90d143491ec05575507013215c92bca18f0274b6084d61750a66f877d928f01f0e779d08dd3b2372d8119aecaa8b58a9
 AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82948be891654923adae6a2e4f870857e357478f92cb9a239c282f0d09f75f6f2a58682c50d8f437989859710668071b46b1cde499424 SHA512 4f463fbea3e94e93711888a077faa375054aae193abfbe4c600081fae43efa4adf5dc5687ceb7c59795c20ae97ec158ce4035e72dfdb0c89ee5943e41e58bdef
-DIST opensubdiv-3.1.0.tar.gz 18014579 BLAKE2B 88f16e81eda8c1626b161f94160d02cda7027dff1ac9c795dfe9694250e707dfa106e564dfa22a18bfd3f5e355337626349b6a162c999c10c4d8c8695d03b925 SHA512 9b59cb4e5b124e222b67a48986251cff91bcdc2aee9f71c4b653ad7bb089e860c5954c251a91c0004fa5c28fc4524a0dcbf51d3ae51ea86ee7665ba05d8ec97f
-DIST opensubdiv-3.1.1.tar.gz 18014871 BLAKE2B 5f3a8a7cfb3f2c4cebb8dab1ea65dde1ac3ef6f42a9603e0fa8c89b2ecdd0f16809510b7b03f6a4c3b0fe522e7b07536a09ab476720d44cc7e4289ba1931beb8 SHA512 700db7e1dde3e916011721a5b42d5e32ea4ae355ab5e3e415541d62efa2059d56d5f30cef853285e95a93f3a3b5fe24a906547a52cce94d47b101ae20021d5b5
 DIST opensubdiv-3.3.0.tar.gz 19263469 BLAKE2B f169b5c58877d1dd4ea45cb04d52567803da7c2d11edab072e2b65583109c7c2d52abe07f5bd2b03cba215cdb524a0468900419d8381e95c35eb2f3f4bebe02b SHA512 7c17d847187d46182d08fbee9396fd8793ac04591821084d40da475c9d25560d01575282946e1a30252bba12db9ea06cbf50ff649f91adce72f6127ad6a36418
-EBUILD opensubdiv-3.1.0.ebuild 1420 BLAKE2B e93b376a5020ec8003454e327ea88171e372a716a49d732386697f959a9e6cf43d88f740517fc438a21e1465b95035680fd193055d4377825252956738d649c1 SHA512 c6312bb22d85c640ee743989c909a7e633f7a842c8e4ff48e81da08f013402f8db81621419035f3a708a9058af5f5e79b2a2dbf584242dba7c262170989611b2
-EBUILD opensubdiv-3.1.1.ebuild 1504 BLAKE2B 1fae9b504bc3e9cc32b2416e86aaba0136bb95929ac8d1f24fb38931a6a8307f425c2cd30da5bd972460fbca3e4ab144619618067110c23f53841bb646a8fdc1 SHA512 1a06bcf9d20f0225e116acaa91ceea96cbc36920cc506e13096e2f6fa983f708cfef598daa956556bb565ed0eeac5e108a7d1cb4464d4b02023faac9b95e384a
-EBUILD opensubdiv-3.3.0.ebuild 1607 BLAKE2B 66eb6116962dcf5da7b315e9e5939c429a3cd67a78a535ba86d7298445a1b258af094eb287df3a2bb460ac65e9f218aa184c0b5abc62af999e178774533281b3 SHA512 5f994b831f8ffb4dac17516b665b6ecdeb200c9166020f16594b7afcf901325974fb3609afff00db090a6c9d73256439fb707148a9a9745cb7dd862f027d106b
+EBUILD opensubdiv-3.3.0.ebuild 1657 BLAKE2B 7df1f323931b06d457a78feba70b7e309f8191dfa5eb9a93d0878d3ea362195b3d477296eecf3667490198069b9cafbf40c14c2912db1c171979179e64d6079e SHA512 aad9c619fe5b44ce3d9328a931b6628c0a17c93db9676818fa428697c11eef00b9b6b34e513d5faae60760cf5846cf1d8bc328f209bdf1ce9851a1ea1958f418
 MISC metadata.xml 1233 BLAKE2B b7402765b4d89783d432e03f5f49b814939a3304a3f22b24f2a966739bffba6beaf9d42507a5282f192a83e0934cffd23b1e7034c3ed657c90ca392873cf7edd SHA512 ba8bea121fb2eea03e86799777427771ef869f72fcad9540be276d581d49d7f368f90197fac049c9cac2829bbf2952071dec0afeee6100328a90fc862b96092b
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch b/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch
deleted file mode 100644
index 2ebb638e3838..000000000000
--- a/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -purN a/regression/CMakeLists.txt b/regression/CMakeLists.txt
---- a/regression/CMakeLists.txt	2016-03-25 22:15:29.000000000 +0000
-+++ b/regression/CMakeLists.txt	2016-06-05 14:09:19.202849569 +0100
-@@ -32,30 +32,4 @@ if (NOT NO_REGRESSION)
- 
-     add_subdirectory(far_perf)
- 
--    if(OPENGL_FOUND AND (GLEW_FOUND OR APPLE) AND GLFW_FOUND)
--        add_subdirectory(osd_regression)
--    else()
--        set(MISSING "")
--
--        if (NOT OPENGL_FOUND)
--            list(APPEND MISSING OpenGL)
--        endif()
--
--        if (NOT GLEW_FOUND)
--            list(APPEND MISSING glew)
--        endif()
--
--        if (NOT GLFW_FOUND)
--            list(APPEND MISSING glfw)
--        endif()
--
--        message(WARNING
--            "The following libraries could not be found : ${MISSING}.  "
--            "The osd regression test will not be available.  "
--            "If you have these libraries installed, please specify their "
--            "path to cmake (through the GLEW_LOCATION and GLFW_LOCATION "
--            "command line arguments or environment variables)."
--        )
--    endif()
--
- endif()
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
new file mode 100644
index 000000000000..9fe81c4ee199
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch
@@ -0,0 +1,25 @@
+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/opensubdiv-3.1.0.ebuild b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
deleted file mode 100644
index aa63d90eeda4..000000000000
--- a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils toolchain-funcs versionator
-
-DESCRIPTION="An Open-Source subdivision surface library"
-HOMEPAGE="http://graphics.pixar.com/opensubdiv/"
-
-MY_PV="$(replace_all_version_separators '_')"
-
-SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="cuda doc opencl openmp ptex tbb test"
-
-RDEPEND="media-libs/glew:=
-	media-libs/glfw:=
-	cuda? ( dev-util/nvidia-cuda-toolkit:* )
-	ptex? ( media-libs/ptex )"
-
-DEPEND="${RDEPEND}
-	tbb? ( dev-cpp/tbb )
-	doc? ( dev-python/docutils app-doc/doxygen )"
-
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}"/OpenSubdiv-${MY_PV}
-
-PATCHES=( "${FILESDIR}"/${P}-skip-osd-regression.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_MAYA=1
-		-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=$(usex !test)
-		-DNO_EXAMPLES=1 # broken
-		-DNO_TUTORIALS=1 # broken
-		-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-		-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild b/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild
deleted file mode 100644
index 5c1768b6b37c..000000000000
--- a/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils toolchain-funcs versionator
-
-DESCRIPTION="An Open-Source subdivision surface library"
-HOMEPAGE="http://graphics.pixar.com/opensubdiv/"
-
-MY_PV="$(replace_all_version_separators '_')"
-
-SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="cuda doc opencl openmp ptex tbb"
-
-RDEPEND="media-libs/glew:=
-	media-libs/glfw:=
-	cuda? ( dev-util/nvidia-cuda-toolkit:* )
-	ptex? ( media-libs/ptex )"
-
-DEPEND="${RDEPEND}
-	tbb? ( dev-cpp/tbb )
-	doc? ( dev-python/docutils app-doc/doxygen )"
-
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}"/OpenSubdiv-${MY_PV}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e 's|"${OSD_SONAME}"|${OSD_SONAME}|' \
-	    -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNO_MAYA=1
-		-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 # The don't work with certain settings
-		-DNO_EXAMPLES=1 # Broken
-		-DNO_TUTORIALS=1 # Broken
-		-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-		-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
index 1c1abebee365..f34298cd5960 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
@@ -32,6 +32,7 @@ S="${WORKDIR}/OpenSubdiv-${MY_PV}"
 PATCHES=(
 	"${FILESDIR}/${P}-fix-quotes.patch"
 	"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+	"${FILESDIR}/${P}-add-CUDA9-compatibility.patch"
 )
 
 pkg_pretend() {