Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reported by: portscout
- Loading branch information
Showing
17 changed files
with
43 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
27 changes: 0 additions & 27 deletions
27
misc/openvdb/files/patch-openvdb_openvdb_cmd_CMakeLists.txt
This file was deleted.
Oops, something went wrong.
33 changes: 12 additions & 21 deletions
33
misc/openvdb/files/patch-openvdb_openvdb_python_CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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}\")" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters