gentoo auto-resync : 07:04:2023 - 17:30:27

6 files changed, 118 insertions, 41 deletions

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 7f9f53469d25..838c4b171013 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1,7 +1,9 @@
-AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82948be891654923adae6a2e4f870857e357478f92cb9a239c282f0d09f75f6f2a58682c50d8f437989859710668071b46b1cde499424 SHA512 4f463fbea3e94e93711888a077faa375054aae193abfbe4c600081fae43efa4adf5dc5687ceb7c59795c20ae97ec158ce4035e72dfdb0c89ee5943e41e58bdef
-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
+AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1016 BLAKE2B 5ad9316a1ec44cff3ac8522dc159bd001139e58ec7141c13b772dec2567c068da428a3c5f54f49727b086e02c3369a5d2324aa09d9044e2ee5552f9f152eae7f SHA512 1d493d53ba10a53097448d0274a5ae3202a491153c6be273fe2cbf03c57b1ab90d76c064f51f3f5bc99fd5c97537b46f046e3dafee8f388ffef37e124bc27b92
+AUX opensubdiv-3.4.3-install-tutorials-into-bin.patch 1426 BLAKE2B 8e0e024d6b72d280dd338925fc6be89b9c3f940c01f43340f21865f502e5b3cdf2462e8a4ad95d2463f6213f7b8d1cc6dbc6c66d0e85c98bcf8fb25576a6f8e0 SHA512 f8bb3c120f6d7c386d2aff6bd40049f70840caea2cd0ed6d90398516effb3cbe9c983ccc75afee3232ac1a8cd98dda63bd0863b84f409d97ad81a9b5350e721e
+AUX opensubdiv-3.4.4-add-CUDA11-compatibility.patch 775 BLAKE2B 0384b5aa727ac93ee159c392a6faa4fc39b49ed4f6f99fb95bac18b7bc071a018759d99dd75b0c2ccc5870e5a55b1c6e6b0c9606bd80d5b6309b6fcbeee422c8 SHA512 aba25d357c3114edeca42209d1e970c76505b2f87ac9690864b096bffc4054cf0d7bbcb7e8828e5c98abf4658d423396a8d84b06fc7e24d732d7a86cfa7d7ff9
+AUX opensubdiv-3.4.4-tbb-2021.patch 1730 BLAKE2B 165abbae9a5283a064deff6eb1c36370ed1d61f61c556bc3aa291ba20adfb1e242a8b254d596ffdfcb21a1f9ede5c40cdcfb562e4b38e1766a87dedf2a72a580 SHA512 6934bfd09fa086c6599c0c2727a93d6db14642271845eff261f93c7958daf4fa3464bffdf927308bc328357377f6dad8e413979360fa307101c75dad6932f0be
 DIST opensubdiv-3.4.4.tar.gz 39228037 BLAKE2B 53bada3ff2652c6041a3becaf037b593c0e1e4c1bd57a285e6c068c11060b06f9ab0617284a57d0e8974f80082abd6563930ede8b1d6bfb801bfa61dd3256445 SHA512 fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb
+DIST opensubdiv-3.5.0.tar.gz 40740801 BLAKE2B 08ad5cdc4b38b9862e62a8871fa1ed9ee5d9ff3b617c1f5627c2b773804d207028e29517d3e7015c8712b5f8ac378f3e35811de2c67711ff4a320d00bd6ce1a7 SHA512 7ede8f3f335a6306486d649199117401ab4285d360a3b53a536f25046d94741b5e7eacbc06a55d8a0bd5798c810c1b3cfd7964859f04f95363ad26411310b320
 EBUILD opensubdiv-3.4.4-r3.ebuild 2446 BLAKE2B 0f613fee98fa1feae0aa4dd2f29aec068147ff966d543af80cc5a6cad8c841d2a824f2d70708fdff7b27b3371085fdbcf95eced07d0069386ca521e65684079a SHA512 23e04d277443f66a777acebfed7ca85ac4da09ae53ef5a3eca1eaf4116209227550542a4175cc27c085ca5334033ea5980456ad66ac8c40f53f29b07451773e6
+EBUILD opensubdiv-3.5.0.ebuild 2454 BLAKE2B 13a8f49887bd963e0be2f145b60827815381591f423ad662ae28cd296205bb473c3821682f3cda11f6b59b459348d55cdfc58ba95fd8e0d5f4dcceb6c33760d9 SHA512 1f98c1acfeeceb966f0ab653e4bff6df1e94791d1b0eb619a173252b5263593dee564f14f5ed61532372594caa223a8535fa3ae2a9b862bfcfec9caf065daf02
 MISC metadata.xml 1036 BLAKE2B cc36d0e341535d825d18bc4485cadd6c46b907bacc5fb52421aecd4e194cae73165d9708502dff6ac748396176df6a29c2920b99cb2eb9f841ff26b5de1eb916 SHA512 057a0aa062daed49dcab313aaf049a1ce41a10fa98e6c73c809e7d441689505db27bc0f52785c407226f642c69f65b54a211bccd1690f43eb6f4246faef94984
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch b/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch
index 02027763f5ca..024d2f7138f0 100644
--- a/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch
+++ b/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch
@@ -1,6 +1,5 @@
-diff -purN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2017-07-25 21:58:09.000000000 +0100
-+++ b/CMakeLists.txt	2017-08-15 14:51:36.771044414 +0100
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -23,6 +23,7 @@
  #
  
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.4.3-install-tutorials-into-bin.patch b/media-libs/opensubdiv/files/opensubdiv-3.4.3-install-tutorials-into-bin.patch
index f042967a01af..ff7b7b6563f5 100644
--- a/media-libs/opensubdiv/files/opensubdiv-3.4.3-install-tutorials-into-bin.patch
+++ b/media-libs/opensubdiv/files/opensubdiv-3.4.3-install-tutorials-into-bin.patch
@@ -1,6 +1,5 @@
-diff -Naur a/tutorials/far/CMakeLists.txt b/tutorials/far/CMakeLists.txt
---- a/tutorials/far/CMakeLists.txt	2020-05-11 14:48:35.145797436 +1000
-+++ b/tutorials/far/CMakeLists.txt	2020-05-11 14:49:39.445969003 +1000
+--- a/tutorials/far/CMakeLists.txt
++++ b/tutorials/far/CMakeLists.txt
 @@ -30,7 +30,7 @@
          $<TARGET_OBJECTS:far_obj>
       )
@@ -10,9 +9,8 @@ diff -Naur a/tutorials/far/CMakeLists.txt b/tutorials/far/CMakeLists.txt
  
  endmacro()
  
-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-11 14:48:35.145797436 +1000
-+++ b/tutorials/hbr/tutorial_0/CMakeLists.txt	2020-05-11 14:50:38.076125987 +1000
+--- a/tutorials/hbr/tutorial_0/CMakeLists.txt
++++ b/tutorials/hbr/tutorial_0/CMakeLists.txt
 @@ -30,5 +30,5 @@
      ${SOURCE_FILES}
  )
@@ -20,9 +18,8 @@ diff -Naur a/tutorials/hbr/tutorial_0/CMakeLists.txt b/tutorials/hbr/tutorial_0/
 -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-11 14:48:35.145797436 +1000
-+++ b/tutorials/hbr/tutorial_1/CMakeLists.txt	2020-05-11 14:50:10.406051839 +1000
+--- a/tutorials/hbr/tutorial_1/CMakeLists.txt
++++ b/tutorials/hbr/tutorial_1/CMakeLists.txt
 @@ -30,5 +30,5 @@
      ${SOURCE_FILES}
  )
@@ -30,9 +27,8 @@ diff -Naur a/tutorials/hbr/tutorial_1/CMakeLists.txt b/tutorials/hbr/tutorial_1/
 -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-11 14:48:35.145797436 +1000
-+++ b/tutorials/hbr/tutorial_2/CMakeLists.txt	2020-05-11 14:50:20.706079428 +1000
+--- a/tutorials/hbr/tutorial_2/CMakeLists.txt
++++ b/tutorials/hbr/tutorial_2/CMakeLists.txt
 @@ -30,5 +30,5 @@
      ${SOURCE_FILES}
  )
@@ -40,9 +36,8 @@ diff -Naur a/tutorials/hbr/tutorial_2/CMakeLists.txt b/tutorials/hbr/tutorial_2/
 -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-11 14:48:35.145797436 +1000
-+++ b/tutorials/osd/tutorial_0/CMakeLists.txt	2020-05-11 14:50:51.446161856 +1000
+--- a/tutorials/osd/tutorial_0/CMakeLists.txt
++++ b/tutorials/osd/tutorial_0/CMakeLists.txt
 @@ -35,5 +35,5 @@
      osd_static_cpu
  )
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch b/media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch
index 8f5bfab43a92..c1cf2981e2ea 100644
--- a/media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch
+++ b/media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch
@@ -1,9 +1,6 @@
-From: "Alexander Golubev" <fatzer2@gmail.com>
-
-Set correct default minimal -arch for CUDA 9 and 11
---- OpenSubdiv-3_4_4/CMakeLists.txt     2021-11-07 02:01:07.899484952 +0300
-+++ OpenSubdiv-3_4_4/CMakeLists.txt.new 2021-11-07 02:01:23.402764409 +0300
-@@ -587,8 +587,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -590,8 +590,14 @@ 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 )
@@ -12,8 +9,10 @@ Set correct default minimal -arch for CUDA 9 and 11
                  set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_20 )
 +            elseif (CUDA_VERSION_MAJOR LESS 11)
 +                set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_30 )
-+            else()
++            elseif (CUDA_VERSION_MAJOR LESS 12)
 +                set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_35 )
++            else()
++                set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_50 )
              endif()
          endif()
      endif()
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.4.4-tbb-2021.patch b/media-libs/opensubdiv/files/opensubdiv-3.4.4-tbb-2021.patch
index bae9c4a9d1f1..e14780ec139c 100644
--- a/media-libs/opensubdiv/files/opensubdiv-3.4.4-tbb-2021.patch
+++ b/media-libs/opensubdiv/files/opensubdiv-3.4.4-tbb-2021.patch
@@ -6,12 +6,6 @@ From: Artur Sinila <freesoftware@logarithmus.dev>
 Date: Sun, 25 Jul 2021 20:34:48 +0300
 Subject: [PATCH 1/2] Fix typo: schedular -> scheduler
 
----
- opensubdiv/osd/tbbEvaluator.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/opensubdiv/osd/tbbEvaluator.h b/opensubdiv/osd/tbbEvaluator.h
-index 6bd365bc5..886a94837 100644
 --- a/opensubdiv/osd/tbbEvaluator.h
 +++ b/opensubdiv/osd/tbbEvaluator.h
 @@ -1226,7 +1226,7 @@ class TbbEvaluator {
@@ -29,12 +23,6 @@ From: Artur Sinila <freesoftware@logarithmus.dev>
 Date: Sun, 25 Jul 2021 20:58:27 +0300
 Subject: [PATCH 2/2] Support oneTBB 2021
 
----
- opensubdiv/osd/tbbEvaluator.cpp | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
-index c98db9f6d..66c2ed58f 100644
 --- a/opensubdiv/osd/tbbEvaluator.cpp
 +++ b/opensubdiv/osd/tbbEvaluator.cpp
 @@ -25,7 +25,8 @@
diff --git a/media-libs/opensubdiv/opensubdiv-3.5.0.ebuild b/media-libs/opensubdiv/opensubdiv-3.5.0.ebuild
new file mode 100644
index 000000000000..2c8da240d86e
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.5.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 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:= )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+	"${FILESDIR}/${PN}-3.4.3-install-tutorials-into-bin.patch"
+	"${FILESDIR}/${PN}-3.4.4-add-CUDA11-compatibility.patch"
+	"${FILESDIR}/${PN}-3.4.4-tbb-2021.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
+}