git: f44e2a56eac6 - main - misc/openvdb: Update 8.1.0 -> 9.0.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 15 Nov 2021 05:18:56 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f44e2a56eac6ed345e6b667cb40d5ffda1051e95
commit f44e2a56eac6ed345e6b667cb40d5ffda1051e95
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-11-15 04:11:50 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-11-15 05:18:52 +0000
misc/openvdb: Update 8.1.0 -> 9.0.0
Reported by: portscout
---
cad/PrusaSlicer/Makefile | 2 +-
graphics/blender-lts28/Makefile | 2 +-
graphics/blender/Makefile | 2 +-
graphics/openimageio/Makefile | 2 +-
math/curv/Makefile | 2 +-
misc/openvdb/Makefile | 11 ++------
misc/openvdb/distinfo | 8 ++----
misc/openvdb/files/patch-CMakeLists.txt | 28 ++++++++----------
misc/openvdb/files/patch-cmake_FindOpenEXR.cmake | 12 --------
misc/openvdb/files/patch-cmake_FindTBB.cmake | 4 +--
misc/openvdb/files/patch-doc_CMakeLists.txt | 4 +--
.../files/patch-openvdb_openvdb_CMakeLists.txt | 21 --------------
misc/openvdb/files/patch-openvdb_openvdb_Types.h | 11 --------
.../files/patch-openvdb_openvdb_cmd_CMakeLists.txt | 27 ------------------
.../patch-openvdb_openvdb_python_CMakeLists.txt | 33 ++++++++--------------
misc/openvdb/pkg-plist | 7 +++--
science/opensph/Makefile | 2 +-
17 files changed, 43 insertions(+), 135 deletions(-)
diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile
index b79f34a202c0..04dec50c3b1d 100644
--- a/cad/PrusaSlicer/Makefile
+++ b/cad/PrusaSlicer/Makefile
@@ -1,7 +1,7 @@
PORTNAME= PrusaSlicer
DISTVERSIONPREFIX=version_
DISTVERSION= 2.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= cad
MAINTAINER= teodorsigaev@gmail.com
diff --git a/graphics/blender-lts28/Makefile b/graphics/blender-lts28/Makefile
index e85cd55fa193..8556597978ea 100644
--- a/graphics/blender-lts28/Makefile
+++ b/graphics/blender-lts28/Makefile
@@ -1,6 +1,6 @@
PORTNAME= blender
DISTVERSION= 2.83.15
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics multimedia
MASTER_SITES= http://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/ \
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 459d4a8b3d69..df4655533266 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -2,7 +2,7 @@
PORTNAME= blender
DISTVERSION= 2.91.0
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= graphics multimedia
MASTER_SITES= http://download.blender.org/source/ \
http://mirror.cs.umn.edu/blender.org/source/ \
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index fae5d3ba6c98..7985d7fee8c7 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -7,7 +7,7 @@ DISTVERSION= 2.2.16.0
# py-openimageio's PORTREVISION.
# Also, just to be on the safe side, when resetting,
# best keep PORTREVISION?= 0.
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES?= graphics multimedia
MAINTAINER?= FreeBSD@Shaneware.biz
diff --git a/math/curv/Makefile b/math/curv/Makefile
index e2bfae5f7d1f..a46a8d7f7eef 100644
--- a/math/curv/Makefile
+++ b/math/curv/Makefile
@@ -1,6 +1,6 @@
PORTNAME= curv
DISTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math lang graphics
MAINTAINER= yuri@FreeBSD.org
diff --git a/misc/openvdb/Makefile b/misc/openvdb/Makefile
index 8abafccf5ecb..5b4fe9fde562 100644
--- a/misc/openvdb/Makefile
+++ b/misc/openvdb/Makefile
@@ -1,12 +1,8 @@
PORTNAME= openvdb
DISTVERSIONPREFIX= v
-DISTVERSION= 8.1.0
-PORTREVISION= 6
+DISTVERSION= 9.0.0
CATEGORIES= misc
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
-PATCHFILES= e620aa6a472e7e5bebaf2103ed2b4d6442438341.patch:-p1 # backport of change TBB -> OneTBB
-
MAINTAINER= yuri@FreeBSD.org
COMMENT= Tools for storage and manipulation of sparse volumetric data
@@ -48,10 +44,9 @@ TOOLS_LIB_DEPENDS= libglfw.so:graphics/glfw \
TOOLS_USES= gl xorg
TOOLS_USE= GL=gl,glu XORG=ice,sm,x11,xcursor,xext,xi,xinerama,xrandr,xxf86vm
-post-patch: # extra fix for OneTBB
+xpost-patch: # extra fix for OneTBB
@cd ${WRKSRC}/openvdb/openvdb && \
- ${MKDIR} thread && \
- ${MV} util/Threading.h thread/
+ ${MKDIR} thread
# DOCS is broken: https://github.com/AcademySoftwareFoundation/openvdb/issues/899
#DOCS_CMAKE_BOOL= OPENVDB_BUILD_DOCS
diff --git a/misc/openvdb/distinfo b/misc/openvdb/distinfo
index 5c70c0e4ff93..2573b28edeae 100644
--- a/misc/openvdb/distinfo
+++ b/misc/openvdb/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1628995152
-SHA256 (AcademySoftwareFoundation-openvdb-v8.1.0_GH0.tar.gz) = 3e09d47331429be7409a3a3c27fdd3c297f96d31d2153febe194e664a99d6183
-SIZE (AcademySoftwareFoundation-openvdb-v8.1.0_GH0.tar.gz) = 2619432
-SHA256 (e620aa6a472e7e5bebaf2103ed2b4d6442438341.patch) = 9c39e12741df0fa293e8281c2567d59a8093786625580c62c6509aa4d17a5a7f
-SIZE (e620aa6a472e7e5bebaf2103ed2b4d6442438341.patch) = 76933
+TIMESTAMP = 1636936172
+SHA256 (AcademySoftwareFoundation-openvdb-v9.0.0_GH0.tar.gz) = ad3816e8f1931d1d6fdbddcec5a1acd30695d049dd10aa965096b2fb9972b468
+SIZE (AcademySoftwareFoundation-openvdb-v9.0.0_GH0.tar.gz) = 2945040
diff --git a/misc/openvdb/files/patch-CMakeLists.txt b/misc/openvdb/files/patch-CMakeLists.txt
index a3667035df69..17689aa25184 100644
--- a/misc/openvdb/files/patch-CMakeLists.txt
+++ b/misc/openvdb/files/patch-CMakeLists.txt
@@ -1,28 +1,22 @@
---- CMakeLists.txt.orig 2021-06-11 21:38:41 UTC
+--- CMakeLists.txt.orig 2021-10-30 02:55:40 UTC
+++ CMakeLists.txt
-@@ -216,7 +216,7 @@ set(MINIMUM_CXX_STANDARD 14)
+@@ -250,7 +250,7 @@ set(MINIMUM_CXX_STANDARD 14)
+
# @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_<VERSION> should be used to circumvent this
set(MINIMUM_OPENVDB_ABI_VERSION 6)
-@@ -231,13 +231,13 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS)
+@@ -265,8 +265,8 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS)
set(MINIMUM_MSVC_VERSION 19.10)
- set(MINIMUM_BOOST_VERSION 1.61) # @warning should be 1.66, but H18 ships with 1.61
-- set(MINIMUM_ILMBASE_VERSION 2.2) # @warning should be 2.3, but H18 ships with 2.2
-- set(MINIMUM_OPENEXR_VERSION 2.2) # @warning should be 2.3, but H18 ships with 2.2
-+ set(MINIMUM_ILMBASE_VERSION 3.0) # @warning should be 2.3, but H18 ships with 2.2
-+ set(MINIMUM_OPENEXR_VERSION 3.0) # @warning should be 2.3, but H18 ships with 2.2
+ set(MINIMUM_BOOST_VERSION 1.70)
+- set(MINIMUM_ILMBASE_VERSION 2.4)
+- set(MINIMUM_OPENEXR_VERSION 2.4)
++ set(MINIMUM_ILMBASE_VERSION 3.0)
++ set(MINIMUM_OPENEXR_VERSION 3.0)
set(MINIMUM_ZLIB_VERSION 1.2.7)
- 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.14.0)
-
- set(MINIMUM_GOOGLETEST_VERSION 1.8)
+ set(MINIMUM_TBB_VERSION 2019.0)
+ set(MINIMUM_LLVM_VERSION 7.0.0)
diff --git a/misc/openvdb/files/patch-cmake_FindOpenEXR.cmake b/misc/openvdb/files/patch-cmake_FindOpenEXR.cmake
deleted file mode 100644
index 45d78f1a4039..000000000000
--- a/misc/openvdb/files/patch-cmake_FindOpenEXR.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmake/FindOpenEXR.cmake.orig 2021-02-05 19:21:38 UTC
-+++ cmake/FindOpenEXR.cmake
-@@ -91,8 +91,7 @@ if(DISABLE_CMAKE_SEARCH_PATHS)
- endif()
-
- set(_OPENEXR_COMPONENT_LIST
-- IlmImf
-- IlmImfUtil
-+ OpenEXR
- )
-
- if(OpenEXR_FIND_COMPONENTS)
diff --git a/misc/openvdb/files/patch-cmake_FindTBB.cmake b/misc/openvdb/files/patch-cmake_FindTBB.cmake
index 384f0817d3a9..8d3480fd715d 100644
--- a/misc/openvdb/files/patch-cmake_FindTBB.cmake
+++ b/misc/openvdb/files/patch-cmake_FindTBB.cmake
@@ -1,6 +1,6 @@
---- cmake/FindTBB.cmake.orig 2021-02-05 19:21:38 UTC
+--- cmake/FindTBB.cmake.orig 2021-10-30 02:55:40 UTC
+++ cmake/FindTBB.cmake
-@@ -93,7 +93,6 @@ endif()
+@@ -110,7 +110,6 @@ endif()
set(_TBB_COMPONENT_LIST
tbb
tbbmalloc
diff --git a/misc/openvdb/files/patch-doc_CMakeLists.txt b/misc/openvdb/files/patch-doc_CMakeLists.txt
index 31df4557ff24..ae537ef77557 100644
--- a/misc/openvdb/files/patch-doc_CMakeLists.txt
+++ b/misc/openvdb/files/patch-doc_CMakeLists.txt
@@ -1,6 +1,6 @@
---- doc/CMakeLists.txt.orig 2021-02-05 19:21:38 UTC
+--- doc/CMakeLists.txt.orig 2021-10-30 02:55:40 UTC
+++ doc/CMakeLists.txt
-@@ -195,5 +195,5 @@ doxygen_add_docs(doc ${DOXY_FILES}
+@@ -270,5 +270,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.
diff --git a/misc/openvdb/files/patch-openvdb_openvdb_CMakeLists.txt b/misc/openvdb/files/patch-openvdb_openvdb_CMakeLists.txt
deleted file mode 100644
index d1ff3bfa6cc7..000000000000
--- a/misc/openvdb/files/patch-openvdb_openvdb_CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
---- openvdb/openvdb/CMakeLists.txt.orig 2021-06-11 21:38:41 UTC
-+++ openvdb/openvdb/CMakeLists.txt
-@@ -128,8 +128,8 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_V
- endif()
- endif()
-
-+find_package(Imath ${MINIMUM_ILMBASE_VERSION} REQUIRED)
- if(USE_IMATH_HALF)
-- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half)
- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION)
- if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION)
- message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} "
-@@ -191,7 +191,7 @@ set(OPENVDB_CORE_DEPENDENT_LIBS
- )
-
- if(USE_IMATH_HALF)
-- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS IlmBase::Half)
-+ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Imath::Half)
- endif()
-
- if(WIN32)
diff --git a/misc/openvdb/files/patch-openvdb_openvdb_Types.h b/misc/openvdb/files/patch-openvdb_openvdb_Types.h
deleted file mode 100644
index 037068298f82..000000000000
--- a/misc/openvdb/files/patch-openvdb_openvdb_Types.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- openvdb/openvdb/Types.h.orig 2021-06-11 21:38:41 UTC
-+++ openvdb/openvdb/Types.h
-@@ -9,7 +9,7 @@
- #include "TypeList.h" // backwards compat
-
- #ifdef OPENVDB_USE_IMATH_HALF
--#include <OpenEXR/half.h>
-+#include <Imath/half.h>
- namespace openvdb {
- OPENVDB_USE_VERSION_NAMESPACE
- namespace OPENVDB_VERSION_NAME {
diff --git a/misc/openvdb/files/patch-openvdb_openvdb_cmd_CMakeLists.txt b/misc/openvdb/files/patch-openvdb_openvdb_cmd_CMakeLists.txt
deleted file mode 100644
index ce148b306885..000000000000
--- a/misc/openvdb/files/patch-openvdb_openvdb_cmd_CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
---- openvdb/openvdb/cmd/CMakeLists.txt.orig 2021-06-11 21:38:41 UTC
-+++ openvdb/openvdb/cmd/CMakeLists.txt
-@@ -116,8 +116,8 @@ endif()
- #### vdb_render
-
- if(OPENVDB_BUILD_VDB_RENDER)
-- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath)
-- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf)
-+ find_package(Imath ${MINIMUM_ILMBASE_VERSION} REQUIRED)
-+ find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED)
-
- set(VDB_RENDER_SOURCE_FILES openvdb_render.cc)
- add_executable(vdb_render ${VDB_RENDER_SOURCE_FILES})
-@@ -129,11 +129,8 @@ if(OPENVDB_BUILD_VDB_RENDER)
- # headers
-
- target_link_libraries(vdb_render
-- IlmBase::Half
-- OpenEXR::IlmImf
-- IlmBase::IlmThread
-- IlmBase::Iex
-- IlmBase::Imath
-+ OpenEXR::OpenEXR
-+ Imath::Imath
- ${OPENVDB_BINARIES_DEPENDENT_LIBS}
- )
-
diff --git a/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt b/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt
index 16ccc54eefa9..e7987e5b6e12 100644
--- a/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt
+++ b/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt
@@ -1,25 +1,16 @@
---- openvdb/openvdb/python/CMakeLists.txt.orig 2021-02-05 19:21:38 UTC
+--- openvdb/openvdb/python/CMakeLists.txt.orig 2021-10-30 02:55:40 UTC
+++ openvdb/openvdb/python/CMakeLists.txt
-@@ -81,7 +81,7 @@ if(OPENVDB_BUILD_PYTHON_UNITTESTS)
+@@ -88,11 +88,11 @@ if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY)
+ list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
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})
+-find_package(Python QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
++find_package(Python ${FREEBSD_PYTHON_VER} EXACT QUIET COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
+ OPENVDB_CHECK_PYTHON_VERSION(${Python_VERSION} ${Python_INCLUDE_DIRS})
- if(USE_NUMPY)
-@@ -90,11 +90,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})
-
- 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}\")"
+ if(USE_NUMPY)
+- find_package(Python QUIET COMPONENTS NumPy)
++ find_package(Python ${FREEBSD_PYTHON_VER} EXACT QUIET COMPONENTS NumPy)
+ if(NOT TARGET Python::NumPy)
+ message(FATAL_ERROR "Could NOT find NumPy (Required is at least version "
+ "\"${MINIMUM_NUMPY_VERSION}\")"
diff --git a/misc/openvdb/pkg-plist b/misc/openvdb/pkg-plist
index c264e0880272..79ce97eb9c13 100644
--- a/misc/openvdb/pkg-plist
+++ b/misc/openvdb/pkg-plist
@@ -130,6 +130,7 @@ include/openvdb/tree/Tree.h
include/openvdb/tree/TreeIterator.h
include/openvdb/tree/ValueAccessor.h
include/openvdb/util/CpuTimer.h
+include/openvdb/util/ExplicitInstantiation.h
include/openvdb/util/Formats.h
include/openvdb/util/MapsUtil.h
include/openvdb/util/Name.h
@@ -151,6 +152,6 @@ lib/cmake/OpenVDB/OpenVDBHoudiniSetup.cmake
lib/cmake/OpenVDB/OpenVDBMayaSetup.cmake
lib/cmake/OpenVDB/OpenVDBUtils.cmake
lib/libopenvdb.so
-lib/libopenvdb.so.8.1
-lib/libopenvdb.so.8.1.0
-%%PYTHON%%%%PYTHON_LIBDIR%%/pyopenvdb.so
+lib/libopenvdb.so.9.0
+lib/libopenvdb.so.9.0.0
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyopenvdb.so
diff --git a/science/opensph/Makefile b/science/opensph/Makefile
index b6c527d020ea..5fa46883cff3 100644
--- a/science/opensph/Makefile
+++ b/science/opensph/Makefile
@@ -1,6 +1,6 @@
PORTNAME= OpenSPH
DISTVERSION= 0.3.8
-PORTREVISION= 2 # accounts for the upstream moving 0.3.8 release, including bugfixes
+PORTREVISION= 3 # accounts for the upstream moving 0.3.8 release, including bugfixes
CATEGORIES= science
MAINTAINER= yuri@FreeBSD.org