-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[opencolorio] Update to 2.4.2 #46779
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 3feba7e..b4c2d47 100755 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -518,7 +518,7 @@ install( | ||
| FILE ${OCIO_TARGETS_EXPORT_NAME} | ||
| ) | ||
|
|
||
| -if (NOT BUILD_SHARED_LIBS) | ||
| +if (0) | ||
| # Install custom macros used in the find modules. | ||
| install(FILES | ||
| ${CMAKE_CURRENT_LIST_DIR}/share/cmake/macros/VersionUtils.cmake | ||
| diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake | ||
| index aa2550a..3c968f7 100644 | ||
| --- a/share/cmake/modules/FindExtPackages.cmake | ||
| +++ b/share/cmake/modules/FindExtPackages.cmake | ||
| @@ -55,6 +55,7 @@ message(STATUS "Checking for mandatory dependencies...") | ||
| # expat | ||
| # https://github.com/libexpat/libexpat | ||
| ocio_handle_dependency( expat REQUIRED ALLOW_INSTALL | ||
| + CONFIG | ||
| MIN_VERSION 2.4.1 | ||
| RECOMMENDED_VERSION 2.5.0 | ||
| RECOMMENDED_VERSION_REASON "CVE fixes and fix issue with symbol leakage when built as a static library") | ||
| @@ -62,6 +63,7 @@ ocio_handle_dependency( expat REQUIRED ALLOW_INSTALL | ||
| # yaml-cpp | ||
| # https://github.com/jbeder/yaml-cpp | ||
| ocio_handle_dependency( yaml-cpp REQUIRED ALLOW_INSTALL | ||
| + CONFIG | ||
| MIN_VERSION 0.6.3 | ||
| RECOMMENDED_VERSION 0.7.0 | ||
| RECOMMENDED_VERSION_REASON "Latest version tested with OCIO") | ||
| @@ -69,13 +71,13 @@ ocio_handle_dependency( yaml-cpp REQUIRED ALLOW_INSTALL | ||
| # pystring | ||
| # https://github.com/imageworks/pystring | ||
| ocio_handle_dependency( pystring REQUIRED ALLOW_INSTALL | ||
| - MIN_VERSION 1.1.3 | ||
| - RECOMMENDED_VERSION 1.1.3 | ||
| + CONFIG | ||
| RECOMMENDED_VERSION_REASON "Latest version tested with OCIO") | ||
|
|
||
| # Imath (>=3.1) | ||
| # https://github.com/AcademySoftwareFoundation/Imath | ||
| ocio_handle_dependency( Imath REQUIRED ALLOW_INSTALL | ||
| + CONFIG | ||
| MIN_VERSION 3.1.1 | ||
| RECOMMENDED_VERSION 3.1.12 | ||
| RECOMMENDED_VERSION_REASON "Latest version tested with OCIO") | ||
| @@ -111,7 +113,8 @@ ocio_handle_dependency( ZLIB REQUIRED ALLOW_INSTALL | ||
| # minizip-ng | ||
| # https://github.com/zlib-ng/minizip-ng | ||
| ocio_handle_dependency( minizip-ng REQUIRED ALLOW_INSTALL | ||
| - MIN_VERSION 3.0.6 | ||
| + CONFIG | ||
| + MIN_VERSION 4 | ||
| RECOMMENDED_VERSION 3.0.7 | ||
| RECOMMENDED_VERSION_REASON "Latest version tested with OCIO") | ||
|
|
||
| @@ -132,8 +135,7 @@ if(OCIO_BUILD_APPS) | ||
| # lcms2 | ||
| # https://github.com/mm2/Little-CMS | ||
| ocio_handle_dependency( lcms2 REQUIRED ALLOW_INSTALL | ||
| - MIN_VERSION 2.2 | ||
| - RECOMMENDED_VERSION 2.2 | ||
| + CONFIG | ||
| RECOMMENDED_VERSION_REASON "Latest version tested with OCIO") | ||
| endif() | ||
|
|
||
| @@ -259,6 +261,7 @@ if(OCIO_BUILD_APPS) | ||
| ############################################################################### | ||
| # Calling find_package in CONFIG mode using PREFER_CONFIG option. | ||
| ocio_handle_dependency( OpenEXR PREFER_CONFIG ALLOW_INSTALL | ||
| + CONFIG | ||
| MIN_VERSION ${OpenEXR_MININUM_VERSION} | ||
| RECOMMENDED_VERSION 3.1.5 | ||
| RECOMMENDED_VERSION_REASON "Latest version tested with OCIO" | ||
| diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in | ||
| index 4e2367b..fc0e483 100644 | ||
| --- a/src/cmake/Config.cmake.in | ||
| +++ b/src/cmake/Config.cmake.in | ||
| @@ -23,19 +23,19 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ | ||
| ######################## | ||
|
|
||
| if (NOT TARGET expat::expat) | ||
| - find_dependency(expat @expat_VERSION@) | ||
| + find_dependency(expat @expat_VERSION@ CONFIG) | ||
| endif() | ||
|
|
||
| if (NOT TARGET Imath::Imath) | ||
| - find_dependency(Imath @Imath_VERSION@) | ||
| + find_dependency(Imath @Imath_VERSION@ CONFIG) | ||
| endif() | ||
|
|
||
| if (NOT TARGET pystring::pystring) | ||
| - find_dependency(pystring @pystring_VERSION@) | ||
| + find_dependency(pystring @pystring_VERSION@ CONFIG) | ||
| endif() | ||
|
|
||
| if (NOT TARGET yaml-cpp::yaml-cpp) | ||
| - find_dependency(yaml-cpp @yaml-cpp_VERSION@) | ||
| + find_dependency(yaml-cpp @yaml-cpp_VERSION@ CONFIG) | ||
| if (TARGET yaml-cpp AND NOT TARGET yaml-cpp::yaml-cpp) | ||
| add_library(yaml-cpp::yaml-cpp ALIAS yaml-cpp) | ||
| endif() | ||
| @@ -54,7 +54,7 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ | ||
| endif() | ||
|
|
||
| if (NOT TARGET MINIZIP::minizip-ng) | ||
| - find_dependency(minizip-ng @minizip-ng_VERSION@) | ||
| + find_dependency(minizip-ng @minizip-ng_VERSION@ CONFIG) | ||
| endif() | ||
|
|
||
| # Remove OCIO custom find module path. |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/src/libutils/oglapphelpers/glsl.cpp b/src/libutils/oglapphelpers/glsl.cpp | ||
| index 0154eff..6ad4356 100644 | ||
| --- a/src/libutils/oglapphelpers/glsl.cpp | ||
| +++ b/src/libutils/oglapphelpers/glsl.cpp | ||
| @@ -41,7 +41,7 @@ bool GetGLError(std::string & error) | ||
| // Unfortunately no gluErrorString equivalent on Mac. | ||
| error = "OpenGL Error"; | ||
| #else | ||
| - error = (const char*)gluErrorString(glErr); | ||
| + error = "OpenGL Error"; | ||
| #endif | ||
| return true; | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Function removed from GLEW, cf. #43695