Skip to content

Commit

Permalink
Update OpenColorIO submodule and patch
Browse files Browse the repository at this point in the history
  • Loading branch information
@starseeker
starseeker committed Dec 21, 2023
1 parent e079665 commit df57ac4
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 76 deletions.
2 changes: 1 addition & 1 deletion opencolorio/OpenColorIO
Submodule OpenColorIO updated 143 files
169 changes: 94 additions & 75 deletions opencolorio/opencolorio.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -Naur OpenColorIO/CMakeLists.txt OpenColorIO_BLD/CMakeLists.txt
--- OpenColorIO/CMakeLists.txt 2023-09-20 21:19:44.040141941 -0400
+++ OpenColorIO_BLD/CMakeLists.txt 2023-09-25 10:34:31.647394363 -0400
@@ -433,7 +433,7 @@
diff -Naur OpenColorIO/CMakeLists.txt OPENCOLORIO_BLD/CMakeLists.txt
--- OpenColorIO/CMakeLists.txt 2023-12-20 15:33:40.548452208 -0500
+++ OPENCOLORIO_BLD/CMakeLists.txt 2023-12-20 15:33:17.076776842 -0500
@@ -436,7 +436,7 @@
application or shared library that uses static OpenColorIO.

The following mandatory dependencies MUST be linked to the consumer application or shared library:
Expand All @@ -10,7 +10,7 @@ diff -Naur OpenColorIO/CMakeLists.txt OpenColorIO_BLD/CMakeLists.txt
endif()


@@ -520,8 +520,6 @@
@@ -523,8 +523,6 @@
${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findexpat.cmake
${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/FindImath.cmake
${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findpystring.cmake
Expand All @@ -19,9 +19,9 @@ diff -Naur OpenColorIO/CMakeLists.txt OpenColorIO_BLD/CMakeLists.txt
DESTINATION ${OCIO_CUSTOM_FIND_MODULE_DIR}
)
endif()
diff -Naur OpenColorIO/share/cmake/modules/FindExtPackages.cmake OpenColorIO_BLD/share/cmake/modules/FindExtPackages.cmake
--- OpenColorIO/share/cmake/modules/FindExtPackages.cmake 2023-09-22 10:23:08.426870949 -0400
+++ OpenColorIO_BLD/share/cmake/modules/FindExtPackages.cmake 2023-09-26 09:48:41.316829818 -0400
diff -Naur OpenColorIO/share/cmake/modules/FindExtPackages.cmake OPENCOLORIO_BLD/share/cmake/modules/FindExtPackages.cmake
--- OpenColorIO/share/cmake/modules/FindExtPackages.cmake 2023-12-20 15:33:40.572451873 -0500
+++ OPENCOLORIO_BLD/share/cmake/modules/FindExtPackages.cmake 2023-12-20 15:33:17.076776842 -0500
@@ -75,7 +75,7 @@

# Imath (>=3.1)
Expand All @@ -47,10 +47,10 @@ diff -Naur OpenColorIO/share/cmake/modules/FindExtPackages.cmake OpenColorIO_BLD

###############################################################################
##
diff -Naur OpenColorIO/share/cmake/modules/Findminizip-ng.cmake OpenColorIO_BLD/share/cmake/modules/Findminizip-ng.cmake
--- OpenColorIO/share/cmake/modules/Findminizip-ng.cmake 2023-09-20 21:19:44.072141445 -0400
+++ OpenColorIO_BLD/share/cmake/modules/Findminizip-ng.cmake 1969-12-31 19:00:00.000000000 -0500
@@ -1,205 +0,0 @@
diff -Naur OpenColorIO/share/cmake/modules/Findminizip-ng.cmake OPENCOLORIO_BLD/share/cmake/modules/Findminizip-ng.cmake
--- OpenColorIO/share/cmake/modules/Findminizip-ng.cmake 2023-12-20 15:33:40.572451873 -0500
+++ OPENCOLORIO_BLD/share/cmake/modules/Findminizip-ng.cmake 1969-12-31 19:00:00.000000000 -0500
@@ -1,220 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright Contributors to the OpenColorIO Project.
-#
Expand All @@ -61,6 +61,7 @@ diff -Naur OpenColorIO/share/cmake/modules/Findminizip-ng.cmake OpenColorIO_BLD/
-# minizip-ng_LIBRARY - minizip-ng library to link to
-# minizip-ng_INCLUDE_DIR - Where to find mz.h and other headers
-# minizip-ng_VERSION - The version of the library
-# minizip-ng_COMPAT - Whether minizip-ng MZ_COMPAT was used or not
-#
-# Global targets defined by this module:
-# MINIZIP::minizip-ng - IMPORTED target, if found
Expand Down Expand Up @@ -167,7 +168,9 @@ diff -Naur OpenColorIO/share/cmake/modules/Findminizip-ng.cmake OpenColorIO_BLD/
- PATH_SUFFIXES
- include
- include/minizip-ng
- include/minizip
- minizip-ng/include
- minizip/include
- )
-
- # Minizip-ng uses prefix "lib" on all platform by default.
Expand Down Expand Up @@ -256,11 +259,22 @@ diff -Naur OpenColorIO/share/cmake/modules/Findminizip-ng.cmake OpenColorIO_BLD/
-
- target_link_libraries(MINIZIP::minizip-ng INTERFACE ZLIB::ZLIB)
-endif()
\ No newline at end of file
diff -Naur OpenColorIO/share/cmake/modules/Findpystring.cmake OpenColorIO_BLD/share/cmake/modules/Findpystring.cmake
--- OpenColorIO/share/cmake/modules/Findpystring.cmake 2023-09-20 21:19:44.072141445 -0400
+++ OpenColorIO_BLD/share/cmake/modules/Findpystring.cmake 2023-09-25 10:32:59.073102087 -0400
@@ -41,7 +41,7 @@
-
-###############################################################################
-### Detect compatibility mode ###
-
-set(minizip-ng_COMPAT FALSE)
-if(minizip-ng_INCLUDE_DIR)
- list(GET minizip-ng_INCLUDE_DIR 0 _minizip-ng_INCLUDE_DIR)
- if(EXISTS "${_minizip-ng_INCLUDE_DIR}/mz_compat.h")
- set(minizip-ng_COMPAT TRUE)
- endif()
-endif()
-mark_as_advanced(minizip-ng_COMPAT)
diff -Naur OpenColorIO/share/cmake/modules/Findpystring.cmake OPENCOLORIO_BLD/share/cmake/modules/Findpystring.cmake
--- OpenColorIO/share/cmake/modules/Findpystring.cmake 2023-12-20 15:33:40.572451873 -0500
+++ OPENCOLORIO_BLD/share/cmake/modules/Findpystring.cmake 2023-12-20 15:33:17.080776786 -0500
@@ -42,7 +42,7 @@
NAMES
pystring libpystring
HINTS
Expand All @@ -269,17 +283,17 @@ diff -Naur OpenColorIO/share/cmake/modules/Findpystring.cmake OpenColorIO_BLD/sh
PATH_SUFFIXES
pystring/lib
lib64
@@ -80,4 +80,4 @@
@@ -81,4 +81,4 @@
)

mark_as_advanced(pystring_INCLUDE_DIR pystring_LIBRARY pystring_VERSION)
-endif()
\ No newline at end of file
+endif()
diff -Naur OpenColorIO/share/cmake/modules/Findyaml-cpp.cmake OpenColorIO_BLD/share/cmake/modules/Findyaml-cpp.cmake
--- OpenColorIO/share/cmake/modules/Findyaml-cpp.cmake 2023-09-20 21:19:44.072141445 -0400
+++ OpenColorIO_BLD/share/cmake/modules/Findyaml-cpp.cmake 1969-12-31 19:00:00.000000000 -0500
@@ -1,168 +0,0 @@
diff -Naur OpenColorIO/share/cmake/modules/Findyaml-cpp.cmake OPENCOLORIO_BLD/share/cmake/modules/Findyaml-cpp.cmake
--- OpenColorIO/share/cmake/modules/Findyaml-cpp.cmake 2023-12-20 15:33:40.572451873 -0500
+++ OPENCOLORIO_BLD/share/cmake/modules/Findyaml-cpp.cmake 1969-12-31 19:00:00.000000000 -0500
@@ -1,172 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright Contributors to the OpenColorIO Project.
-#
Expand All @@ -292,10 +306,9 @@ diff -Naur OpenColorIO/share/cmake/modules/Findyaml-cpp.cmake OpenColorIO_BLD/sh
-# yaml-cpp_VERSION - Library's version
-#
-# Global targets defined by this module:
-# yaml-cpp
-# yaml-cpp::yaml-cpp
-#
-# For compatibility with the upstream CMake package, the following variables and targets are defined:
-# yaml-cpp::yaml-cpp - Alias of the yaml-cpp target
-# YAML_CPP_LIBRARIES - Libraries to link against yaml-cpp
-# YAML_CPP_INCLUDE_DIR - Include directory
-#
Expand Down Expand Up @@ -323,16 +336,26 @@ diff -Naur OpenColorIO/share/cmake/modules/Findyaml-cpp.cmake OpenColorIO_BLD/sh
- set(BUILD_TYPE_DEBUG ON)
-endif()
-
-if(yaml-cpp_FIND_QUIETLY)
- set(quiet QUIET)
-endif()
-
-if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
- set(_yaml-cpp_REQUIRED_VARS yaml-cpp_LIBRARY)
-
- # Search for yaml-cpp-config.cmake
- if(NOT DEFINED yaml-cpp_ROOT)
- # Search for yaml-cpp-config.cmake
- find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG QUIET)
- find_package(yaml-cpp ${yaml-cpp_FIND_VERSION} CONFIG ${quiet})
- endif()
-
- if(yaml-cpp_FOUND)
- get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION)
- # Alias target for yaml-cpp < 0.8 compatibility
- if(TARGET yaml-cpp AND NOT TARGET yaml-cpp::yaml-cpp)
- add_library(yaml-cpp::yaml-cpp ALIAS yaml-cpp)
- endif()
-
- get_target_property(yaml-cpp_INCLUDE_DIR yaml-cpp::yaml-cpp INTERFACE_INCLUDE_DIRECTORIES)
- get_target_property(yaml-cpp_LIBRARY yaml-cpp::yaml-cpp LOCATION)
- else()
-
- # As yaml-cpp-config.cmake search fails, search an installed library
Expand All @@ -341,14 +364,14 @@ diff -Naur OpenColorIO/share/cmake/modules/Findyaml-cpp.cmake OpenColorIO_BLD/sh
- list(APPEND _yaml-cpp_REQUIRED_VARS yaml-cpp_INCLUDE_DIR yaml-cpp_VERSION)
-
- # Search for yaml-cpp.pc
- find_package(PkgConfig QUIET)
- pkg_check_modules(PC_yaml-cpp QUIET "yaml-cpp>=${yaml-cpp_FIND_VERSION}")
- find_package(PkgConfig ${quiet})
- pkg_check_modules(PC_yaml-cpp ${quiet} "yaml-cpp>=${yaml-cpp_FIND_VERSION}")
-
- # Try to detect the version installed, if any.
- if(NOT PC_yaml-cpp_FOUND)
- pkg_search_module(PC_yaml-cpp QUIET "yaml-cpp")
- pkg_search_module(PC_yaml-cpp ${quiet} "yaml-cpp")
- endif()
-
-
- # Find include directory
- find_path(yaml-cpp_INCLUDE_DIR
- NAMES
Expand All @@ -373,7 +396,7 @@ diff -Naur OpenColorIO/share/cmake/modules/Findyaml-cpp.cmake OpenColorIO_BLD/sh
- # Prefer static lib names
- set(_yaml-cpp_STATIC_LIB_NAMES
- "${CMAKE_STATIC_LIBRARY_PREFIX}yaml-cpp${CMAKE_STATIC_LIBRARY_SUFFIX}")
-
-
- # Starting from 0.7.0, all platforms uses the suffix "d" for debug.
- # See https://github.com/jbeder/yaml-cpp/blob/master/CMakeLists.txt#L141
- if(BUILD_TYPE_DEBUG)
Expand Down Expand Up @@ -409,48 +432,43 @@ diff -Naur OpenColorIO/share/cmake/modules/Findyaml-cpp.cmake OpenColorIO_BLD/sh
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(yaml-cpp
- REQUIRED_VARS
- REQUIRED_VARS
- ${_yaml-cpp_REQUIRED_VARS}
- VERSION_VAR
- yaml-cpp_VERSION
- )
-endif()
-
-###############################################################################
-### Create target
-
-if(yaml-cpp_FOUND AND NOT TARGET yaml-cpp)
- add_library(yaml-cpp UNKNOWN IMPORTED GLOBAL)
- set(_yaml-cpp_TARGET_CREATE TRUE)
- mark_as_advanced(yaml-cpp_INCLUDE_DIR yaml-cpp_LIBRARY yaml-cpp_VERSION)
-endif()
-
-###############################################################################
-### Configure target ###
-### Create target
-
-if(_yaml-cpp_TARGET_CREATE)
- set_target_properties(yaml-cpp PROPERTIES
-if (yaml-cpp_FOUND AND NOT TARGET yaml-cpp::yaml-cpp)
- add_library(yaml-cpp::yaml-cpp UNKNOWN IMPORTED GLOBAL)
- set_target_properties(yaml-cpp::yaml-cpp PROPERTIES
- IMPORTED_LOCATION ${yaml-cpp_LIBRARY}
- INTERFACE_INCLUDE_DIRECTORIES ${yaml-cpp_INCLUDE_DIR}
- )
-
- mark_as_advanced(yaml-cpp_INCLUDE_DIR yaml-cpp_LIBRARY yaml-cpp_VERSION)
-endif()
-
-###############################################################################
-### Set variables for compatibility ###
-
-if(TARGET yaml-cpp AND NOT TARGET yaml-cpp::yaml-cpp)
- add_library(yaml-cpp::yaml-cpp ALIAS yaml-cpp)
-endif()
-
-if(yaml-cpp_INCLUDE_DIR)
- set(YAML_CPP_INCLUDE_DIR "${yaml-cpp_INCLUDE_DIR}")
-endif()
-
-set(YAML_CPP_LIBRARIES yaml-cpp::yaml-cpp)
diff -Naur OpenColorIO/share/cmake/modules/FindZLIB.cmake OpenColorIO_BLD/share/cmake/modules/FindZLIB.cmake
- # Required because Installyaml-cpp.cmake creates `yaml-cpp::yaml-cpp`
- # as an alias, and aliases get resolved in exported targets, causing the
- # find_dependency(yaml-cpp) call in OpenColorIOConfig.cmake to fail.
- # This can be removed once Installyaml-cpp.cmake targets yaml-cpp 0.8.
- if (NOT TARGET yaml-cpp)
- add_library(yaml-cpp ALIAS yaml-cpp::yaml-cpp)
- endif ()
-endif ()
-
-if (yaml-cpp_FOUND)
- # TODO: Remove this variable and use the `yaml-cpp::yaml-cpp` target
- # directly when the minimum version of yaml-cpp is updated to 0.8.
- get_target_property(YAML_CPP_INCLUDE_DIR yaml-cpp::yaml-cpp INCLUDE_DIRECTORIES)
- set(YAML_CPP_LIBRARIES yaml-cpp::yaml-cpp)
-endif ()
diff -Naur OpenColorIO/share/cmake/modules/FindZLIB.cmake OPENCOLORIO_BLD/share/cmake/modules/FindZLIB.cmake
--- OpenColorIO/share/cmake/modules/FindZLIB.cmake 1969-12-31 19:00:00.000000000 -0500
+++ OpenColorIO_BLD/share/cmake/modules/FindZLIB.cmake 2023-09-25 10:32:59.077102013 -0400
+++ OPENCOLORIO_BLD/share/cmake/modules/FindZLIB.cmake 2023-12-20 15:33:17.080776786 -0500
@@ -0,0 +1,123 @@
+#.rst:
+# FindZLIB
Expand Down Expand Up @@ -575,9 +593,9 @@ diff -Naur OpenColorIO/share/cmake/modules/FindZLIB.cmake OpenColorIO_BLD/share/
+ INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
+ endif()
+endif()
diff -Naur OpenColorIO/src/apps/ocioarchive/CMakeLists.txt OpenColorIO_BLD/src/apps/ocioarchive/CMakeLists.txt
--- OpenColorIO/src/apps/ocioarchive/CMakeLists.txt 2023-09-20 21:19:44.092141132 -0400
+++ OpenColorIO_BLD/src/apps/ocioarchive/CMakeLists.txt 2023-09-25 10:33:03.469020511 -0400
diff -Naur OpenColorIO/src/apps/ocioarchive/CMakeLists.txt OPENCOLORIO_BLD/src/apps/ocioarchive/CMakeLists.txt
--- OpenColorIO/src/apps/ocioarchive/CMakeLists.txt 2023-12-20 15:33:40.584451706 -0500
+++ OPENCOLORIO_BLD/src/apps/ocioarchive/CMakeLists.txt 2023-12-20 15:33:17.080776786 -0500
@@ -21,7 +21,7 @@
PRIVATE
apputils
Expand All @@ -587,10 +605,10 @@ diff -Naur OpenColorIO/src/apps/ocioarchive/CMakeLists.txt OpenColorIO_BLD/src/a
)

include(StripUtils)
diff -Naur OpenColorIO/src/cmake/Config.cmake.in OpenColorIO_BLD/src/cmake/Config.cmake.in
--- OpenColorIO/src/cmake/Config.cmake.in 2023-09-20 21:19:44.100141008 -0400
+++ OpenColorIO_BLD/src/cmake/Config.cmake.in 2023-09-25 10:33:03.101027338 -0400
@@ -50,8 +50,8 @@
diff -Naur OpenColorIO/src/cmake/Config.cmake.in OPENCOLORIO_BLD/src/cmake/Config.cmake.in
--- OpenColorIO/src/cmake/Config.cmake.in 2023-12-20 15:33:40.592451595 -0500
+++ OPENCOLORIO_BLD/src/cmake/Config.cmake.in 2023-12-20 15:33:17.080776786 -0500
@@ -53,8 +53,8 @@
endif()
endif()

Expand All @@ -601,9 +619,9 @@ diff -Naur OpenColorIO/src/cmake/Config.cmake.in OpenColorIO_BLD/src/cmake/Confi
endif()

# Remove OCIO custom find module path.
diff -Naur OpenColorIO/src/OpenColorIO/CMakeLists.txt OpenColorIO_BLD/src/OpenColorIO/CMakeLists.txt
--- OpenColorIO/src/OpenColorIO/CMakeLists.txt 2023-09-20 21:19:44.076141380 -0400
+++ OpenColorIO_BLD/src/OpenColorIO/CMakeLists.txt 2023-09-25 10:33:03.749015317 -0400
diff -Naur OpenColorIO/src/OpenColorIO/CMakeLists.txt OPENCOLORIO_BLD/src/OpenColorIO/CMakeLists.txt
--- OpenColorIO/src/OpenColorIO/CMakeLists.txt 2023-12-20 15:33:40.576451819 -0500
+++ OPENCOLORIO_BLD/src/OpenColorIO/CMakeLists.txt 2023-12-20 15:37:00.877582518 -0500
@@ -309,8 +309,8 @@
"$<BUILD_INTERFACE:utils::from_chars>"
"$<BUILD_INTERFACE:utils::strings>"
Expand All @@ -620,13 +638,14 @@ diff -Naur OpenColorIO/src/OpenColorIO/CMakeLists.txt OpenColorIO_BLD/src/OpenCo


- # Check for minizip first since our Findminizip module sets minizip-ng_LIBRARY.
+ # Check for minizip first since our Findminizip module sets minizip_LIBRARY.
if (minizip_LIBRARY)
- if (minizip_LIBRARY OR minizip-ng_COMPAT)
- get_filename_component(_minizip-ng_LIBDIR "${minizip_LIBRARY}" DIRECTORY)
- set(_minizip-ng_NAME "minizip")
- elseif(minizip-ng_LIBRARY)
- get_filename_component(_minizip-ng_LIBDIR "${minizip-ng_LIBRARY}" DIRECTORY)
- set(_minizip-ng_NAME "minizip-ng")
+ # Check for minizip first since our Findminizip module sets minizip_LIBRARY.
+ if (minizip_LIBRARY OR minizip_COMPAT)
+ get_filename_component(_minizip_LIBDIR "${minizip_LIBRARY}" DIRECTORY)
+ set(_minizip_NAME "minizip")
+ elseif(minizip_LIBRARY)
Expand All @@ -646,9 +665,9 @@ diff -Naur OpenColorIO/src/OpenColorIO/CMakeLists.txt OpenColorIO_BLD/src/OpenCo
endif()

if (_OCIO_LINK_FLAGS_LIST_)
diff -Naur OpenColorIO/tests/cpu/CMakeLists.txt OpenColorIO_BLD/tests/cpu/CMakeLists.txt
--- OpenColorIO/tests/cpu/CMakeLists.txt 2023-09-20 21:19:44.104140948 -0400
+++ OpenColorIO_BLD/tests/cpu/CMakeLists.txt 2023-09-25 10:33:01.381059252 -0400
diff -Naur OpenColorIO/tests/cpu/CMakeLists.txt OPENCOLORIO_BLD/tests/cpu/CMakeLists.txt
--- OpenColorIO/tests/cpu/CMakeLists.txt 2023-12-20 15:33:40.592451595 -0500
+++ OPENCOLORIO_BLD/tests/cpu/CMakeLists.txt 2023-12-20 15:33:17.080776786 -0500
@@ -37,7 +37,7 @@
utils::strings
${YAML_CPP_LIBRARIES}
Expand Down

0 comments on commit df57ac4

Please sign in to comment.