Integration - Port some fixes from main to RB-2.2 - Adsk Contrib #1748
Conversation
This file contains 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
Signed-off-by: Cédrik Fuoco <[email protected]>
Signed-off-by: Bart Styczen <[email protected]> Signed-off-by: Bart Styczen <[email protected]> Co-authored-by: Doug Walker <[email protected]> (cherry picked from commit d5cedbf)
Set function will affects all variables in current directory. If sse flags are added in CheckSupportSSE2.cmake, they will remain in Findminizip-ng.cmake which will cause liblzma cannot be detected. This patch keep CMAKE_REQUIRED_FLAGS being changed only in current file scope. This patch has been tested on riscv64. Signed-off-by: Letu Ren <[email protected]> Signed-off-by: Letu Ren <[email protected]> Co-authored-by: Doug Walker <[email protected]> (cherry picked from commit b6e40f4)
* - Refactoring how OCIO search for minizip-ng. The first step is to search for an external minizip-ng. If not found, search for minizip-ng with MZ_COMPAT=ON (libminizip). If it is not found either, download and install minizip-ng with MZ_COMPAT=OFF. - Removing the minizip-ng part for the includes for minizip-ng headers. Signed-off-by: Cédrik Fuoco <[email protected]> * Update comments Signed-off-by: Cédrik Fuoco <[email protected]> * Improved find_package in Config mode (adding it back) Added missing scripts to install minizip-ng and zlib for the analysis workflow Signed-off-by: Cédrik Fuoco <[email protected]> * Adding +x permissions for install_minizip_ng and zlib Fixing path to find zlib in install_minizip-ng.sh Signed-off-by: Cédrik Fuoco <[email protected]> * Changing target name to match the one used by minizip-ng library (+ using the imported target instead of creating a new one when minizip-ng is found) Signed-off-by: Cédrik Fuoco <[email protected]> Signed-off-by: Cédrik Fuoco <[email protected]> Co-authored-by: Doug Walker <[email protected]> (cherry picked from commit 811902b)
* For Looks that has a FileTransform and for Colorspace with FileTransfrom, add the CCCID to the processor's cache key for that transform. Signed-off-by: Cédrik Fuoco <[email protected]> * Removing the workaround in the related unit tests and fixing the issue by adding the environment variable to the context using setStringVar. The processor's cache key is using the context cache ID which has all the context variables taken into account. Signed-off-by: Cédrik Fuoco <[email protected]> * Now using addStringVars and creating a new context instead of reusing the one used for the filename. Signed-off-by: Cédrik Fuoco <[email protected]> * Adding cccid to the context when there are no context variable. Signed-off-by: Cédrik Fuoco <[email protected]> * Adding a few unit tests to test that the processor is different when changing the FileTransform's CCCID. Signed-off-by: Cédrik Fuoco <[email protected]> * Using setStringVar to set CCNUM context variable in unit test. Signed-off-by: Cédrik Fuoco <[email protected]> * Adding a test in FileTransform to test CollectContextVariables directly. Signed-off-by: Cédrik Fuoco <[email protected]> * Minor tweaks for the unit test Signed-off-by: Cédrik Fuoco <[email protected]> Signed-off-by: Cédrik Fuoco <[email protected]> Co-authored-by: Doug Walker <[email protected]> (cherry picked from commit 4fa7750)
* Configure the OpenColorIO.pc file on Windows and fix an issue where CMAKE_INSTALL_PREFIX wasn't included in the cmake build command in ocio.bat. Signed-off-by: Cédrik Fuoco <[email protected]> * Removing pkconfig folder since that PC file is not used. Signed-off-by: Cédrik Fuoco <[email protected]> * Small tweak in the configuration of OpenColorIO.cmake.in to handle absolute path with CMAKE_INSTALL_LIBDIR or CMAKE_INSTALL_INCLUDEDIR. Keeping exec_prefix for CMAKE_INSTALL_INCLUDE_DIR since it was changed for a specific issue on Mac (see PR #1120). Signed-off-by: Cédrik Fuoco <[email protected]> * Using ${prefix} for includedir Signed-off-by: Cédrik Fuoco <[email protected]> Signed-off-by: Cédrik Fuoco <[email protected]> Co-authored-by: Doug Walker <[email protected]> (cherry picked from commit 332462e)
* Hiding minizip-ng symbols on Mac Signed-off-by: Cédrik Fuoco <[email protected]> * Fixing a linking issue related to the code that tries to hide expat symbols and small refactor to add robustness. Signed-off-by: Cédrik Fuoco <[email protected]> Signed-off-by: Cédrik Fuoco <[email protected]> Co-authored-by: Doug Walker <[email protected]> (cherry picked from commit 907ed3b)
* Throw when the colorspace is undefined for isColorSpaceLinear method. (+ unit test) Signed-off-by: Cédrik Fuoco <[email protected]> * Typo Signed-off-by: Cédrik Fuoco <[email protected]> Signed-off-by: Cédrik Fuoco <[email protected]> Co-authored-by: Doug Walker <[email protected]> (cherry picked from commit 6d7c479)
Signed-off-by: Rémi Achard <[email protected]> Signed-off-by: Rémi Achard <[email protected]> Co-authored-by: Doug Walker <[email protected]> (cherry picked from commit 051241c)
Signed-off-by: Doug Walker <[email protected]> Signed-off-by: Doug Walker <[email protected]> (cherry picked from commit 5152635)
* Update documentation for 2.2 release Signed-off-by: Doug Walker <[email protected]> * Fix typos Signed-off-by: Doug Walker <[email protected]> * Remove V2_DOC_README.md Signed-off-by: Doug Walker <[email protected]> * Tweaks to 2.2 Signed-off-by: Doug Walker <[email protected]> * Improve installation section Signed-off-by: Doug Walker <[email protected]> * Add link to demo config Signed-off-by: Doug Walker <[email protected]> * Fix typos Signed-off-by: Doug Walker <[email protected]> * Improve file_rules section Signed-off-by: Doug Walker <[email protected]> Signed-off-by: Doug Walker <[email protected]> (cherry picked from commit 17f5c98)
* - Refactoring how OCIO search for minizip-ng. The first step is to search for an external minizip-ng. If not found, search for minizip-ng with MZ_COMPAT=ON (libminizip). If it is not found either, download and install minizip-ng with MZ_COMPAT=OFF. - Removing the minizip-ng part for the includes for minizip-ng headers. Signed-off-by: Cédrik Fuoco <[email protected]> * Update comments Signed-off-by: Cédrik Fuoco <[email protected]> * Improved find_package in Config mode (adding it back) Added missing scripts to install minizip-ng and zlib for the analysis workflow Signed-off-by: Cédrik Fuoco <[email protected]> * Adding +x permissions for install_minizip_ng and zlib Fixing path to find zlib in install_minizip-ng.sh Signed-off-by: Cédrik Fuoco <[email protected]> * Changing target name to match the one used by minizip-ng library (+ using the imported target instead of creating a new one when minizip-ng is found) Signed-off-by: Cédrik Fuoco <[email protected]> * First pass for the OpenColorIOConfig.cmake file with the required dependencies only. A few extra fixes for OpenEXR, ZLIB and Minizip-ng. Signed-off-by: Cédrik Fuoco <[email protected]> * Adding a informative message when building static ocio instead of per module. Signed-off-by: Cédrik Fuoco <[email protected]> * Adding an extra step to test the consumer app with static OpenColorIO for Windows, Linux and MacOS. Signed-off-by: Cédrik Fuoco <[email protected]> * Re-using the same test instead of creating a new one by removing the condition on build-shared. Signed-off-by: Cédrik Fuoco <[email protected]> * Fixing spacing, typo and adding back the NOT in the condition. (it was removed for debugging purpose) Signed-off-by: Cédrik Fuoco <[email protected]> * Changing directory where we share OCIO custom find modules (now in <install dir>/share/cmake/modules). Adding a cmake macro when installing OCIO since it is needed by some custom find modules. The find modules are only installed when building OCIO as a static library. The config.cmake.in files now only looks for the dependency when OCIO was built as a static library. Tentative (ci-workflow): Adding cmake-consumer test for static builds. Overhaul of the Findzlib module to be more inline with the FindZLIB from cmake and to be more robust. Signed-off-by: Cédrik Fuoco <[email protected]> * Adding missing backward slashes and saving the build path in an existing step instead of creating a new step. Adding a check for CMake version for a section in Findzlib.cmake. Re-phrasing some comments. Signed-off-by: Cédrik Fuoco <[email protected]> * Prevent the download of the dependencies in the scenario where static OCIO is linked to a consumer project. Since OCIO_INSTALL_EXT_PACKAGES is not defined, our find module tries to download the dependencies, but we don't want that mecanism for consumer project. Signed-off-by: Cédrik Fuoco <[email protected]> * Changing path where OCIO install its own custom find module. Removing custom Findzlib and making modifications to use CMake FindZLIB. Created a InstallZLIB module which does the download and install part if OCIO_INSTALL_EXT_PACAKGES is ALL or MISSING. Tweaked config.cmake.in to use CMake FindZLIB. Signed-off-by: Cédrik Fuoco <[email protected]> * Adding more details in comments Signed-off-by: Cédrik Fuoco <[email protected]> * Removing an extra "shell" property in CI workflow. Signed-off-by: Cédrik Fuoco <[email protected]> * Fix issues discovered with the failing CI workflow: Cmake-consumer test now prefer the static version of the dependencies. Fix an issue where yaml-cpp is not found by a consumer app (variable spelled incorectly in Findyaml-cpp). Fix an issue expat library is not found by a consumer app on Windows. Adding support for OCIO's <pkg_name>_STATIC_LIBRARY for ZLIB while supporting ZLIB_USE_STATIC_LIBS (CMake 3.24+) from CMake's FindZLIB. Signed-off-by: Cédrik Fuoco <[email protected]> * Removing pystring_STATIC_LIBRARY does not exists in CI workflow. Detecting if the build is Debug in the find module that OCIO installs since they can't rely on variables set by OCIO CMakefiles. Fix issue with yaml-cpp library naming in debug. Signed-off-by: Cédrik Fuoco <[email protected]> * Fix issues on Windows with expat and minizip-ng library naming when building static OCIO. Signed-off-by: Cédrik Fuoco <[email protected]> * Added option for macOS CI job in order to get more info on a failed job. Will be reverted once the issue is found. Signed-off-by: Cédrik Fuoco <[email protected]> * Fixing a issue on macOS. Improving ZLIB usage comments. Bumping minizip-ng to the latest version - 3.0.7. Bumping ZLIB to the latest version 2.1.13 to fix a vulnerability (CVE-2022-37434) Signed-off-by: Cédrik Fuoco <[email protected]> * Proposing to remove Findminizip module since external minizip-ng build need to be done with the same option as the internal build. Otherwise, linking and symbols issues are going to happend if the other libraries are not linked in correctly. It is going to simplify the maintainability of OCIO. Signed-off-by: Cédrik Fuoco <[email protected]> * Removing findminizip.cmake from the install since it does not exist anymore. Signed-off-by: Cédrik Fuoco <[email protected]> Signed-off-by: Cédrik Fuoco <[email protected]> Signed-off-by: Cédrik Fuoco <[email protected]> (cherry picked from commit 91761f2)
|
I've created a PR previously but the base branch was wrong. I thought it would clean up the checks by creating a second PR, but the checks from the previous PR can be seen in this PR too since they are from the same branch. Please ignore the The CI workflows checks can be seen here: https://github.com/AcademySoftwareFoundation/OpenColorIO/actions/runs/3848353813 |
|
SonarCloud Quality Gate failed. |
|
Closing in favour of PR #1750. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Integration PR
The first commit is the version release type name to empty. Each subsequent commit was cherry-picked from the main branch.
These commits correspond to the following PRs:
Replace texture2D function with texture for GLSL 1.3
CheckSupportSSE2: Fix sse flags unexpected propagation
Adsk contrib - Fix issue with minizip build
Adsk contrib - Processor cache does not detect changes in cccid
Adsk contrib - Configure the OpenColorIO.pc file on Windows
Adsk contrib - Hiding minizip-ng symbols on Mac
Adsk contrib - Fix issue with is colorspace linear
Adsk Contrib - Improve naming of ICC-based displays on Windows
Fix Python ARM wheel
Adsk Contrib - Fix inverse Lut1D optimization issue
Update documentation for 2.2 release
Adsk Contrib - OCIO cmake improvements