From 87d5af08e909e7bc269ff2709e8b590c3f6b894e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabien=20P=C3=A9an?= <pean@virtonomy.io>
Date: Tue, 5 Aug 2025 00:32:33 +0200
Subject: [PATCH] [openvdb] Update to v12.0.1 (#46728)

---
 ports/openvdb/portfile.cmake    | 12 +++++++++---
 ports/openvdb/vcpkg.json        |  7 +++----
 scripts/ci.feature.baseline.txt |  6 +++---
 versions/baseline.json          |  4 ++--
 versions/o-/openvdb.json        |  5 +++++
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake
index e6f746ce9c..58f0d0e4d3 100644
--- a/ports/openvdb/portfile.cmake
+++ b/ports/openvdb/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AcademySoftwareFoundation/openvdb
     REF "v${VERSION}"
-    SHA512 7ea2997afa99ed1ed23422eb8b8420c7127c913432f94043ccf559b6720bba2f6e19376e955d8d9055ab765a821749936966f6e5925b9d36febaa724d866b90a
+    SHA512 67b859bf77c53e68116faa7915bb6a5a50a8cff10435762890e13348625e8aebdb6661b722017632471648afe31e2f9d4cd2e18456c728192bfd0accd70a40ef
     PATCHES
         fix_cmake.patch
 )
@@ -30,7 +30,12 @@ if (OPENVDB_BUILD_NANOVDB)
     -DNANOVDB_USE_CUDA=ON
     -DNANOVDB_CUDA_KEEP_PTX=ON
     -DNANOVDB_USE_OPENVDB=ON
-)
+    )
+    vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT cuda_toolkit_root)
+    list(APPEND FEATURE_OPTIONS
+        "-DCMAKE_CUDA_COMPILER=${NVCC}"
+        "-DCUDAToolkit_ROOT=${cuda_toolkit_root}"
+    )
 endif()
 
 vcpkg_cmake_configure(
@@ -54,6 +59,7 @@ vcpkg_cmake_configure(
     MAYBE_UNUSED_VARIABLES
         OPENVDB_3_ABI_COMPATIBLE
         OPENVDB_BUILD_TOOLS
+        NANOVDB_BUILD_TOOLS
 )
 
 vcpkg_cmake_install()
@@ -74,4 +80,4 @@ endif()
 
 configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/openvdb/openvdb/COPYRIGHT")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/openvdb/vcpkg.json b/ports/openvdb/vcpkg.json
index 9a5856c2f3..f4349d1f3f 100644
--- a/ports/openvdb/vcpkg.json
+++ b/ports/openvdb/vcpkg.json
@@ -1,10 +1,9 @@
 {
   "name": "openvdb",
-  "version": "12.0.0",
-  "port-version": 1,
+  "version": "12.0.1",
   "description": "Sparse volume data structure and tools",
-  "homepage": "https://github.com/dreamworksanimation/openvdb",
-  "license": "MPL-2.0",
+  "homepage": "https://www.openvdb.org",
+  "license": "Apache-2.0",
   "supports": "!xbox",
   "dependencies": [
     "blosc",
diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt
index b35718d87f..af7d136875 100644
--- a/scripts/ci.feature.baseline.txt
+++ b/scripts/ci.feature.baseline.txt
@@ -381,7 +381,6 @@ openmesh:arm-uwp=fail
 openmesh:arm64-windows=fail
 openmesh:x64-uwp=fail
 openslide(windows & native)=fail # g_auto* using __attribute__((cleanup))
-openvdb(windows & static)=fail # https://github.com/AcademySoftwareFoundation/openvdb/issues/1362: openvdb\openvdb\libopenvdb.lib : fatal error LNK1248: image size (109A36020) exceeds maximum allowable size (FFFFFFFF)
 openvpn3:x64-osx=fail
 openvr:arm-uwp=fail
 openvr:arm64-windows=fail
@@ -1572,8 +1571,10 @@ opentelemetry-cpp[jaeger,prometheus]:x64-uwp = cascade
 openturns:arm64-uwp = cascade
 openturns:arm64-windows = cascade
 openturns:x64-uwp = cascade
-openvdb:arm64-uwp = cascade
 openvdb:x64-uwp = cascade
+openvdb[ax](!osx & !linux) = cascade
+openvdb[ax](osx | linux) = feature-fails
+openvdb[nanovdb]:arm64-uwp = cascade
 openvdb[nanovdb](osx) = cascade
 openvino:arm64-uwp = cascade
 openvino:x64-uwp = cascade
@@ -2180,7 +2181,6 @@ openmvg[core](arm & windows & !uwp) = combination-fails # nmmintrin.h(17): fatal
 openmvg[openmp](arm & windows & !uwp) = feature-fails
 openscap[python](!windows) = feature-fails # CI image lacks swig
 opentelemetry-cpp[otlp](uwp) = feature-fails # --grpc_out: protoc-gen-grpc: The system cannot find the file specified. See https://github.com/microsoft/vcpkg/issues/34847
-openvdb[ax] = feature-fails # ax requires llvm version <= 14. Work when using a baseline + overwrite
 orange-math(linux) = fail # requires gcc15 or later
 osgearth[tools](osx) = feature-fails # Undefined _NSSearchPathForDirectoriesInDomains
 pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,png,pybind11,realsense,test,tiff,tools,vars,video,zstd](!(arm & windows)) = combination-fails # see https://github.com/microsoft/vcpkg/issues/31304
diff --git a/versions/baseline.json b/versions/baseline.json
index 19a9949647..a4d58abf34 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7105,8 +7105,8 @@
       "port-version": 0
     },
     "openvdb": {
-      "baseline": "12.0.0",
-      "port-version": 1
+      "baseline": "12.0.1",
+      "port-version": 0
     },
     "openvino": {
       "baseline": "2025.1.0",
diff --git a/versions/o-/openvdb.json b/versions/o-/openvdb.json
index ca7e96bf6a..126368b8cf 100644
--- a/versions/o-/openvdb.json
+++ b/versions/o-/openvdb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "327ac401596e515e76f93287857211fbe0be9008",
+      "version": "12.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "0a440c407a2282daceb06a6d4cd539a8ba067872",
       "version": "12.0.0",