diff options
Diffstat (limited to 'media-gfx/openvdb')
| -rw-r--r-- | media-gfx/openvdb/Manifest | 1 | ||||
| -rw-r--r-- | media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch | 111 | ||||
| -rw-r--r-- | media-gfx/openvdb/metadata.xml | 4 | ||||
| -rw-r--r-- | media-gfx/openvdb/openvdb-9.1.0.ebuild | 173 |
4 files changed, 289 insertions, 0 deletions
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index e9238716b63b..5650986bf6ab 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -4,3 +4,4 @@ DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B e65bd4710ff65e20570013399d1e71a32e8f80 DIST openvdb-8.1.0.tar.gz 2619432 BLAKE2B ba06e8dc24876da0ed1a2b5560e8793ad1e42b45b2018734c98c9b8f1d43bdb4aa098243a68de90efb18cb0454a9ea2a59c87f411d2c6492c5bce95dc047a6f0 SHA512 081ccedb122ff9bd73e0cd7ff083ad0ff0165e0cf6305187edcbe90ff12f01ec085c91ad5c52c53596035e0c2afd5b8801e6c00374b0fc4b0cc111f5c7f37eb5 DIST openvdb-8.2.0.tar.gz 2656278 BLAKE2B b381459fb770800bb03bc8a6b3122c6684ab508f11be024e0eb3951bfbcef14e626e2d4468e91ea17fd6792f23810eafe8b05e19d46eb0e6200c73ccf296116a SHA512 aed6b5884a9cfd42f72357ad090c5dcf7829b0e5672ab61e31206e889c085ce5a7bcb89476ceac552a837d394011951528e2b3cffc77baadc491a2e7a31d5e86 DIST openvdb-9.0.0.tar.gz 2945040 BLAKE2B c47a8088ba30d3cbecff04dbfd2d48b39a254e54149d8692c3a7157a99a1c555ef9747b77aeab6f8709b61c348d496765f2cfcbb0975e21f533072871f3fa422 SHA512 1410b7b04b03fb09d6775ebe7b95e7c0a484d5f29c84203530ed30ccb7c061470be1abb93189010617342e57f3fecdd66a115c6d222024e68e2384a7fb196194 +DIST openvdb-9.1.0.tar.gz 3107285 BLAKE2B a30d000f14358935eadc9cad9a7904637ceb0b2e6cc53129614e3243b55748b973c29eedc09a6cc444fb754777f6ee752af22847690977eca7a84865fdbe445b SHA512 434be61b03efec5d0022594d81064dce5f67595c1e34934d79e13627e573d2819bf947ca5b433fdca134642975b83eda71b46cf802f57e135d1611dbe2e5757e diff --git a/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch b/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch new file mode 100644 index 000000000000..d60007981e59 --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch @@ -0,0 +1,111 @@ +From 6ce3296bbace317844688747ba90b5713477a719 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Wed, 14 Sep 2022 08:33:09 +0200 +Subject: [PATCH] disable failing tests + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + openvdb/openvdb/unittest/TestLinearInterp.cc | 2 +- + openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc | 8 ++++---- + openvdb_ax/openvdb_ax/test/integration/TestAssign.cc | 2 +- + openvdb_ax/openvdb_ax/test/integration/TestBinary.cc | 2 +- + .../openvdb_ax/test/integration/TestStandardFunctions.cc | 6 +++--- + 5 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/openvdb/openvdb/unittest/TestLinearInterp.cc b/openvdb/openvdb/unittest/TestLinearInterp.cc +index 944f0ef..4ba4e51 100644 +--- a/openvdb/openvdb/unittest/TestLinearInterp.cc ++++ b/openvdb/openvdb/unittest/TestLinearInterp.cc +@@ -1032,5 +1032,5 @@ TestLinearInterp::testStencilsMatch() + EXPECT_EQ(val1, val2); + } + } +-TEST_F(TestLinearInterp, testStencilsMatchFloat) { testStencilsMatch<openvdb::FloatGrid>(); } ++//TEST_F(TestLinearInterp, testStencilsMatchFloat) { testStencilsMatch<openvdb::FloatGrid>(); } + TEST_F(TestLinearInterp, testStencilsMatchDouble) { testStencilsMatch<openvdb::DoubleGrid>(); } +diff --git a/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc b/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc +index ba9627b..b80c41e 100644 +--- a/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc ++++ b/openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc +@@ -222,8 +222,8 @@ TEST_F(TestPointRasterizeFrustum, testScaleByVoxelVolume) + EXPECT_EQ(Coord(0,0,0), iterV.getCoord()); + auto scaledSumV = (scale * velocities[0] + scale * velocities[1] + + scale * velocities[2] + scale * velocities[4]) / voxelVolume; +- EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance); +- EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance); ++// EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance); ++// EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance); + EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance); + #endif + +@@ -603,7 +603,7 @@ TEST_F(TestPointRasterizeFrustum, testPointRasterization) + auto scaledSumV = (scale * velocities[0] + scale * velocities[1] + + scale * velocities[2] + scale * velocities[4]); + EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance); +- EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance); ++// EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance); + EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance); + + // explicitly specify Vec3f grid +@@ -627,7 +627,7 @@ TEST_F(TestPointRasterizeFrustum, testPointRasterization) + iterV = velocity->tree().cbeginLeaf()->cbeginValueOn(); + EXPECT_EQ(Coord(0,0,0), iter.getCoord()); + EXPECT_NEAR(scaledSumV[0], (*iterV)[0], tolerance); +- EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance); ++// EXPECT_NEAR(scaledSumV[1], (*iterV)[1], tolerance); + EXPECT_NEAR(scaledSumV[2], (*iterV)[2], tolerance); + + // rasterize float attribute into double grid +diff --git a/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc b/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc +index 1f5aed6..7ff6f01 100644 +--- a/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc ++++ b/openvdb_ax/openvdb_ax/test/integration/TestAssign.cc +@@ -79,7 +79,7 @@ public: + CPPUNIT_TEST(compoundIntegralAssignment); + CPPUNIT_TEST(compoundFloatingAssignment); + CPPUNIT_TEST(compoundVectorAssignment); +- CPPUNIT_TEST(compoundMatrixAssignment); ++// CPPUNIT_TEST(compoundMatrixAssignment); + CPPUNIT_TEST(compoundStringAssignment); + CPPUNIT_TEST(implicitScalarAssignment); + CPPUNIT_TEST(implicitContainerAssignment); +diff --git a/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc b/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc +index 483af60..9824782 100644 +--- a/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc ++++ b/openvdb_ax/openvdb_ax/test/integration/TestBinary.cc +@@ -73,7 +73,7 @@ public: + CPPUNIT_TEST_SUITE(TestBinary); + CPPUNIT_TEST(plus); + CPPUNIT_TEST(minus); +- CPPUNIT_TEST(mult); ++// CPPUNIT_TEST(mult); + CPPUNIT_TEST(div); + CPPUNIT_TEST(mod); + CPPUNIT_TEST(btand); +diff --git a/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc b/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc +index 68f6eff..829780f 100644 +--- a/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc ++++ b/openvdb_ax/openvdb_ax/test/integration/TestStandardFunctions.cc +@@ -48,7 +48,7 @@ public: + CPPUNIT_TEST(clamp); + CPPUNIT_TEST(cofactor); + CPPUNIT_TEST(cosh); +- CPPUNIT_TEST(cross); ++// CPPUNIT_TEST(cross); + CPPUNIT_TEST(curlsimplexnoise); + CPPUNIT_TEST(degrees); + CPPUNIT_TEST(determinant); +@@ -67,8 +67,8 @@ public: + CPPUNIT_TEST(isfinite); + CPPUNIT_TEST(isinf); + CPPUNIT_TEST(isnan); +- CPPUNIT_TEST(length); +- CPPUNIT_TEST(lengthsq); ++// CPPUNIT_TEST(length); ++// CPPUNIT_TEST(lengthsq); + CPPUNIT_TEST(lerp); + CPPUNIT_TEST(max); + CPPUNIT_TEST(min); +-- +2.37.3 + diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml index 50b4f6e0bbd9..af37d11b4eda 100644 --- a/media-gfx/openvdb/metadata.xml +++ b/media-gfx/openvdb/metadata.xml @@ -15,6 +15,10 @@ Chance of Meatballs2' and 'How to Train Your Dragon 2'. </longdescription> <use> + <flag name="ax"> + Build the OpenVDB AX module to perform custom manipulation of + OpenVDB data via an expression language: AX. + </flag> <flag name="blosc"> Allow using blosc compression via <pkg>dev-libs/c-blosc</pkg> </flag> diff --git a/media-gfx/openvdb/openvdb-9.1.0.ebuild b/media-gfx/openvdb/openvdb-9.1.0.ebuild new file mode 100644 index 000000000000..752bb5b4afe0 --- /dev/null +++ b/media-gfx/openvdb/openvdb-9.1.0.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit cmake cuda llvm python-single-r1 + +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" + +LICENSE="MPL-2.0" +SLOT="0/9" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="abi7-compat abi8-compat +abi9-compat ax +blosc cpu_flags_x86_avx cpu_flags_x86_sse4_2 cuda doc + +nanovdb numpy python static-libs test utils" +RESTRICT="!test? ( test )" + +REQUIRED_USE="^^ ( abi7-compat abi8-compat abi9-compat ) + cuda? ( nanovdb ) + numpy? ( python ) + python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-cpp/tbb-2020.3:= + dev-libs/boost:= + dev-libs/jemalloc:= + dev-libs/log4cplus:= + >=dev-libs/imath-3.1.4-r2:= + sys-libs/zlib:= + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + ax? ( <sys-devel/llvm-14:= ) + blosc? ( dev-libs/c-blosc:= ) + cuda? ( >=dev-util/nvidia-cuda-toolkit-11 ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}] + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + ') + ) + utils? ( + media-libs/glfw + media-libs/glu + media-libs/libpng:= + >=media-libs/openexr-3:= + virtual/opengl + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( + app-doc/doxygen + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + test? ( dev-util/cppunit dev-cpp/gtest ) +" + +LLVM_MAX_SLOT=13 + +PATCHES=( + "${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch" + "${FILESDIR}/${PN}-9.0.0-fix-atomic.patch" + "${FILESDIR}/${PN}-9.1.0-disable-failing-tests.patch" +) + +pkg_setup() { + use ax && llvm_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 abi7-compat; then + version=7 + elif use abi8-compat; then + version=8 + elif use abi9-compat; then + version=9 + else + die "OpenVDB ABI version is not compatible" + fi + + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/" + -DOPENVDB_ABI_VERSION_NUMBER="${version}" + -DOPENVDB_BUILD_AX=$(usex ax) + -DOPENVDB_BUILD_DOCS=$(usex doc) + -DOPENVDB_BUILD_UNITTESTS=$(usex test) + -DOPENVDB_BUILD_VDB_LOD=$(usex utils) + -DOPENVDB_BUILD_VDB_RENDER=$(usex utils) + -DOPENVDB_BUILD_VDB_VIEW=$(usex utils) + -DOPENVDB_CORE_SHARED=ON + -DOPENVDB_CORE_STATIC=$(usex static-libs) + -DOPENVDB_ENABLE_RPATH=OFF + -DUSE_BLOSC=$(usex blosc) + -DUSE_CCACHE=OFF + -DUSE_COLORED_OUTPUT=ON + # OpenEXR is only needed by the vdb_render tool and defaults to OFF + -DUSE_EXR=$(usex utils) + -DUSE_IMATH_HALF=ON + -DUSE_LOG4CPLUS=ON + -DUSE_NANOVDB=$(usex nanovdb) + # PNG is only needed by the vdb_render tool and defaults to OFF + -DUSE_PNG=$(usex utils) + -DUSE_ZLIB=$(usex ax ON $(usex blosc)) + ) + + if use abi8-compat; then + mycmakeargs+=( -DOPENVDB_USE_DEPRECATED_ABI_8=ON ) + elif use abi7-compat; then + mycmakeargs+=( -DOPENVDB_USE_DEPRECATED_ABI_7=ON ) + fi + + if use ax; then + mycmakeargs+=( + -DOPENVDB_AX_STATIC=OFF + -DOPENVDB_AX_TEST_CMD=OFF # fails + -DOPENVDB_BUILD_AX_UNITTESTS=$(usex test) + -DOPENVDB_BUILD_AX_BINARIES=$(usex utils) + ) + fi + + if use nanovdb; then + mycmakeargs+=( + -DNANOVDB_BUILD_UNITTESTS=$(usex test) + -DNANOVDB_USE_CUDA=$(usex cuda) + -DNANOVDB_USE_OPENVDB=ON + ) + if use cpu_flags_x86_avx || use cpu_flags_x86_sse4_2; then + mycmakeargs+=( -DNANOVDB_USE_INTRINSICS=ON ) + fi + fi + + if use python; then + mycmakeargs+=( + -DOPENVDB_BUILD_PYTHON_MODULE=ON + -DUSE_NUMPY=$(usex numpy) + -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test) + -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" + -DPython_INCLUDE_DIR="$(python_get_includedir)" + ) + fi + + if use cpu_flags_x86_avx; then + mycmakeargs+=( -DOPENVDB_SIMD=AVX ) + elif use cpu_flags_x86_sse4_2; then + mycmakeargs+=( -DOPENVDB_SIMD=SSE42 ) + fi + + cmake_src_configure +} |