Initial VFX Platform 2024 updates #275
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We're put into a bit of a odd corner with Minizip's defined value of `MZ_VERSION_BUILD`, which OCIO relies on for compatibility with both Minizip 3.x and 4.x. In Minizip 3.0.8 and above this is defined as an octal literal with apparently? hexadecimal values. Recent releases of Minizip 4 correctly prepend the hexadecimal value with 0x, but OCIO's version checks haven't caught up. So we're left either patching `MZ_VERSION_BUILD` to a valid octal value or updating to Minizip 4.x and patching OCIO's `#if MZ_VERSION_BUILD >= 040000` checks to `#if MZ_VERSION_BUILD >= 0x40000`. Of the two choices, I've gone with the one requiring the smallest patch.
This can be removed as soon as we update to Boost 1.82. Patch taken from: boostorg/python@a218bab
Contributor
|
Just to note as of yesterday I am building/testing ImageEngine/cortex#1460 with boost-1.85 - for Cortex it'll need an My custom Cortex lives at Cheers |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This begins bumping our dependency versions to better align with VFX Platform 2024.
Notably, Boost hasn't been updated here as we'll first require some of the updates from ImageEngine/cortex#1460 merged and a new Cortex version released. For now, I've included a small patch to fix an issue between Boost 1.80 and Python 3.11, but this can be dropped as soon as we update to Boost 1.82.
We expect the Qt 6.5 update will be tackled independently after the remainder of the dependencies updates are in place. In the meantime I've bumped Qt 5.15 to the latest available as this includes some fixes that should help us restore macOS CI with Xcode 15.