Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/
Date: Sun, 20 Feb 2022 21:10:25
Message-Id: 1645391400.c523e7434b40fd5c2ef22b41032d8e221f6ffef5.sam@gentoo
1 commit: c523e7434b40fd5c2ef22b41032d8e221f6ffef5
2 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
3 AuthorDate: Fri Feb 18 13:23:46 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 20 21:10:00 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c523e743
7
8 media-gfx/openvdb: enable CUDA support for NanoVDB
9
10 Also relaxes the dependency on tbb. We really only need >=tbb-2019.
11
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
14 Closes: https://github.com/gentoo/gentoo/pull/24238
15 Signed-off-by: Sam James <sam <AT> gentoo.org>
16
17 media-gfx/openvdb/metadata.xml | 3 +++
18 .../{openvdb-9.0.0-r2.ebuild => openvdb-9.0.0-r3.ebuild} | 14 +++++++++++---
19 2 files changed, 14 insertions(+), 3 deletions(-)
20
21 diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
22 index abb456e35583..50b4f6e0bbd9 100644
23 --- a/media-gfx/openvdb/metadata.xml
24 +++ b/media-gfx/openvdb/metadata.xml
25 @@ -18,6 +18,9 @@
26 <flag name="blosc">
27 Allow using blosc compression via <pkg>dev-libs/c-blosc</pkg>
28 </flag>
29 + <flag name="cuda">
30 + Enable support for CUDA in NanoVDB.
31 + </flag>
32 <flag name="nanovdb">
33 A lightweight, header only, and GPU friendly version of VDB.
34 </flag>
35
36 diff --git a/media-gfx/openvdb/openvdb-9.0.0-r2.ebuild b/media-gfx/openvdb/openvdb-9.0.0-r3.ebuild
37 similarity index 88%
38 rename from media-gfx/openvdb/openvdb-9.0.0-r2.ebuild
39 rename to media-gfx/openvdb/openvdb-9.0.0-r3.ebuild
40 index 1c94b6577b39..76343741a986 100644
41 --- a/media-gfx/openvdb/openvdb-9.0.0-r2.ebuild
42 +++ b/media-gfx/openvdb/openvdb-9.0.0-r3.ebuild
43 @@ -14,16 +14,17 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
44 LICENSE="MPL-2.0"
45 SLOT="0/9"
46 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
47 -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"
48 +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"
49 RESTRICT="!test? ( test )"
50
51 REQUIRED_USE="
52 numpy? ( python )
53 + cuda? ( nanovdb )
54 ^^ ( abi6-compat abi7-compat abi8-compat abi9-compat )
55 python? ( ${PYTHON_REQUIRED_USE} )
56 "
57 RDEPEND="
58 - >=dev-cpp/tbb-2021.4.0:=
59 + >=dev-cpp/tbb-2020.3:=
60 dev-libs/boost:=
61 dev-libs/jemalloc:=
62 dev-libs/log4cplus:=
63 @@ -37,6 +38,7 @@ RDEPEND="
64 x11-libs/libXinerama
65 x11-libs/libXrandr
66 blosc? ( dev-libs/c-blosc:= )
67 + cuda? ( >=dev-util/nvidia-cuda-toolkit-11 )
68 python? (
69 ${PYTHON_DEPS}
70 $(python_gen_cond_dep '
71 @@ -62,7 +64,6 @@ BDEPEND="
72 "
73
74 PATCHES=(
75 - "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
76 "${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
77 "${FILESDIR}/${PN}-9.0.0-fix-atomic.patch"
78 "${FILESDIR}/${PN}-9.0.0-numpy.patch"
79 @@ -109,6 +110,13 @@ src_configure() {
80 -DUSE_NANOVDB=$(usex nanovdb)
81 )
82
83 + if use nanovdb; then
84 + mycmakeargs+=(
85 + -DNANOVDB_BUILD_UNITTESTS=$(usex test)
86 + -DNANOVDB_USE_CUDA=$(usex cuda)
87 + )
88 + fi
89 +
90 if use python; then
91 mycmakeargs+=(
92 -DOPENVDB_BUILD_PYTHON_MODULE=ON