[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/

["Sam James" <sam@gentoo.org>]

commit:     c523e7434b40fd5c2ef22b41032d8e221f6ffef5
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Feb 18 13:23:46 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 21:10:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c523e743

media-gfx/openvdb: enable CUDA support for NanoVDB

Also relaxes the dependency on tbb. We really only need >=tbb-2019.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24238
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/openvdb/metadata.xml                             |  3 +++
 .../{openvdb-9.0.0-r2.ebuild => openvdb-9.0.0-r3.ebuild}   | 14 +++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index abb456e35583..50b4f6e0bbd9 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -18,6 +18,9 @@
 		<flag name="blosc">
 			Allow using blosc compression via <pkg>dev-libs/c-blosc</pkg>
 		</flag>
+		<flag name="cuda">
+			Enable support for CUDA in NanoVDB.
+		</flag>
 		<flag name="nanovdb">
 			A lightweight, header only, and GPU friendly version of VDB.
 		</flag>

diff --git a/media-gfx/openvdb/openvdb-9.0.0-r2.ebuild b/media-gfx/openvdb/openvdb-9.0.0-r3.ebuild
similarity index 88%
rename from media-gfx/openvdb/openvdb-9.0.0-r2.ebuild
rename to media-gfx/openvdb/openvdb-9.0.0-r3.ebuild
index 1c94b6577b39..76343741a986 100644
--- a/media-gfx/openvdb/openvdb-9.0.0-r2.ebuild
+++ b/media-gfx/openvdb/openvdb-9.0.0-r3.ebuild
@@ -14,16 +14,17 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
 LICENSE="MPL-2.0"
 SLOT="0/9"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc doc +nanovdb numpy python static-libs test utils zlib abi6-compat abi7-compat abi8-compat +abi9-compat"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc cuda doc +nanovdb numpy python static-libs test utils zlib abi6-compat abi7-compat abi8-compat +abi9-compat"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	numpy? ( python )
+	cuda? ( nanovdb )
 	^^ ( abi6-compat abi7-compat abi8-compat abi9-compat )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 RDEPEND="
-	>=dev-cpp/tbb-2021.4.0:=
+	>=dev-cpp/tbb-2020.3:=
 	dev-libs/boost:=
 	dev-libs/jemalloc:=
 	dev-libs/log4cplus:=
@@ -37,6 +38,7 @@ RDEPEND="
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	blosc? ( dev-libs/c-blosc:= )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-11 )
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
@@ -62,7 +64,6 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
 	"${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
 	"${FILESDIR}/${PN}-9.0.0-fix-atomic.patch"
 	"${FILESDIR}/${PN}-9.0.0-numpy.patch"
@@ -109,6 +110,13 @@ src_configure() {
 		-DUSE_NANOVDB=$(usex nanovdb)
 	)
 
+	if use nanovdb; then
+		mycmakeargs+=(
+			-DNANOVDB_BUILD_UNITTESTS=$(usex test)
+			-DNANOVDB_USE_CUDA=$(usex cuda)
+		)
+	fi
+
 	if use python; then
 		mycmakeargs+=(
 			-DOPENVDB_BUILD_PYTHON_MODULE=ON