commit: 05d3ddad7b4f20d1a0bc2931498ec5aa1d6bc3e5 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Sun Apr 27 23:04:45 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Apr 27 23:39:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d3ddad
media-gfx/openvdb: backport gcc-15 fixes Closes: https://bugs.gentoo.org/938253 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/openvdb/Manifest | 1 + media-gfx/openvdb/openvdb-11.0.0-r1.ebuild | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index e2cb868f6987..05f3290b9538 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -1 +1,2 @@ +DIST openvdb-11.0.0-drop-obsolete-isActive-gcc15.patch 3410 BLAKE2B ac63f3bd72891bdc2f51eccceb37fb7077e215edd8474457618f5b49c5603fdbb68ed6a80ce18e0c55107beb10d7517b88c9995c3326520a644c339025bbcc2e SHA512 393d47f98240d1340660461cc4d0bc4882d404302c5944a60e9fa1269bc07060f386280cd617232fffe788ac05a74f88fe2b5f6420b4b2393a1d82bd7fc6a465 DIST openvdb-11.0.0.tar.gz 4620858 BLAKE2B b970167fffa10f28f89c0a3497c7a6076462702c7ede6aacc098239a81f5f09f408b56c37f84ea68e301cedff24920f02a6d08c1f00a2b9ca48925ef7cdc85c7 SHA512 f2c90ca8435ecbacefda429341000ecb555385c746a3e0233220cd78540cee2a26cc17df7b560fdfe2dc03f2b2e960a2fa226a85980189c3e018164ccc037bd4 diff --git a/media-gfx/openvdb/openvdb-11.0.0-r1.ebuild b/media-gfx/openvdb/openvdb-11.0.0-r1.ebuild index 62d7736e4229..e9f2f12da7f5 100644 --- a/media-gfx/openvdb/openvdb-11.0.0-r1.ebuild +++ b/media-gfx/openvdb/openvdb-11.0.0-r1.ebuild @@ -11,7 +11,11 @@ inherit cmake cuda flag-o-matic llvm-r2 multibuild python-single-r1 toolchain-fu DESCRIPTION="Library for the efficient manipulation of volumetric data" HOMEPAGE="https://www.openvdb.org"; -SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/AcademySoftwareFoundation/openvdb/commit/930c3acb8e0c7c2f1373f3a70dc197f5d04dfe74.patch + -> ${PN}-11.0.0-drop-obsolete-isActive-gcc15.patch +" LICENSE="MPL-2.0" OPENVDB_ABI=$(ver_cut 1) @@ -193,6 +197,16 @@ src_prepare() { sed \ -e 's#message(WARNING " - OpenVDB required to build#message(VERBOSE " - OpenVDB required to build#g' \ -i "nanovdb/nanovdb/"*"/CMakeLists.txt" || die + + # backported gcc-15 fix #938253 + cp "${DISTDIR}/${PN}-11.0.0-drop-obsolete-isActive-gcc15.patch" "${T}" || die + + sed -e "s#nanovdb/nanovdb/tools/GridBuilder.h#nanovdb/nanovdb/util/GridBuilder.h#g" \ + -i "${T}/${PN}-11.0.0-drop-obsolete-isActive-gcc15.patch" || die + + eapply "${T}/${PN}-11.0.0-drop-obsolete-isActive-gcc15.patch" + + sed -e '24i #include <iomanip>' -i nanovdb/nanovdb/unittest/TestNanoVDB.cu || die fi cmake_src_prepare
