Index: head/misc/openvdb/Makefile =================================================================== --- head/misc/openvdb/Makefile (revision 559417) +++ head/misc/openvdb/Makefile (revision 559418) @@ -1,52 +1,52 @@ # $FreeBSD$ PORTNAME= openvdb DISTVERSIONPREFIX= v -DISTVERSION= 7.2.0 +DISTVERSION= 8.0.0 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org COMMENT= Tools for storage and manipulation of sparse volumetric data LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libblosc.so:archivers/c-blosc \ libboost_system.so:devel/boost-libs \ libHalf.so:graphics/ilmbase \ libtbb.so:devel/tbb USES= cmake compiler:c++11-lang localbase:ldflags pkgconfig USE_GITHUB= yes GH_ACCOUNT= AcademySoftwareFoundation USE_LDCONFIG= yes CMAKE_ARGS= -DCONCURRENT_MALLOC="Tbbmalloc" CMAKE_OFF= OPENVDB_CORE_STATIC OPTIONS_DEFINE= PYTHON TOOLS #DOCS # TOOLS and PYTHON should be made into subpackages OPTIONS_DEFAULT= PYTHON TOOLS OPTIONS_SUB= yes PYTHON_USES= python PYTHON_CMAKE_BOOL= OPENVDB_BUILD_PYTHON_MODULE PYTHON_CMAKE_ON= -DFREEBSD_PYTHON_VER:STRING=${PYTHON_VER} -DUSE_NUMPY:BOOL=ON PYTHON_LIB_DEPENDS= ${PY_BOOST} PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} TOOLS_DESC= Build CLI tools TOOLS_CMAKE_BOOL= OPENVDB_BUILD_BINARIES OPENVDB_BUILD_VDB_LOD \ OPENVDB_BUILD_VDB_RENDER OPENVDB_BUILD_VDB_VIEW TOOLS_LIB_DEPENDS= libglfw.so:graphics/glfw \ libIlmImf.so:graphics/openexr TOOLS_USES= gl xorg TOOLS_USE= GL=gl,glu XORG=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm # DOCS is broken: https://github.com/AcademySoftwareFoundation/openvdb/issues/899 #DOCS_CMAKE_BOOL= OPENVDB_BUILD_DOCS #DOCS_BUILD_DEPENDS= doxygen:devel/doxygen #PORTDOCS= * .include Index: head/misc/openvdb/distinfo =================================================================== --- head/misc/openvdb/distinfo (revision 559417) +++ head/misc/openvdb/distinfo (revision 559418) @@ -1,3 +1,3 @@ -TIMESTAMP = 1607816892 -SHA256 (AcademySoftwareFoundation-openvdb-v7.2.0_GH0.tar.gz) = 81ff2758e3900e5d4022fde0149d63387167db8adaf5c0ace1456dad3a012d1d -SIZE (AcademySoftwareFoundation-openvdb-v7.2.0_GH0.tar.gz) = 2283069 +TIMESTAMP = 1609053253 +SHA256 (AcademySoftwareFoundation-openvdb-v8.0.0_GH0.tar.gz) = 04a28dc24a744f8ac8bbc5636a949628edb02b7c84db24ad795429c8c739a9ee +SIZE (AcademySoftwareFoundation-openvdb-v8.0.0_GH0.tar.gz) = 2285328 Index: head/misc/openvdb/files/patch-CMakeLists.txt =================================================================== --- head/misc/openvdb/files/patch-CMakeLists.txt (revision 559417) +++ head/misc/openvdb/files/patch-CMakeLists.txt (revision 559418) @@ -1,20 +1,20 @@ ---- CMakeLists.txt.orig 2020-12-09 15:44:05 UTC +--- CMakeLists.txt.orig 2020-12-24 17:13:14 UTC +++ CMakeLists.txt -@@ -197,7 +197,7 @@ mark_as_advanced( +@@ -199,7 +199,7 @@ mark_as_advanced( # @note Blosc version is currently treated as exception which must be adhered # to. The minimum version must be at least 1.5.0. Previous versions are incompatible. # Later versions (including 1.5.4), can be buggy on certain platforms. -set(MINIMUM_BLOSC_VERSION 1.5.0) +set(MINIMUM_BLOSC_VERSION 1.15) # @note ABI always enforced so the correct deprecation messages are available. # OPENVDB_USE_DEPRECATED_ABI_ should be used to circumvent this - set(MINIMUM_OPENVDB_ABI_VERSION 5) -@@ -218,7 +218,7 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS) - set(MINIMUM_TBB_VERSION 2017.0) + set(MINIMUM_OPENVDB_ABI_VERSION 6) +@@ -220,7 +220,7 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS) + set(MINIMUM_TBB_VERSION 2018.0) set(MINIMUM_LLVM_VERSION 6.0.0) - set(MINIMUM_PYTHON_VERSION 2.7) + set(MINIMUM_PYTHON_VERSION ${FREEBSD_PYTHON_VER}) - set(MINIMUM_NUMPY_VERSION 1.12.1) + set(MINIMUM_NUMPY_VERSION 1.14.0) set(MINIMUM_GOOGLETEST_VERSION 1.8) Index: head/misc/openvdb/files/patch-doc_CMakeLists.txt =================================================================== --- head/misc/openvdb/files/patch-doc_CMakeLists.txt (revision 559417) +++ head/misc/openvdb/files/patch-doc_CMakeLists.txt (revision 559418) @@ -1,10 +1,10 @@ ---- doc/CMakeLists.txt.orig 2020-08-13 19:15:58 UTC +--- doc/CMakeLists.txt.orig 2020-12-24 17:13:14 UTC +++ doc/CMakeLists.txt -@@ -73,5 +73,5 @@ add_custom_target(doc ALL - ) +@@ -193,5 +193,5 @@ doxygen_add_docs(doc ${DOXY_FILES} + COMMENT "Generating API documentation with Doxygen") # Suppress "Installing..." messages for all but one of the hundreds of generated files. --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html/index.html DESTINATION doc/html) --install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION doc MESSAGE_NEVER) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/html/index.html DESTINATION doc/html) +-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION doc MESSAGE_NEVER) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html/index.html DESTINATION share/doc/openvdb) +install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION share/doc/openvdb MESSAGE_NEVER) Index: head/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt =================================================================== --- head/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt (revision 559417) +++ head/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt (revision 559418) @@ -1,34 +1,25 @@ ---- openvdb/openvdb/python/CMakeLists.txt.orig 2020-08-13 19:15:58 UTC +--- openvdb/openvdb/python/CMakeLists.txt.orig 2020-12-24 17:13:14 UTC +++ openvdb/openvdb/python/CMakeLists.txt -@@ -104,9 +104,9 @@ if(${CMAKE_VERSION} VERSION_LESS 3.12) - elseif(${CMAKE_VERSION} VERSION_LESS 3.14) - # CMake < 3.14 - if(OPENVDB_BUILD_PYTHON_UNITTESTS) -- find_package(Python QUIET COMPONENTS Interpreter Development) -+ find_package(Python ${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS Interpreter Development) - else() -- find_package(Python QUIET COMPONENTS Development) -+ find_package(Python ${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS Development) - endif() +@@ -85,7 +85,7 @@ if(OPENVDB_BUILD_PYTHON_UNITTESTS) + endif() + + if(${CMAKE_VERSION} VERSION_LESS 3.14) +- find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) ++ find_package(Python ${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS}) - list(APPEND OPENVDB_PYTHON_DEPS Python::Python) -@@ -119,16 +119,16 @@ elseif(${CMAKE_VERSION} VERSION_LESS 3.14) - else() - # CMake >= 3.14 - if(OPENVDB_BUILD_PYTHON_UNITTESTS) -- find_package(Python QUIET COMPONENTS Interpreter Development) -+ find_package(Python ${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS Interpreter Development) - else() -- find_package(Python QUIET COMPONENTS Development) -+ find_package(Python ${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS Development) - endif() + if(USE_NUMPY) +@@ -94,11 +94,11 @@ if(${CMAKE_VERSION} VERSION_LESS 3.14) + list(APPEND OPENVDB_PYTHON_DEPS Python::NumPy) + endif() + else() +- find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) ++ find_package(Python ${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS}) OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS}) - list(APPEND OPENVDB_PYTHON_DEPS Python::Python) if(USE_NUMPY) - find_package(Python QUIET COMPONENTS NumPy) + find_package(Python ${FREEBSD_PYTHON_VER} EXACT REQUIRED COMPONENTS NumPy) if(NOT TARGET Python::NumPy) message(FATAL_ERROR "Could NOT find NumPy (Required is at least version " "\"${MINIMUM_NUMPY_VERSION}\")" Index: head/misc/openvdb/pkg-plist =================================================================== --- head/misc/openvdb/pkg-plist (revision 559417) +++ head/misc/openvdb/pkg-plist (revision 559418) @@ -1,150 +1,150 @@ %%TOOLS%%bin/vdb_lod %%TOOLS%%bin/vdb_print %%TOOLS%%bin/vdb_render %%TOOLS%%bin/vdb_view include/openvdb/Exceptions.h include/openvdb/Grid.h include/openvdb/MetaMap.h include/openvdb/Metadata.h include/openvdb/Platform.h include/openvdb/PlatformConfig.h include/openvdb/TypeList.h include/openvdb/Types.h include/openvdb/io/Archive.h include/openvdb/io/Compression.h include/openvdb/io/DelayedLoadMetadata.h include/openvdb/io/File.h include/openvdb/io/GridDescriptor.h include/openvdb/io/Queue.h include/openvdb/io/Stream.h include/openvdb/io/TempFile.h include/openvdb/io/io.h include/openvdb/math/BBox.h include/openvdb/math/ConjGradient.h include/openvdb/math/Coord.h include/openvdb/math/DDA.h include/openvdb/math/FiniteDifference.h include/openvdb/math/LegacyFrustum.h include/openvdb/math/Maps.h include/openvdb/math/Mat.h include/openvdb/math/Mat3.h include/openvdb/math/Mat4.h include/openvdb/math/Math.h include/openvdb/math/Operators.h include/openvdb/math/Proximity.h include/openvdb/math/QuantizedUnitVec.h include/openvdb/math/Quat.h include/openvdb/math/Ray.h include/openvdb/math/Stats.h include/openvdb/math/Stencils.h include/openvdb/math/Transform.h include/openvdb/math/Tuple.h include/openvdb/math/Vec2.h include/openvdb/math/Vec3.h include/openvdb/math/Vec4.h include/openvdb/openvdb.h include/openvdb/points/AttributeArray.h include/openvdb/points/AttributeArrayString.h include/openvdb/points/AttributeGroup.h include/openvdb/points/AttributeSet.h include/openvdb/points/IndexFilter.h include/openvdb/points/IndexIterator.h include/openvdb/points/PointAdvect.h include/openvdb/points/PointAttribute.h include/openvdb/points/PointConversion.h include/openvdb/points/PointCount.h include/openvdb/points/PointDataGrid.h include/openvdb/points/PointDelete.h include/openvdb/points/PointGroup.h include/openvdb/points/PointMask.h include/openvdb/points/PointMove.h include/openvdb/points/PointSample.h include/openvdb/points/PointScatter.h include/openvdb/points/StreamCompression.h %%PYTHON%%include/openvdb/python/pyopenvdb.h include/openvdb/tools/ChangeBackground.h include/openvdb/tools/Clip.h include/openvdb/tools/Composite.h include/openvdb/tools/Dense.h include/openvdb/tools/DenseSparseTools.h include/openvdb/tools/Diagnostics.h include/openvdb/tools/FastSweeping.h include/openvdb/tools/Filter.h include/openvdb/tools/FindActiveValues.h include/openvdb/tools/GridOperators.h include/openvdb/tools/GridTransformer.h include/openvdb/tools/Interpolation.h include/openvdb/tools/LevelSetAdvect.h include/openvdb/tools/LevelSetFilter.h include/openvdb/tools/LevelSetFracture.h include/openvdb/tools/LevelSetMeasure.h include/openvdb/tools/LevelSetMorph.h include/openvdb/tools/LevelSetPlatonic.h include/openvdb/tools/LevelSetRebuild.h include/openvdb/tools/LevelSetSphere.h include/openvdb/tools/LevelSetTracker.h include/openvdb/tools/LevelSetUtil.h include/openvdb/tools/Mask.h include/openvdb/tools/Merge.h include/openvdb/tools/MeshToVolume.h include/openvdb/tools/Morphology.h include/openvdb/tools/MultiResGrid.h include/openvdb/tools/ParticleAtlas.h include/openvdb/tools/ParticlesToLevelSet.h include/openvdb/tools/PointAdvect.h include/openvdb/tools/PointIndexGrid.h include/openvdb/tools/PointPartitioner.h include/openvdb/tools/PointScatter.h include/openvdb/tools/PointsToMask.h include/openvdb/tools/PoissonSolver.h include/openvdb/tools/PotentialFlow.h include/openvdb/tools/Prune.h include/openvdb/tools/RayIntersector.h include/openvdb/tools/RayTracer.h include/openvdb/tools/SignedFloodFill.h include/openvdb/tools/Statistics.h include/openvdb/tools/TopologyToLevelSet.h include/openvdb/tools/ValueTransformer.h include/openvdb/tools/VectorTransformer.h include/openvdb/tools/VelocityFields.h include/openvdb/tools/VolumeAdvect.h include/openvdb/tools/VolumeToMesh.h include/openvdb/tools/VolumeToSpheres.h include/openvdb/tree/InternalNode.h include/openvdb/tree/Iterator.h include/openvdb/tree/LeafBuffer.h include/openvdb/tree/LeafManager.h include/openvdb/tree/LeafNode.h include/openvdb/tree/LeafNodeBool.h include/openvdb/tree/LeafNodeMask.h include/openvdb/tree/NodeManager.h include/openvdb/tree/NodeUnion.h include/openvdb/tree/RootNode.h include/openvdb/tree/Tree.h include/openvdb/tree/TreeIterator.h include/openvdb/tree/ValueAccessor.h include/openvdb/util/CpuTimer.h include/openvdb/util/Formats.h include/openvdb/util/MapsUtil.h include/openvdb/util/Name.h include/openvdb/util/NodeMasks.h include/openvdb/util/NullInterrupter.h include/openvdb/util/PagedArray.h include/openvdb/util/Util.h include/openvdb/util/logging.h include/openvdb/version.h lib/cmake/OpenVDB/FindBlosc.cmake lib/cmake/OpenVDB/FindIlmBase.cmake lib/cmake/OpenVDB/FindJemalloc.cmake lib/cmake/OpenVDB/FindLog4cplus.cmake lib/cmake/OpenVDB/FindOpenEXR.cmake lib/cmake/OpenVDB/FindOpenVDB.cmake lib/cmake/OpenVDB/FindTBB.cmake lib/cmake/OpenVDB/OpenVDBGLFW3Setup.cmake lib/cmake/OpenVDB/OpenVDBHoudiniSetup.cmake lib/cmake/OpenVDB/OpenVDBMayaSetup.cmake lib/cmake/OpenVDB/OpenVDBUtils.cmake lib/libopenvdb.so -lib/libopenvdb.so.7.2 -lib/libopenvdb.so.7.2.0 +lib/libopenvdb.so.8.0 +lib/libopenvdb.so.8.0.0 %%PYTHON%%%%PYTHON_LIBDIR%%/pyopenvdb.so