From 05ad9a2d5df2779779143015b4cab53a223184cf Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 6 Aug 2025 07:51:18 +0200 Subject: [PATCH 1/2] [opencolorio] Update to 2.4.2 --- ports/opencolorio/dependencies.diff | 114 ++++++++++++++ ports/opencolorio/fix-del-install-file.patch | 16 -- ports/opencolorio/fix-dependency.patch | 73 --------- ports/opencolorio/fix-func-param.patch | 93 ----------- ports/opencolorio/fix-pkgconfig.patch | 10 -- ports/opencolorio/glew-no-glu.diff | 13 ++ ports/opencolorio/portfile.cmake | 54 +++---- ports/opencolorio/pystring.diff | 156 +++++++++++++++++++ ports/opencolorio/vcpkg.json | 11 +- versions/baseline.json | 4 +- versions/o-/opencolorio.json | 5 + 11 files changed, 325 insertions(+), 224 deletions(-) create mode 100644 ports/opencolorio/dependencies.diff delete mode 100644 ports/opencolorio/fix-del-install-file.patch delete mode 100644 ports/opencolorio/fix-dependency.patch delete mode 100644 ports/opencolorio/fix-func-param.patch delete mode 100644 ports/opencolorio/fix-pkgconfig.patch create mode 100644 ports/opencolorio/glew-no-glu.diff create mode 100644 ports/opencolorio/pystring.diff diff --git a/ports/opencolorio/dependencies.diff b/ports/opencolorio/dependencies.diff new file mode 100644 index 00000000000000..610776df9dfea7 --- /dev/null +++ b/ports/opencolorio/dependencies.diff @@ -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..63333b5 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() +@@ -53,7 +53,7 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ + endif() + endif() + +- if (NOT TARGET MINIZIP::minizip-ng) ++ if (NOT TARGET MINIZIP::minizip-ng CONFIG) + find_dependency(minizip-ng @minizip-ng_VERSION@) + endif() + diff --git a/ports/opencolorio/fix-del-install-file.patch b/ports/opencolorio/fix-del-install-file.patch deleted file mode 100644 index 6605d721cc4d98..00000000000000 --- a/ports/opencolorio/fix-del-install-file.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 17e188d..c6c5ff5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -341,11 +341,7 @@ if (NOT BUILD_SHARED_LIBS) - - # Install custom Find modules. - install(FILES -- ${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 - ${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findminizip-ng.cmake -- ${CMAKE_CURRENT_LIST_DIR}/share/cmake/modules/Findyaml-cpp.cmake - DESTINATION ${OCIO_CUSTOM_FIND_MODULE_DIR} - ) - endif() diff --git a/ports/opencolorio/fix-dependency.patch b/ports/opencolorio/fix-dependency.patch deleted file mode 100644 index a1ed321d81fc69..00000000000000 --- a/ports/opencolorio/fix-dependency.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake -index 5455a08..3b9530e 100644 ---- a/share/cmake/modules/FindExtPackages.cmake -+++ b/share/cmake/modules/FindExtPackages.cmake -@@ -37,20 +37,20 @@ endif() - - # expat - # https://github.com/libexpat/libexpat --find_package(expat 2.4.1 REQUIRED) -+find_package(expat CONFIG REQUIRED) - - # yaml-cpp - # https://github.com/jbeder/yaml-cpp --find_package(yaml-cpp 0.7.0 REQUIRED) -+find_package(yaml-cpp CONFIG REQUIRED) - - # pystring - # https://github.com/imageworks/pystring --find_package(pystring 1.1.3 REQUIRED) -+find_package(pystring CONFIG REQUIRED) - - # Imath (>=3.1) - # https://github.com/AcademySoftwareFoundation/Imath - set(_Imath_ExternalProject_VERSION "3.1.5") --find_package(Imath 3.0 REQUIRED) -+find_package(Imath CONFIG REQUIRED) - - ############################################################################### - ### ZLIB (https://github.com/madler/zlib) -@@ -138,7 +138,7 @@ endif() - - # minizip-ng - # https://github.com/zlib-ng/minizip-ng --find_package(minizip-ng 3.0.7 REQUIRED) -+find_package(minizip-ng CONFIG REQUIRED) - - if(OCIO_BUILD_APPS) - -@@ -149,7 +149,7 @@ if(OCIO_BUILD_APPS) - - # lcms2 - # https://github.com/mm2/Little-CMS -- find_package(lcms2 2.2 REQUIRED) -+ find_package(lcms2 CONFIG REQUIRED) - endif() - - if(OCIO_BUILD_OPENFX) -diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in -index 6a4932a..0fe7c89 100644 ---- a/src/cmake/Config.cmake.in -+++ b/src/cmake/Config.cmake.in -@@ -1,6 +1,11 @@ - @PACKAGE_INIT@ - - include(CMakeFindDependencyMacro) -+find_dependency(expat CONFIG) -+find_dependency(Imath CONFIG) -+find_dependency(pystring CONFIG) -+find_dependency(yaml-cpp CONFIG) -+find_dependency(minizip-ng CONFIG) - - if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ - if (APPLE) -@@ -50,7 +55,8 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ - find_dependency(yaml-cpp @yaml-cpp_VERSION@) - endif() - -- if (NOT ZLIB::ZLIB) -+ find_dependency(ZLIB) -+ if (NOT TARGET ZLIB::ZLIB) - # ZLIB_VERSION is available starting CMake 3.26+. - # ZLIB_VERSION_STRING is still available for backward compatibility. - # See https://cmake.org/cmake/help/git-stage/module/FindZLIB.html diff --git a/ports/opencolorio/fix-func-param.patch b/ports/opencolorio/fix-func-param.patch deleted file mode 100644 index 0da99a62ad16c1..00000000000000 --- a/ports/opencolorio/fix-func-param.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp -index 85fc7bb..aa90943 100644 ---- a/src/OpenColorIO/OCIOZArchive.cpp -+++ b/src/OpenColorIO/OCIOZArchive.cpp -@@ -24,9 +24,11 @@ - #include "mz_strm_mem.h" - #include "mz_strm_os.h" - #include "mz_strm_split.h" --#include "mz_strm_zlib.h" - #include "mz_zip.h" - #include "mz_zip_rw.h" -+#ifndef __APPLE__ -+#include "mz_strm_zlib.h" -+#endif - - namespace OCIO_NAMESPACE - { -@@ -225,7 +227,11 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c - std::string configStr = ss.str(); - - // Write zip to memory stream. -+#if MZ_VERSION_BUILD >= 040000 -+ write_mem_stream = mz_stream_mem_create(); -+#else - mz_stream_mem_create(&write_mem_stream); -+#endif - mz_stream_mem_set_grow_size(write_mem_stream, 128 * 1024); - mz_stream_open(write_mem_stream, NULL, MZ_OPEN_MODE_CREATE); - -@@ -237,7 +243,11 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c - options.compress_level = ArchiveCompressionLevels::BEST; - - // Create the writer handle. -+#if MZ_VERSION_BUILD >= 040000 -+ archiver = mz_zip_writer_create(); -+#else - mz_zip_writer_create(&archiver); -+#endif - - // Archive options. - // Compression method -@@ -332,7 +342,11 @@ void ExtractOCIOZArchive(const char * archivePath, const char * destination) - std::string outputDestination = pystring::os::path::normpath(destination); - - // Create zip reader. -+#if MZ_VERSION_BUILD >= 040000 -+ extracter = mz_zip_reader_create(); -+#else - mz_zip_reader_create(&extracter); -+#endif - - MinizipNgHandlerGuard extracterGuard(extracter, false, false); - -@@ -450,7 +464,11 @@ std::vector getFileStringFromArchiveFile(const std::string & filepath, - std::vector buffer; - - // Create the reader object. -+#if MZ_VERSION_BUILD >= 040000 -+ reader = mz_zip_reader_create(); -+#else - mz_zip_reader_create(&reader); -+#endif - - MinizipNgHandlerGuard extracterGuard(reader, false, true); - -@@ -510,7 +528,11 @@ void getEntriesMappingFromArchiveFile(const std::string & archivePath, - void *reader = NULL; - - // Create the reader object. -+#if MZ_VERSION_BUILD >= 040000 -+ reader = mz_zip_reader_create(); -+#else - mz_zip_reader_create(&reader); -+#endif - - MinizipNgHandlerGuard extracterGuard(reader, false, false); - -diff --git a/src/apps/ocioarchive/main.cpp b/src/apps/ocioarchive/main.cpp -index 190cade..68054a6 100644 ---- a/src/apps/ocioarchive/main.cpp -+++ b/src/apps/ocioarchive/main.cpp -@@ -235,7 +235,11 @@ int main(int argc, const char **argv) - } - - std::string path = args[0]; -+#if MZ_VERSION_BUILD >= 040000 -+ reader = mz_zip_reader_create(); -+#else - mz_zip_reader_create(&reader); -+#endif - struct tm tmu_date; - - err = mz_zip_reader_open_file(reader, path.c_str()); diff --git a/ports/opencolorio/fix-pkgconfig.patch b/ports/opencolorio/fix-pkgconfig.patch deleted file mode 100644 index 976afe122c52e3..00000000000000 --- a/ports/opencolorio/fix-pkgconfig.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/src/OpenColorIO/res/OpenColorIO.pc.in b/src/OpenColorIO/res/OpenColorIO.pc.in -index f25c280..d9a450b 100644 ---- a/src/OpenColorIO/res/OpenColorIO.pc.in -+++ b/src/OpenColorIO/res/OpenColorIO.pc.in -@@ -9,3 +9,5 @@ Description: @PROJECT_DESCRIPTION@ - URL: @PROJECT_HOMEPAGE_URL@ - Libs: -L${libdir} -l@PROJECT_NAME@ - Cflags: -I${includedir} -+Libs.private: -lpystring -+Requires.private: expat Imath yaml-cpp minizip-ng diff --git a/ports/opencolorio/glew-no-glu.diff b/ports/opencolorio/glew-no-glu.diff new file mode 100644 index 00000000000000..4b82558cab9994 --- /dev/null +++ b/ports/opencolorio/glew-no-glu.diff @@ -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; + } diff --git a/ports/opencolorio/portfile.cmake b/ports/opencolorio/portfile.cmake index 3b89e97fc06242..c43d4be766cb2d 100644 --- a/ports/opencolorio/portfile.cmake +++ b/ports/opencolorio/portfile.cmake @@ -2,42 +2,49 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/OpenColorIO REF "v${VERSION}" - SHA512 d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9 + SHA512 d626007d7a7ae26f4cf2fa8e5675963af9127f500f824548ccc4e659ddb2cd275b988822b4f66e0170971426dc330d106e281cdae63a5bd141b9aadaa874a746 HEAD_REF master PATCHES - fix-dependency.patch - fix-del-install-file.patch - fix-func-param.patch #https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1806 - fix-pkgconfig.patch + dependencies.diff + glew-no-glu.diff + pystring.diff ) - -file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findlcms2.cmake") +file(GLOB modules "${SOURCE_PATH}/share/cmake/modules/Find*.cmake") +list(REMOVE_ITEM modules "${SOURCE_PATH}/share/cmake/modules/FindExtPackages.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/share/cmake/modules/install" ${modules}) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - tools OCIO_BUILD_APPS + tools OCIO_BUILD_APPS + tools VCPKG_LOCK_FIND_PACKAGE_OpenGL ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DOCIO_BUILD_NUKE:BOOL=OFF -DOCIO_BUILD_DOCS:BOOL=OFF - -DOCIO_BUILD_TESTS:BOOL=OFF -DOCIO_BUILD_GPU_TESTS:BOOL=OFF - -DOCIO_BUILD_PYTHON:BOOL=OFF - -DOCIO_BUILD_OPENFX:BOOL=OFF -DOCIO_BUILD_JAVA:BOOL=OFF - -DOCIO_USE_OPENEXR_HALF:BOOL=OFF + -DOCIO_BUILD_NUKE:BOOL=OFF + -DOCIO_BUILD_OPENFX:BOOL=OFF + -DOCIO_BUILD_PYTHON:BOOL=OFF + -DOCIO_BUILD_TESTS:BOOL=OFF -DOCIO_INSTALL_EXT_PACKAGES=NONE - -DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO=On + -DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON + -DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO=ON ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES + # only used for OCIO_BUILD_APPS + CMAKE_DISABLE_FIND_PACKAGE_GLUT CMAKE_DISABLE_FIND_PACKAGE_OpenImageIO - OCIO_USE_OPENEXR_HALF + VCPKG_LOCK_FIND_PACKAGE_OpenGL + ) vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/OpenColorIO") +vcpkg_fixup_pkgconfig() set(dll_import 0) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -49,22 +56,17 @@ vcpkg_replace_string( "if ${dll_import}" ) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/OpenColorIO") - -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/share/ocio" -) if(OCIO_BUILD_APPS) vcpkg_copy_tools( - TOOL_NAMES ociowrite ociomakeclf ociochecklut ociocheck ociobakelut ocioarchive ocioconvert ociolutimage ocioperf + TOOL_NAMES ocioarchive ociobakelut ociocheck ociochecklut ocioconvert ociocpuinfo ociolutimage ociomakeclf ocioperf ociowrite AUTO_CLEAN ) endif() -vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/ocio" +) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/opencolorio/pystring.diff b/ports/opencolorio/pystring.diff new file mode 100644 index 00000000000000..ac43f455261847 --- /dev/null +++ b/ports/opencolorio/pystring.diff @@ -0,0 +1,156 @@ +diff --git a/src/OpenColorIO/Config.cpp b/src/OpenColorIO/Config.cpp +index a4cf7c5..db52ddb 100644 +--- a/src/OpenColorIO/Config.cpp ++++ b/src/OpenColorIO/Config.cpp +@@ -12,7 +12,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/src/OpenColorIO/ConfigUtils.cpp b/src/OpenColorIO/ConfigUtils.cpp +index 0b45b04..0868b01 100644 +--- a/src/OpenColorIO/ConfigUtils.cpp ++++ b/src/OpenColorIO/ConfigUtils.cpp +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: BSD-3-Clause + // Copyright Contributors to the OpenColorIO Project. + +-#include ++#include + + #include "ConfigUtils.h" + #include "MathUtils.h" +diff --git a/src/OpenColorIO/Context.cpp b/src/OpenColorIO/Context.cpp +index 3a1294b..02f0e3e 100644 +--- a/src/OpenColorIO/Context.cpp ++++ b/src/OpenColorIO/Context.cpp +@@ -7,7 +7,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/src/OpenColorIO/OCIOYaml.cpp b/src/OpenColorIO/OCIOYaml.cpp +index b1cee18..c7d530b 100644 +--- a/src/OpenColorIO/OCIOYaml.cpp ++++ b/src/OpenColorIO/OCIOYaml.cpp +@@ -4,7 +4,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp +index 982fce6..43cb147 100644 +--- a/src/OpenColorIO/OCIOZArchive.cpp ++++ b/src/OpenColorIO/OCIOZArchive.cpp +@@ -8,7 +8,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/src/OpenColorIO/Op.cpp b/src/OpenColorIO/Op.cpp +index 81dfe98..125910d 100755 +--- a/src/OpenColorIO/Op.cpp ++++ b/src/OpenColorIO/Op.cpp +@@ -4,7 +4,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/src/OpenColorIO/PathUtils.cpp b/src/OpenColorIO/PathUtils.cpp +index 3a68d36..ea6c036 100644 +--- a/src/OpenColorIO/PathUtils.cpp ++++ b/src/OpenColorIO/PathUtils.cpp +@@ -5,7 +5,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/src/OpenColorIO/fileformats/FileFormatCTF.cpp b/src/OpenColorIO/fileformats/FileFormatCTF.cpp +index c9ada57..e440819 100644 +--- a/src/OpenColorIO/fileformats/FileFormatCTF.cpp ++++ b/src/OpenColorIO/fileformats/FileFormatCTF.cpp +@@ -6,7 +6,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp +index 6a76d96..63613dc 100755 +--- a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp ++++ b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp +@@ -8,7 +8,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/src/OpenColorIO/fileformats/FileFormatICC.cpp b/src/OpenColorIO/fileformats/FileFormatICC.cpp +index 4768101..16cc9ec 100755 +--- a/src/OpenColorIO/fileformats/FileFormatICC.cpp ++++ b/src/OpenColorIO/fileformats/FileFormatICC.cpp +@@ -5,7 +5,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp +index 0ba209a..c7ec254 100755 +--- a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp ++++ b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp +@@ -5,7 +5,7 @@ + #include + #include + +-#include ++#include + + #include + +diff --git a/src/OpenColorIO/transforms/FileTransform.cpp b/src/OpenColorIO/transforms/FileTransform.cpp +index 33da5f3..7609dda 100755 +--- a/src/OpenColorIO/transforms/FileTransform.cpp ++++ b/src/OpenColorIO/transforms/FileTransform.cpp +@@ -9,7 +9,7 @@ + #include + #include + +-#include ++#include + + #include + diff --git a/ports/opencolorio/vcpkg.json b/ports/opencolorio/vcpkg.json index e5165bb8a32c7b..53ae8a2575d1e5 100644 --- a/ports/opencolorio/vcpkg.json +++ b/ports/opencolorio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencolorio", - "version-semver": "2.2.1", - "port-version": 4, + "version-semver": "2.4.2", "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.", "homepage": "https://opencolorio.org/", "license": "BSD-3-Clause", @@ -31,9 +30,13 @@ "tools": { "description": "Installs tools", "dependencies": [ - "glew", + { + "name": "glew", + "platform": "!ios & !osx" + }, "lcms", - "openexr" + "openexr", + "opengl" ] } } diff --git a/versions/baseline.json b/versions/baseline.json index 92327113961dad..d279cc44bf00ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6981,8 +6981,8 @@ "port-version": 0 }, "opencolorio": { - "baseline": "2.2.1", - "port-version": 4 + "baseline": "2.4.2", + "port-version": 0 }, "opencsg": { "baseline": "1.8.1", diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index 1a4ae22c333895..045fefd90fd40b 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6d282b7802841674acc43fd23725075e7149010", + "version-semver": "2.4.2", + "port-version": 0 + }, { "git-tree": "4a846323c9e6d289380ab049705ac80fefb92d0c", "version-semver": "2.2.1", From 799276f1b3fd72d06f009e303f141902c4623eba Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 6 Aug 2025 08:31:04 +0200 Subject: [PATCH 2/2] Fixup --- ports/opencolorio/dependencies.diff | 12 ++++++------ ports/opencolorio/portfile.cmake | 4 ++++ ports/opencolorio/vcpkg.json | 4 ++++ versions/o-/opencolorio.json | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ports/opencolorio/dependencies.diff b/ports/opencolorio/dependencies.diff index 610776df9dfea7..71cd56fc5b1dfe 100644 --- a/ports/opencolorio/dependencies.diff +++ b/ports/opencolorio/dependencies.diff @@ -76,7 +76,7 @@ index aa2550a..3c968f7 100644 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..63333b5 100644 +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@ @@ -103,12 +103,12 @@ index 4e2367b..63333b5 100644 if (TARGET yaml-cpp AND NOT TARGET yaml-cpp::yaml-cpp) add_library(yaml-cpp::yaml-cpp ALIAS yaml-cpp) endif() -@@ -53,7 +53,7 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ - endif() +@@ -54,7 +54,7 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ endif() -- if (NOT TARGET MINIZIP::minizip-ng) -+ if (NOT TARGET MINIZIP::minizip-ng CONFIG) - find_dependency(minizip-ng @minizip-ng_VERSION@) + 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. diff --git a/ports/opencolorio/portfile.cmake b/ports/opencolorio/portfile.cmake index c43d4be766cb2d..fe369246cc82e9 100644 --- a/ports/opencolorio/portfile.cmake +++ b/ports/opencolorio/portfile.cmake @@ -19,6 +19,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tools VCPKG_LOCK_FIND_PACKAGE_OpenGL ) +if(NOT VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") + list(APPEND FEATURE_OPTIONS -DOCIO_USE_SSE2NEON=OFF) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/opencolorio/vcpkg.json b/ports/opencolorio/vcpkg.json index 53ae8a2575d1e5..e77dc06142b5d3 100644 --- a/ports/opencolorio/vcpkg.json +++ b/ports/opencolorio/vcpkg.json @@ -16,6 +16,10 @@ ] }, "pystring", + { + "name": "sse2neon", + "platform": "arm" + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index 045fefd90fd40b..6fd2aee5d8bb21 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f6d282b7802841674acc43fd23725075e7149010", + "git-tree": "dd4f890cdcbb479e975fddb376890faa1c601801", "version-semver": "2.4.2", "port-version": 0 },