Skip to content

Commit bb283c9

Browse files
sunyabpixar-oss
authored andcommitted
build_usd.py: Apply fix to OpenVDB to support Xcode 16.3
AcademySoftwareFoundation/openvdb#1977 fixed a syntax issue that caused errors when building with Xcode 16.3. This change updates build_usd.py to apply the (simple) patch to the version of OpenVDB it builds. We manually back-port this fix for a few reasons: - The PR was merged in December 2024, but is currently not part of an official release. - build_usd.py currently uses OpenVDB 9.1.0, which is several major versions behind the current latest version 12.0.0. Even if the PR were released in a new 12.x version, we wouldn't want to jump all the way there since it's so far ahead of what we're building and testing against internally. If OpenVDB officially ports the fix back to older versions, we can revert this change and just update build_usd.py to pull in the official release instead. (Internal change: 2359154)
1 parent ec28a45 commit bb283c9

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

build_scripts/build_usd.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,6 +1306,13 @@ def InstallOpenVDB(context, force, buildArgs):
13061306
openvdb_url = OPENVDB_INTEL_URL
13071307

13081308
with CurrentWorkingDirectory(DownloadURL(openvdb_url, context, force)):
1309+
# Back-port patch from OpenVDB PR #1977 to avoid errors when building
1310+
# with Xcode 16.3+. This fix is anticipated to be part of an OpenVDB
1311+
# 12.x release, which is in the VFX Reference Platform CY2025 and is
1312+
# several major versions ahead of what we currently use.
1313+
PatchFile("openvdb/openvdb/tree/NodeManager.h",
1314+
[("OpT::template eval", "OpT::eval")])
1315+
13091316
extraArgs = [
13101317
'-DOPENVDB_BUILD_PYTHON_MODULE=OFF',
13111318
'-DOPENVDB_BUILD_BINARIES=OFF',

0 commit comments

Comments
 (0)