From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4EF90158094 for ; Sun, 25 Sep 2022 01:27:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47784E0B9E; Sun, 25 Sep 2022 01:27:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31E62E0B9E for ; Sun, 25 Sep 2022 01:27:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 55583340E94 for ; Sun, 25 Sep 2022 01:27:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5BC55E9 for ; Sun, 25 Sep 2022 01:27:52 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1664069236.c098bb4532b66d37ee7bd1e1878d332711d008ad.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/openvdb/openvdb-9.0.0-r4.ebuild X-VCS-Directories: media-gfx/openvdb/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c098bb4532b66d37ee7bd1e1878d332711d008ad X-VCS-Branch: master Date: Sun, 25 Sep 2022 01:27:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 16ed92c3-e74f-409f-89ff-8ff5aa558b37 X-Archives-Hash: 3dce3e635eed1fdaa5c802ceb8ea2db1 commit: c098bb4532b66d37ee7bd1e1878d332711d008ad Author: Bernd Waibel posteo net> AuthorDate: Sun Sep 11 08:05:05 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 25 01:27:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c098bb45 media-gfx/openvdb: fix build with cuda Allow write to /dev/nvidiactl for cmake configuration to work properly Remove abi6-compat USE flag. V6 ABI compatibility is not available in v9. Closes: https://bugs.gentoo.org/869629 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/27204 Signed-off-by: Sam James gentoo.org> media-gfx/openvdb/openvdb-9.0.0-r4.ebuild | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild b/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild index 8ec379c61a6d..f3a07f1665af 100644 --- a/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild +++ b/media-gfx/openvdb/openvdb-9.0.0-r4.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{8,9,10} ) -inherit cmake python-single-r1 +inherit cmake cuda python-single-r1 DESCRIPTION="Library for the efficient manipulation of volumetric data" HOMEPAGE="https://www.openvdb.org" @@ -14,13 +14,13 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g LICENSE="MPL-2.0" SLOT="0/9" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -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" +IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc cuda doc +nanovdb numpy python static-libs test utils +zlib abi7-compat abi8-compat +abi9-compat" RESTRICT="!test? ( test )" REQUIRED_USE="blosc? ( zlib ) numpy? ( python ) cuda? ( nanovdb ) - ^^ ( abi6-compat abi7-compat abi8-compat abi9-compat ) + ^^ ( abi7-compat abi8-compat abi9-compat ) python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" @@ -74,13 +74,20 @@ pkg_setup() { use python && python-single-r1_pkg_setup } +src_prepare() { + cmake_src_prepare + + if use cuda; then + cuda_add_sandbox -w + cuda_src_prepare + fi +} + src_configure() { local myprefix="${EPREFIX}/usr/" local version - if use abi6-compat; then - version=6 - elif use abi7-compat; then + if use abi7-compat; then version=7 elif use abi8-compat; then version=8