Browse Source

opencolorio: add v2.4.2 (#7561)

* opencolorio: add v2.4.2

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* fix yaml-cpp

* Fix GCC 15 according to https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1599

* fix macosx minizip-ng

* limit mingw

---------

Co-authored-by: Saikari <[email protected]>
star9029 2 months ago
parent
commit
751c19ec31
1 changed files with 44 additions and 7 deletions
  1. 44 7
      packages/o/opencolorio/xmake.lua

+ 44 - 7
packages/o/opencolorio/xmake.lua

@@ -1,31 +1,68 @@
 package("opencolorio")
 package("opencolorio")
-
     set_homepage("https://opencolorio.org/")
     set_homepage("https://opencolorio.org/")
     set_description("A complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation.")
     set_description("A complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation.")
     set_license("BSD-3-Clause")
     set_license("BSD-3-Clause")
 
 
     add_urls("https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/$(version).tar.gz",
     add_urls("https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/$(version).tar.gz",
              "https://github.com/AcademySoftwareFoundation/OpenColorIO.git")
              "https://github.com/AcademySoftwareFoundation/OpenColorIO.git")
-    add_versions("v2.1.0", "81fc7853a490031632a69c73716bc6ac271b395e2ba0e2587af9995c2b0efb5f")
+
+    add_versions("v2.4.2", "2d8f2c47c40476d6e8cea9d878f6601d04f6d5642b47018eaafa9e9f833f3690")
     add_versions("v2.1.1", "16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c")
     add_versions("v2.1.1", "16ebc3e0f21f72dbe90fe60437eb864f4d4de9c255ef8e212f837824fc9b8d9c")
+    add_versions("v2.1.0", "81fc7853a490031632a69c73716bc6ac271b395e2ba0e2587af9995c2b0efb5f")
 
 
-    add_deps("cmake", "expat", "yaml-cpp", "imath", "pystring")
     if is_plat("windows") then
     if is_plat("windows") then
         add_syslinks("user32", "gdi32")
         add_syslinks("user32", "gdi32")
     elseif is_plat("macosx") then
     elseif is_plat("macosx") then
         add_frameworks("CoreFoundation", "CoreGraphics", "ColorSync", "IOKit")
         add_frameworks("CoreFoundation", "CoreGraphics", "ColorSync", "IOKit")
     end
     end
-    on_load("windows", function (package)
-        if not package:config("shared") then
+
+    add_deps("cmake")
+    add_deps("expat", "yaml-cpp", "imath", "pystring")
+
+    on_check("windows|arm64", function (package)
+        if not package:is_cross() then
+            raise("package(opencolorio) unsupported windows arm64 native build")
+        end
+    end)
+
+    on_load(function (package)
+        if package:version() and package:version():ge("2.2.0") then
+            package:add("deps", "minizip-ng")
+        end
+
+        if not package:config("shared") and package:is_plat("windows") then
             package:add("defines", "OpenColorIO_SKIP_IMPORTS")
             package:add("defines", "OpenColorIO_SKIP_IMPORTS")
         end
         end
     end)
     end)
 
 
-    on_install("windows", "macosx", "linux", function (package)
+    on_install("!mingw and !iphoneos", function (package)
+        local minizip_ng = package:dep("minizip-ng")
+        local version = package:version()
+        if version then
+            if version:lt("2.2.0") then
+                -- Fix GCC 15
+                io.replace("src/OpenColorIO/FileRules.cpp", "#include <cctype>", "#include <cctype>\n#include <cstring>", {plain = true})
+            end
+            if version:lt("2.4.0") then
+                os.rm("share/cmake/modules/Findyaml-cpp.cmake")
+                io.replace("src/OpenColorIO/CMakeLists.txt", "yaml-cpp", "yaml-cpp::yaml-cpp", {plain = true})
+            end
+        end
+        if minizip_ng and package:is_plat("macosx") then
+            -- Break shared build
+            -- https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1729
+            io.replace("src/OpenColorIO/CMakeLists.txt", "elseif(APPLE)", "elseif(0)", {plain = true})
+        end
+
         local configs = {"-DOCIO_BUILD_APPS=OFF", "-DOCIO_BUILD_OPENFX=OFF", "-DOCIO_BUILD_PYTHON=OFF", "-DOCIO_BUILD_DOCS=OFF", "-DOCIO_BUILD_TESTS=OFF", "-DOCIO_BUILD_GPU_TESTS=OFF"}
         local configs = {"-DOCIO_BUILD_APPS=OFF", "-DOCIO_BUILD_OPENFX=OFF", "-DOCIO_BUILD_PYTHON=OFF", "-DOCIO_BUILD_DOCS=OFF", "-DOCIO_BUILD_TESTS=OFF", "-DOCIO_BUILD_GPU_TESTS=OFF"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
-        import("package.tools.cmake").install(package, configs)
+
+        local opt = {}
+        if minizip_ng then
+            opt.packagedeps = "minizip-ng"
+        end
+        import("package.tools.cmake").install(package, configs, opt)
     end)
     end)
 
 
     on_test(function (package)
     on_test(function (package)