Skip to content

Commit

Permalink
[OpenVDB] update to version 10.0.0 (microsoft#27726)
Browse files Browse the repository at this point in the history
* [<OpenVDB>] update to <version 10.0.0>

* update version
  • Loading branch information
JonLiu1993 authored Nov 9, 2022
1 parent 9e490a6 commit 606011f
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 62 deletions.
53 changes: 17 additions & 36 deletions ports/openvdb/0003-fix-cmake.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8dfbc5e..0ba8887 100644
index 9330c29..a98516a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -373,13 +373,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
@@ -283,13 +283,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")

if(OPENVDB_INSTALL_CMAKE_MODULES)
set(OPENVDB_CMAKE_MODULES
Expand All @@ -17,10 +17,10 @@ index 8dfbc5e..0ba8887 100644
cmake/OpenVDBHoudiniSetup.cmake
cmake/OpenVDBMayaSetup.cmake
diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
index 0dac1de..5014c6a 100644
index 5ff96f6..c3de6f9 100644
--- a/cmake/FindOpenVDB.cmake
+++ b/cmake/FindOpenVDB.cmake
@@ -485,7 +485,7 @@ endif()
@@ -490,7 +490,7 @@ endif()

# Add standard dependencies

Expand All @@ -29,7 +29,7 @@ index 0dac1de..5014c6a 100644

if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS)
# @note Both of these must be set for Boost 1.70 (VFX2020) to link against
@@ -635,7 +635,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS)
@@ -651,7 +651,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS)
endif()

if(OpenVDB_USES_BLOSC)
Expand All @@ -38,7 +38,7 @@ index 0dac1de..5014c6a 100644
endif()

if(OpenVDB_USES_ZLIB)
@@ -649,7 +649,7 @@ endif()
@@ -665,7 +665,7 @@ endif()
if(OpenVDB_USES_IMATH_HALF)
find_package(Imath CONFIG)
if (NOT TARGET Imath::Imath)
Expand All @@ -47,7 +47,7 @@ index 0dac1de..5014c6a 100644
endif()

if(WIN32)
@@ -698,7 +698,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES)
@@ -716,7 +716,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES)

if(NOT OPENVDB_USE_STATIC_LIBS)
if(OpenVDB_USES_BLOSC)
Expand All @@ -57,10 +57,10 @@ index 0dac1de..5014c6a 100644
if(OpenVDB_USES_ZLIB)
list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB)
diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt
index 1d5b75f..f2da6f9 100644
index 1b48e84..46eeea4 100644
--- a/openvdb/openvdb/CMakeLists.txt
+++ b/openvdb/openvdb/CMakeLists.txt
@@ -127,9 +127,9 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
@@ -130,9 +130,9 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
endif()
endif()

Expand All @@ -72,7 +72,7 @@ index 1d5b75f..f2da6f9 100644
message(DEPRECATION "Support for TBB versions < ${FUTURE_MINIMUM_TBB_VERSION} "
"is deprecated and will be removed.")
endif()
@@ -138,7 +138,7 @@ endif()
@@ -141,7 +141,7 @@ endif()
if(USE_IMATH_HALF)
find_package(Imath CONFIG)
if (NOT TARGET Imath::Imath)
Expand All @@ -81,7 +81,7 @@ index 1d5b75f..f2da6f9 100644
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} "
@@ -157,26 +157,7 @@ endif()
@@ -160,26 +160,7 @@ endif()

if(USE_BLOSC)
# Find Blosc libraries
Expand Down Expand Up @@ -109,7 +109,7 @@ index 1d5b75f..f2da6f9 100644
else()
message(WARNING "Blosc support is disabled. It is strongly recommended to "
"enable blosc for optimal builds of OpenVDB and to support compatible "
@@ -234,7 +215,7 @@ endif()
@@ -237,7 +218,7 @@ endif()
# /usr/local

if(USE_BLOSC)
Expand All @@ -118,11 +118,11 @@ index 1d5b75f..f2da6f9 100644
endif()

if(USE_BLOSC OR USE_ZLIB)
diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt
index c1d5649..c173566 100644
--- a/openvdb/openvdb/cmd/CMakeLists.txt
+++ b/openvdb/openvdb/cmd/CMakeLists.txt
@@ -46,7 +46,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc")
diff --git a/openvdb_cmd/CMakeLists.txt b/openvdb_cmd/CMakeLists.txt
index c4351f4..b480334 100644
--- a/openvdb_cmd/CMakeLists.txt
+++ b/openvdb_cmd/CMakeLists.txt
@@ -53,7 +53,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc")
find_package(Jemalloc REQUIRED)
list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS Jemalloc::jemalloc)
elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc")
Expand All @@ -131,22 +131,3 @@ index c1d5649..c173566 100644
list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc)
endif()

@@ -90,17 +90,13 @@ if(OPENVDB_BUILD_VDB_RENDER)
find_package(Imath CONFIG)
if (NOT TARGET Imath::Imath)
if(USE_EXR)
- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath)
- else()
- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half)
+ find_package(IlmBase CONFIG REQUIRED)
endif()
endif()
endif()

if(USE_EXR)
if (NOT TARGET Imath::Imath)
- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf)
- else()
find_package(OpenEXR CONFIG REQUIRED)
endif()
endif()
19 changes: 0 additions & 19 deletions ports/openvdb/fix-Target-notfound.patch

This file was deleted.

5 changes: 2 additions & 3 deletions ports/openvdb/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO AcademySoftwareFoundation/openvdb
REF 0ed0f19ea4fbb0d8bf64d3dca07abab3c7429803 # v9.0.0
SHA512 f033f2d5801327ab8aeffb12d1a74ff880e477a1f00da3b03a3087262a3e72ef77c13e05fe8e3c94a26721804230c0272d9ca069af997c36c992f3e2f3d962f2
REF be0e7a78861d2b7d9643f7a0cab04f3ab5951686 # v10.0.0
SHA512 92301bf675d700fedb0a2b3c4653158eeda6105e70623e5e4bda15d73391427cf0295a0426204888e2fe062847025542717bff34ceb923e51cffa1721e9d4105
PATCHES
0003-fix-cmake.patch
fix-Target-notfound.patch
)

file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake")
Expand Down
3 changes: 1 addition & 2 deletions ports/openvdb/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "openvdb",
"version": "9.0.0",
"port-version": 1,
"version": "10.0.0",
"description": "Sparse volume data structure and tools",
"homepage": "https://github.com/dreamworksanimation/openvdb",
"license": "MPL-2.0",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5533,8 +5533,8 @@
"port-version": 3
},
"openvdb": {
"baseline": "9.0.0",
"port-version": 1
"baseline": "10.0.0",
"port-version": 0
},
"openvpn3": {
"baseline": "3.7.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openvdb.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "da455f3dd793dc3d235db1a2fd3cbe68ab71ae04",
"version": "10.0.0",
"port-version": 0
},
{
"git-tree": "fd83349668c7c8ec38e4850437ec678b44e038f5",
"version": "9.0.0",
Expand Down

0 comments on commit 606011f

Please sign in to comment.