diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-02-01 21:05:47 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-01 21:05:47 +0000 |
commit | 60f657b5e6155f26601c7def7baa11cee72246d0 (patch) | |
tree | 25aecda1c8de352c03f653934407abebf384a560 /media-gfx/openvdb/files | |
parent | e523ebcd50638ebe53f8f425d126bfa7385703b5 (diff) |
gentoo auto-resync : 01:02:2023 - 21:05:47
Diffstat (limited to 'media-gfx/openvdb/files')
7 files changed, 0 insertions, 464 deletions
diff --git a/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch b/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch deleted file mode 100644 index 13d0f45fabf4..000000000000 --- a/media-gfx/openvdb/files/openvdb-7.1.0-0001-Fix-multilib-header-source.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 7558089b3dae599ffc80329da3a5c1decf882ca7 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl@gmail.com> -Date: Fri, 28 Feb 2020 17:01:25 +0100 -Subject: [PATCH] Fix multilib header source - -Signed-off-by: Bernd Waibel <waebbl@gmail.com> ---- - cmake/FindIlmBase.cmake | 10 ++++++++-- - cmake/FindOpenEXR.cmake | 10 ++++++++-- - 2 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake -index f20f803..bb85019 100644 ---- a/cmake/FindIlmBase.cmake -+++ b/cmake/FindIlmBase.cmake -@@ -168,9 +168,15 @@ find_path(IlmBase_INCLUDE_DIR IlmBaseConfig.h - PATH_SUFFIXES include/OpenEXR OpenEXR - ) - -+if(EXISTS "/usr/include/${CHOST}/OpenEXR/IlmBaseConfig.h") -+ set(_ILMBASE_HEADERS "/usr/include/${CHOST}/OpenEXR") -+else() -+ set(_ILMBASE_HEADERS ${IlmBase_INCLUDE_DIR}) -+endif() -+ - if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h") - # Get the ILMBASE version information from the config header -- file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h" -+ file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h" - _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR " - ) - string(REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" "" -@@ -178,7 +184,7 @@ if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h") - ) - string(STRIP "${_ilmbase_version_major_string}" IlmBase_VERSION_MAJOR) - -- file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h" -+ file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h" - _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR " - ) - string(REGEX REPLACE "#define ILMBASE_VERSION_MINOR" "" -diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake -index d0d356f..0c5dd7b 100644 ---- a/cmake/FindOpenEXR.cmake -+++ b/cmake/FindOpenEXR.cmake -@@ -161,9 +161,15 @@ find_path(OpenEXR_INCLUDE_DIR OpenEXRConfig.h - PATH_SUFFIXES include/OpenEXR OpenEXR - ) - -+if(EXISTS "/usr/include/${CHOST}/OpenEXR/OpenEXRConfig.h") -+ set(_OPENEXR_HEADERS "/usr/include/${CHOST}/OpenEXR") -+else() -+ set(_OPENEXR_HEADERS "${OpenEXR_INCLUDE_DIR}") -+endif() -+ - if(EXISTS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h") - # Get the EXR version information from the config header -- file(STRINGS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h" -+ file(STRINGS "${_OPENEXR_HEADERS}/OpenEXRConfig.h" - _openexr_version_major_string REGEX "#define OPENEXR_VERSION_MAJOR " - ) - string(REGEX REPLACE "#define OPENEXR_VERSION_MAJOR" "" -@@ -171,7 +177,7 @@ if(EXISTS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h") - ) - string(STRIP "${_openexr_version_major_string}" OpenEXR_VERSION_MAJOR) - -- file(STRINGS "${OpenEXR_INCLUDE_DIR}/OpenEXRConfig.h" -+ file(STRINGS "${_OPENEXR_HEADERS}/OpenEXRConfig.h" - _openexr_version_minor_string REGEX "#define OPENEXR_VERSION_MINOR " - ) - string(REGEX REPLACE "#define OPENEXR_VERSION_MINOR" "" --- -2.25.1 - - diff --git a/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch b/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch deleted file mode 100644 index 87d1d24755b4..000000000000 --- a/media-gfx/openvdb/files/openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Thu, 28 Oct 2021 11:34:16 +0200 -Subject: [PATCH] add consistency for NumPy find_package call - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> - -diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt -index b473beb..b468d4f 100644 ---- a/openvdb/openvdb/python/CMakeLists.txt -+++ b/openvdb/openvdb/python/CMakeLists.txt -@@ -94,7 +94,7 @@ else() - OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS}) - - if(USE_NUMPY) -- find_package(Python QUIET COMPONENTS NumPy) -+ find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS} NumPy) - if(NOT TARGET Python::NumPy) - message(FATAL_ERROR "Could NOT find NumPy (Required is at least version " - "\"${MINIMUM_NUMPY_VERSION}\")" --- -2.33.1 diff --git a/media-gfx/openvdb/files/openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch b/media-gfx/openvdb/files/openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch deleted file mode 100644 index 88752e9fa0eb..000000000000 --- a/media-gfx/openvdb/files/openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sat, 4 Dec 2021 20:16:42 +0100 -Subject: [PATCH] fix finding ilmbase if imath and ilmbase are installed - -If both, ilmbase-2.5 and imath-3 are installed, the configuration fails -if OPENVDB_BUILD_BINARIES and OPENVDB_BUILD_RENDER are set. -The patch adds an additional guard based on the USE_IMATH_HALF option -being set and thus decide whether to search for and use imath or ilmbase. - -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/openvdb/openvdb/cmd/CMakeLists.txt -+++ b/openvdb/openvdb/cmd/CMakeLists.txt -@@ -81,12 +81,17 @@ endif() - #### vdb_render - - if(OPENVDB_BUILD_VDB_RENDER) -- find_package(Imath CONFIG) -- if (NOT TARGET Imath::Imath) -+ if(USE_IMATH_HALF) -+ find_package(Imath CONFIG) -+ if (NOT TARGET Imath::Imath) -+ find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) -+ find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) -+ else() -+ find_package(OpenEXR CONFIG) -+ endif() -+ else() - find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) - find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) -- else() -- find_package(OpenEXR CONFIG) - endif() - - set(VDB_RENDER_SOURCE_FILES openvdb_render.cc) --- -2.34.1 - diff --git a/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch b/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch deleted file mode 100644 index 933d2965b2bc..000000000000 --- a/media-gfx/openvdb/files/openvdb-8.2.0-unconditionally-search-Python-interpreter.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Sat, 4 Dec 2021 20:45:49 +0100 -Subject: [PATCH] unconditionally search Python interpreter - -When setting PYOPENVDB_INSTALL_DIRECTORY, CMake would fail with: -``` --- Could NOT find Python (missing: Python_LIBRARIES Development Development.Module Development.Embed) (found version "3.9.9") -CMake Error at openvdb/openvdb/python/CMakeLists.txt:65 (message): - Could NOT find Python::Module (Required is at least version "2.7") -Call Stack (most recent call first): - openvdb/openvdb/python/CMakeLists.txt:112 (openvdb_check_python_version) - ``` - -It seems like we always need to search for the interpreter. - -Bug: https://bugs.gentoo.org/790350 -Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> ---- a/openvdb/openvdb/python/CMakeLists.txt -+++ b/openvdb/openvdb/python/CMakeLists.txt -@@ -73,10 +73,7 @@ endfunction() - # target but this was only added in CMake 3.15. See: - # https://github.com/AcademySoftwareFoundation/openvdb/issues/886 - set(OPENVDB_PYTHON_DEPS) --set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development) --if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY) -- list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) --endif() -+set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development Interpreter) - - if(${CMAKE_VERSION} VERSION_LESS 3.14) - find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) --- -2.34.1 - diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch b/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch deleted file mode 100644 index 5fa90a7b6524..000000000000 --- a/media-gfx/openvdb/files/openvdb-9.0.0-numpy.patch +++ /dev/null @@ -1,151 +0,0 @@ -Grabbed relevant parts from upstream PR for 9.x; it's a variant -of https://github.com/gentoo/gentoo/pull/22738 which was for earlier versions. - -https://github.com/AcademySoftwareFoundation/openvdb/pull/1237 - -From 3c5f69efeacca762406a80d74b39b970c7023bd6 Mon Sep 17 00:00:00 2001 -From: Nick Avramoussis <4256455+Idclip@users.noreply.github.com> -Date: Thu, 28 Oct 2021 16:54:10 +0100 -Subject: [PATCH 1/3] Improvements to find_package Python usage. Primarily - fixes an issues where NumPy needs to be specified along with the Development - and Interpreter components in a single call - -Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com> ---- - openvdb/openvdb/python/CMakeLists.txt | 97 +++++++++++++-------------- - 1 file changed, 46 insertions(+), 51 deletions(-) - -diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt -index 7b36379f9..5e9141e8c 100644 ---- a/openvdb/openvdb/python/CMakeLists.txt -+++ b/openvdb/openvdb/python/CMakeLists.txt -@@ -55,25 +55,39 @@ endif() - # be provided to find_package(Python) with differing major versions. e.g. - # calls to find_package(Python 2.7) fails if python3 is found on the system. - function(OPENVDB_CHECK_PYTHON_VERSION) -- set(_PY_VERSION ${ARGV0}) -- set(_PY_PATH ${ARGV1}) -- if(NOT _PY_VERSION) -- message(FATAL_ERROR "Could NOT find Python (Required is at least version " -- "\"${MINIMUM_PYTHON_VERSION}\")" -- ) -- elseif(_PY_VERSION VERSION_LESS MINIMUM_PYTHON_VERSION) -- message(FATAL_ERROR "Could NOT find Python: Found unsuitable version \"${_PY_VERSION}\"" -- "but required is at least \"${MINIMUM_PYTHON_VERSION}\" (found ${_PY_PATH})" -- ) -- else() -- message(STATUS "Found Python: ${_PY_PATH}) (found suitable version \"${_PY_VERSION}\", " -- "minimum required is \"${MINIMUM_PYTHON_VERSION}\")" -+ set(PY_TARGET ${ARGV0}) -+ set(PY_TARGET_VERSION ${ARGV1}) -+ set(PY_TARGET_INCLUDES ${ARGV2}) -+ set(MIN_VERSION ${ARGV3}) -+ set(FUTURE_MIN_VERSION ${ARGV4}) -+ -+ if(NOT TARGET ${PY_TARGET}) -+ message(FATAL_ERROR "Could NOT find ${PY_TARGET} (Required is at least version " -+ "\"${MIN_VERSION}\")" - ) - endif() -+ -+ if(PY_TARGET_VERSION AND MIN_VERSION) -+ if(PY_TARGET_VERSION VERSION_LESS MIN_VERSION) -+ message(FATAL_ERROR "Could NOT find ${PY_TARGET}: Found unsuitable version " -+ "\"${PY_TARGET_VERSION}\" but required is at least \"${MIN_VERSION}\" (found ${PY_TARGET_INCLUDES})" -+ ) -+ endif() -+ endif() -+ -+ message(STATUS "Found ${PY_TARGET}: ${PY_TARGET_INCLUDES}) (found suitable " -+ "version \"${PY_TARGET_VERSION}\", minimum required is \"${MIN_VERSION}\")" -+ ) -+ -+ if(OPENVDB_FUTURE_DEPRECATION AND PY_TARGET_VERSION AND FUTURE_MIN_VERSION) -+ if(PY_TARGET_VERSION VERSION_LESS FUTURE_MIN_VERSION) -+ message(DEPRECATION "Support for ${PY_TARGET} versions < ${FUTURE_MIN_VERSION} " -+ "is deprecated and will be removed.") -+ endif() -+ endif() - endfunction() - - # Configure Python and Numpy. Note that: --# - find_package(Python NumPy) requires CMake >= 3.14 - # - find_package(Python Development) target Python::Module requires CMake >= 3.15 - # - find_package(Python Development.Module) requires CMake >= 3.18 - # To ensure consistent versions between components Interpreter, Compiler, -@@ -85,38 +99,30 @@ endfunction() - set(OPENVDB_PYTHON_DEPS) - set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development) - if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY) -- list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) -+ list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) - endif() - --find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) --OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS}) -- - if(USE_NUMPY) -- find_package(Python QUIET COMPONENTS NumPy) -- if(NOT TARGET Python::NumPy) -- message(FATAL_ERROR "Could NOT find NumPy (Required is at least version " -- "\"${MINIMUM_NUMPY_VERSION}\")" -- ) -- elseif(Python_NumPy_VERSION VERSION_LESS MINIMUM_NUMPY_VERSION) -- message(FATAL_ERROR "Could NOT find NumPy: Found unsuitable version \"${Python_NumPy_VERSION}\"" -- "but required is at least \"${MINIMUM_NUMPY_VERSION}\" (found ${Python_NumPy_INCLUDE_DIRS})" -- ) -- else() -- message(STATUS "Found NumPy: ${Python_NumPy_INCLUDE_DIRS} (found suitable " -- "version \"${Python_NumPy_VERSION}\", minimum required is " -- "\"${MINIMUM_NUMPY_VERSION}\")" -- ) -- endif() -- list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy) -+ list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS NumPy) - endif() - -+# Make sure find_package(Python) is only ever invoked once with all required components -+find_package(Python COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) -+ -+openvdb_check_python_version(Python::Module -+ "${Python_VERSION}" -+ "${Python_INCLUDE_DIRS}" -+ "${MINIMUM_PYTHON_VERSION}" -+ "${FUTURE_MINIMUM_PYTHON_VERSION}") -+list(APPEND OPENVDB_PYTHON_DEPS Python::Module) -+ - if(USE_NUMPY) -- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_NUMPY_VERSION) -- if(Python_NumPy_VERSION VERSION_LESS FUTURE_MINIMUM_NUMPY_VERSION) -- message(DEPRECATION "Support for NumPy versions < ${FUTURE_MINIMUM_NUMPY_VERSION} " -- "is deprecated and will be removed.") -- endif() -- endif() -+ openvdb_check_python_version(Python::NumPy -+ "${Python_NumPy_VERSION}" -+ "${Python_NumPy_INCLUDE_DIRS}" -+ "${MINIMUM_NUMPY_VERSION}" -+ "${FUTURE_MINIMUM_NUMPY_VERSION}") -+ list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy) - endif() - - if(TARGET openvdb_shared AND NOT Boost_USE_STATIC_LIBS) -@@ -230,17 +236,6 @@ elseif(WIN32) - set_target_properties(pyopenvdb PROPERTIES SUFFIX ".pyd") # .pyd on windows - endif() - --if(TARGET Python::Module) -- list(APPEND OPENVDB_PYTHON_DEPS Python::Module) --else() -- if(APPLE) -- target_include_directories(pyopenvdb SYSTEM PUBLIC ${Python_INCLUDE_DIRS}) -- target_link_options(pyopenvdb PUBLIC -undefined dynamic_lookup) -- else() -- list(APPEND OPENVDB_PYTHON_DEPS Python::Python) -- endif() --endif() -- - target_link_libraries(pyopenvdb PUBLIC - ${OPENVDB_LIB} - ${OPENVDB_PYTHON_DEPS} - diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch b/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch deleted file mode 100644 index 1a24f4c535c3..000000000000 --- a/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/790350 -https://github.com/AcademySoftwareFoundation/openvdb/pull/1275 - -From 86cbe16b5f8bf9df2c3825d7d7d90c58bc0d3391 Mon Sep 17 00:00:00 2001 -From: Nick Avramoussis <4256455+Idclip@users.noreply.github.com> -Date: Wed, 8 Dec 2021 16:57:58 +0000 -Subject: [PATCH] Fixed an issue with find_python and cmake 3.18 - -Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com> ---- - openvdb/openvdb/python/CMakeLists.txt | 10 +++++++++- - pendingchanges/cmake_python.txt | 2 ++ - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt -index 2821efb5d..179c0c57d 100644 ---- a/openvdb/openvdb/python/CMakeLists.txt -+++ b/openvdb/openvdb/python/CMakeLists.txt -@@ -97,7 +97,15 @@ endfunction() - # target but this was only added in CMake 3.15. See: - # https://github.com/AcademySoftwareFoundation/openvdb/issues/886 - set(OPENVDB_PYTHON_DEPS) --set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development) -+ -+# @note explicitly only search for Development.Module from 3.18 as searching -+# Development.Embed can cause issues on linux systems where it doesn't exist -+if(${CMAKE_VERSION} VERSION_LESS 3.18) -+ set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development) -+else() -+ set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development.Module) -+endif() -+ - if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY) - list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) - endif() 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 deleted file mode 100644 index d60007981e59..000000000000 --- a/media-gfx/openvdb/files/openvdb-9.1.0-disable-failing-tests.patch +++ /dev/null @@ -1,111 +0,0 @@ -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 - |