Skip to content

Commit 9d7fa21

Browse files
tallytalwarpixar-oss
authored andcommitted
Update OCIO to 2.4.2 on MacOS
This is to avoid build issues resulting from Xcode 26. (Internal change: 2406844)
1 parent c1054bb commit 9d7fa21

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
(PR: [#3707](https://github.com/PixarAnimationStudios/OpenUSD/pull/3707))
1111
- Fixed a bug where OpenImageIO would not use the OpenColorIO library built by
1212
build_usd.py if both were enabled.
13+
- Updated OCIO version to 2.4.2 for macOS builds, to avoid build issues with
14+
latest versions of Xcode (26).
1315

1416
- Removed support for Python 3.8 and added support for Python 3.14 for the
1517
usd-core PyPI package.

VERSIONS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Our test machines have the following software versions installed.
2121
| OneTBB | 2021.9 | 2021.9 | 2021.9 |
2222
| OpenSubdiv | 3.6.1 | 3.6.1 | 3.6.1 |
2323
| OpenImageIO | 2.5.16.0 | 2.5.16.0 | 2.5.16.0 |
24-
| OpenColorIO | 2.2.1 | 2.2.1 | 2.2.1 |
24+
| OpenColorIO | 2.2.1 | 2.4.2 | 2.2.1 |
2525
| OSL | 1.13.11 | | |
2626
| Ptex | 2.4.2 | 2.4.2 | 2.4.2 |
2727
| Qt for Python | PySide2 5.15.2.1 | PySide6 6.3.1 | PySide2 5.15.2.1 |

build_scripts/build_usd.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,10 +1470,16 @@ def InstallOpenImageIO(context, force, buildArgs):
14701470
############################################################
14711471
# OpenColorIO
14721472

1473-
OCIO_URL = "https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.2.1.zip"
1473+
if MacOS():
1474+
OCIO_URL = "https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.4.2.zip"
1475+
else:
1476+
OCIO_URL = "https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.2.1.zip"
14741477

14751478
def InstallOpenColorIO(context, force, buildArgs):
1476-
with CurrentWorkingDirectory(DownloadURL(OCIO_URL, context, force)):
1479+
# build ocio dest file name based on the OCIO_URL version
1480+
ocioDestFileName = os.path.splitext(os.path.basename(OCIO_URL))[0]
1481+
with CurrentWorkingDirectory(DownloadURL(OCIO_URL, context, force,
1482+
destFileName=ocioDestFileName)):
14771483
extraArgs = ['-DOCIO_BUILD_APPS=OFF',
14781484
'-DOCIO_BUILD_DOCS=OFF',
14791485
'-DOCIO_BUILD_TESTS=OFF',

0 commit comments

Comments
 (0)