misc/openvdb: Update 9.0.0 -> 9.1.0

Reported by:	portscout

3 files changed, 9 insertions, 36 deletions

diff --git a/misc/openvdb/files/patch-CMakeLists.txt b/misc/openvdb/files/patch-CMakeLists.txt
deleted file mode 100644
index 17689aa25184..000000000000
--- a/misc/openvdb/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
---- CMakeLists.txt.orig	2021-10-30 02:55:40 UTC
-+++ CMakeLists.txt
-@@ -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.
--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)
-@@ -265,8 +265,8 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS)
-   set(MINIMUM_MSVC_VERSION 19.10)
- 
-   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 2019.0)
-   set(MINIMUM_LLVM_VERSION 7.0.0)
diff --git a/misc/openvdb/files/patch-doc_CMakeLists.txt b/misc/openvdb/files/patch-doc_CMakeLists.txt
index ae537ef77557..266deb56bd66 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-10-30 02:55:40 UTC
+--- doc/CMakeLists.txt.orig	2022-06-09 14:50:40 UTC
 +++ doc/CMakeLists.txt
-@@ -270,5 +270,5 @@ doxygen_add_docs(doc ${DOXY_FILES}
+@@ -267,5 +267,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_python_CMakeLists.txt b/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt
index e7987e5b6e12..12b187e2ac81 100644
--- a/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt
+++ b/misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt
@@ -1,16 +1,11 @@
---- openvdb/openvdb/python/CMakeLists.txt.orig	2021-10-30 02:55:40 UTC
+--- openvdb/openvdb/python/CMakeLists.txt.orig	2022-06-09 14:50:40 UTC
 +++ openvdb/openvdb/python/CMakeLists.txt
-@@ -88,11 +88,11 @@ if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY)
-     list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
+@@ -115,7 +115,7 @@ if(USE_NUMPY)
  endif()
  
--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})
+ # Make sure find_package(Python) is only ever invoked once with all required components
+-find_package(Python COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
++find_package(Python ${FREEBSD_PYTHON_VER} EXACT COMPONENTS ${OPENVDB_PYTHON_REQUIRED_COMPONENTS})
  
- 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}\")"
+ openvdb_check_python_version(Python::Module
+   "${Python_VERSION}"