[openvdb] update to version 11 (#35597)

* openvdb versio update to 11.0

wip

update

* udpate patches

* revert eof

* update git tree

ports/openvdb/fix_cmake.patch

@@ -1,14 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9330c29..a98516a 100644
+index 8329dda9..71f45701 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -283,13 +283,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+@@ -284,12 +284,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
  
  if(OPENVDB_INSTALL_CMAKE_MODULES)
    set(OPENVDB_CMAKE_MODULES
 -    cmake/FindBlosc.cmake
      cmake/FindJemalloc.cmake
--    cmake/FindIlmBase.cmake
      cmake/FindLog4cplus.cmake
 -    cmake/FindOpenEXR.cmake
      cmake/FindOpenVDB.cmake
@@ -17,7 +16,7 @@ index 9330c29..a98516a 100644
      cmake/OpenVDBHoudiniSetup.cmake
      cmake/OpenVDBMayaSetup.cmake
 diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
-index 5ff96f6..c3de6f9 100644
+index c4213c85..86b24e9d 100644
 --- a/cmake/FindOpenVDB.cmake
 +++ b/cmake/FindOpenVDB.cmake
 @@ -490,7 +490,7 @@ endif()
@@ -26,10 +25,10 @@ index 5ff96f6..c3de6f9 100644
  
 -find_package(TBB REQUIRED COMPONENTS tbb)
 +find_package(TBB CONFIG REQUIRED)
+ find_package(Boost REQUIRED COMPONENTS iostreams)
  
- 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
-@@ -651,7 +651,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS)
+ # Add deps for pyopenvdb
+@@ -641,7 +641,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS)
  endif()
  
  if(OpenVDB_USES_BLOSC)
@@ -38,16 +37,7 @@ index 5ff96f6..c3de6f9 100644
  endif()
  
  if(OpenVDB_USES_ZLIB)
-@@ -665,7 +665,7 @@ endif()
- if(OpenVDB_USES_IMATH_HALF)
-   find_package(Imath CONFIG)
-   if (NOT TARGET Imath::Imath)
--    find_package(IlmBase REQUIRED COMPONENTS Half)
-+    find_package(IlmBase CONFIG REQUIRED)
-   endif()
- 
-   if(WIN32)
-@@ -716,7 +716,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES)
+@@ -694,7 +694,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES)
  
  if(NOT OPENVDB_USE_STATIC_LIBS)
    if(OpenVDB_USES_BLOSC)
@@ -57,31 +47,19 @@ index 5ff96f6..c3de6f9 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 1b48e84..5d055ac 100644
+index 33d4e5cc..63699b2c 100644
 --- a/openvdb/openvdb/CMakeLists.txt
 +++ b/openvdb/openvdb/CMakeLists.txt
-@@ -130,9 +130,9 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
+@@ -123,7 +123,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
    endif()
  endif()
  
 -find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb)
 +find_package(TBB CONFIG REQUIRED)
  if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION)
--  if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
-+  if(${TBB_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
+   if(${TBB_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION)
      message(DEPRECATION "Support for TBB versions < ${FUTURE_MINIMUM_TBB_VERSION} "
-       "is deprecated and will be removed.")
-   endif()
-@@ -141,7 +141,7 @@ endif()
- if(USE_IMATH_HALF)
-   find_package(Imath CONFIG)
-   if (NOT TARGET Imath::Imath)
--    find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half)
-+    find_package(IlmBase CONFIG REQUIRED)
-     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} "
-@@ -160,26 +160,7 @@ endif()
+@@ -152,26 +152,7 @@ endif()
  
  if(USE_BLOSC)
    # Find Blosc libraries
@@ -109,12 +87,12 @@ index 1b48e84..5d055ac 100644
  else()
    message(WARNING "Blosc support is disabled. It is strongly recommended to "
      "enable blosc for optimal builds of OpenVDB and to support compatible "
-@@ -237,7 +218,11 @@ endif()
+@@ -228,7 +209,11 @@ endif()
  # /usr/local
  
  if(USE_BLOSC)
 -  list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc)
-+    if(BUILD_SHARED_LIBS)
++  if(BUILD_SHARED_LIBS)
 +    list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc_shared)
 +  else()
 +    list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc_static)
@@ -123,7 +101,7 @@ index 1b48e84..5d055ac 100644
  
  if(USE_BLOSC OR USE_ZLIB)
 diff --git a/openvdb_cmd/CMakeLists.txt b/openvdb_cmd/CMakeLists.txt
-index c4351f4..b480334 100644
+index c4351f49..b4803341 100644
 --- a/openvdb_cmd/CMakeLists.txt
 +++ b/openvdb_cmd/CMakeLists.txt
 @@ -53,7 +53,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc")

ports/openvdb/fix_nanovdb.patch

@@ -1,8 +1,8 @@
 diff --git a/nanovdb/nanovdb/CMakeLists.txt b/nanovdb/nanovdb/CMakeLists.txt
-index d20b4928..257d005a 100644
+index 7bb3ab86..9311ed17 100644
 --- a/nanovdb/nanovdb/CMakeLists.txt
 +++ b/nanovdb/nanovdb/CMakeLists.txt
-@@ -128,7 +128,7 @@ if(NANOVDB_USE_TBB AND NOT TARGET TBB::tbb)
+@@ -127,7 +127,7 @@ if(NANOVDB_USE_TBB AND NOT TARGET TBB::tbb)
  endif()
  
  if(NANOVDB_USE_BLOSC AND NOT TARGET Blosc::blosc)
@@ -11,7 +11,7 @@ index d20b4928..257d005a 100644
  endif()
  
  if(NANOVDB_USE_ZLIB AND NOT TARGET ZLIB::ZLIB)
-@@ -224,7 +224,7 @@ if(NANOVDB_USE_TBB)
+@@ -236,7 +236,7 @@ if(NANOVDB_USE_TBB)
  endif()
  
  if(NANOVDB_USE_BLOSC)

ports/openvdb/portfile.cmake

@@ -1,10 +1,10 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AcademySoftwareFoundation/openvdb
-    REF be0e7a78861d2b7d9643f7a0cab04f3ab5951686 # v10.0.0
-    SHA512 92301bf675d700fedb0a2b3c4653158eeda6105e70623e5e4bda15d73391427cf0295a0426204888e2fe062847025542717bff34ceb923e51cffa1721e9d4105
+    REF "v${VERSION}"
+    SHA512 f2c90ca8435ecbacefda429341000ecb555385c746a3e0233220cd78540cee2a26cc17df7b560fdfe2dc03f2b2e960a2fa226a85980189c3e018164ccc037bd4
     PATCHES
-        0003-fix-cmake.patch
+        fix_cmake.patch
         fix_nanovdb.patch
 )
 

ports/openvdb/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "openvdb",
-  "version": "10.0.0",
-  "port-version": 6,
+  "version": "11.0.0",
   "description": "Sparse volume data structure and tools",
   "homepage": "https://github.com/dreamworksanimation/openvdb",
   "license": "MPL-2.0",

versions/baseline.json

@@ -6365,8 +6365,8 @@
       "port-version": 0
     },
     "openvdb": {
-      "baseline": "10.0.0",
-      "port-version": 6
+      "baseline": "11.0.0",
+      "port-version": 0
     },
     "openvino": {
       "baseline": "2023.2.0",

versions/o-/openvdb.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6997652c81d0f91033cb3cce2bf6e55674725400",
+      "version": "11.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8565eefd07d9a9d108cec2545039261b53d2e3b1",
       "version": "10.0.0",