update boost and openimageio (#757)

packages/b/boost/xmake.lua

@@ -2,6 +2,7 @@ package("boost")
 
     set_homepage("https://www.boost.org/")
     set_description("Collection of portable C++ source libraries.")
+    set_license("BSL-1.0")
 
     add_urls("https://boostorg.jfrog.io/artifactory/main/release/$(version).tar.bz2", {version = function (version)
             return version .. "/source/boost_" .. (version:gsub("%.", "_"))
@@ -9,6 +10,7 @@ package("boost")
     add_urls("https://github.com/xmake-mirror/boost/releases/download/boost-$(version).tar.bz2", {version = function (version)
             return version .. "/boost_" .. (version:gsub("%.", "_"))
         end})
+    add_versions("1.78.0", "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc")
     add_versions("1.77.0", "fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854")
     add_versions("1.76.0", "f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41")
     add_versions("1.75.0", "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb")
@@ -88,9 +90,6 @@ package("boost")
             elseif vs_runtime == "MDd" then
                 linkname = linkname .. "-gd"
             end
-            if package:version():ge("1.77.0") then
-                linkname = linkname .. (package:is_arch("x64") and "-x64" or "-x32")
-            end
             package:add("links", linkname)
         end
         -- disable auto-link all libs
@@ -135,7 +134,7 @@ package("boost")
             "-d2",
             "-j4",
             "--hash",
-            "--layout=tagged",
+            "--layout=tagged-1.66", -- prevent -x64 suffix in case cmake can't find it
             "--user-config=user-config.jam",
             "-sNO_LZMA=1",
             "-sNO_ZSTD=1",

packages/l/libjpeg-turbo/xmake.lua

@@ -10,7 +10,8 @@ package("libjpeg-turbo")
     add_versions("2.0.6",  "005aee2fcdca252cee42271f7f90574dda64ca6505d9f8b86ae61abc2b426371")
     add_versions("2.0.90", "6a965adb02ad898b2ae48214244618fe342baea79db97157fdc70d8844ac6f09")
     add_versions("2.1.0",  "d6b7790927d658108dfd3bee2f0c66a2924c51ee7f9dc930f62c452f4a638c52")
-    add_versions("2.1.1", "20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4")
+    add_versions("2.1.1",  "20e9cd3e5f517950dfb7a300ad344543d88719c254407ffb5ad88d891bf701c4")
+    add_versions("2.1.2",  "e7fdc8a255c45bc8fbd9aa11c1a49c23092fcd7379296aeaeb14d3343a3d1bed")
 
     add_configs("jpeg", {description = "libjpeg API/ABI emulation target version.", default = "6", type = "string", values = {"6", "7", "8"}})
 

packages/o/openimageio/xmake.lua

@@ -4,8 +4,9 @@ package("openimageio")
     set_description("OpenImageIO is a library for reading and writing images, and a bunch of related classes, utilities, and applications.")
     set_license("BSD-3-Clause")
 
-    add_urls("https://github.com/OpenImageIO/oiio/archive/refs/tags/v$(version).tar.gz", {version = function (version) return version:gsub("%+", ".") end})
-    add_versions("2.2.17+0", "b570da8928c3e8cde29bdb0e0320e727789e141c48375fb69a2548d642462396")
+    add_urls("https://github.com/OpenImageIO/oiio/archive/refs/tags/v$(version).zip", {version = function (version) return version:gsub("%+", ".") end})
+    add_versions("2.2.19+0", "30a494ccfc2ee951fabbdf308d1b59eddb1a21aa5276887fe6a6fc874454794e")
+    add_versions("2.3.10+1", "48ce9b9c3e815885f5634438fed3e240ad186fd9e30d392e17564b5e9eebb089")
 
     add_deps("cmake")
     add_deps("boost", {configs = {filesystem = true, system = true, thread = true}})
@@ -22,7 +23,8 @@ package("openimageio")
                         ptex     = "Ptex",
                         libwebp  = "WebP",
                         libraw   = "LibRaw",
-                        field3d  = "Field3D"}
+                        field3d  = "Field3D",
+                        dcmtk    = "DCMTK"}
     for conf, dep in pairs(configdeps) do
         add_configs(conf, {description = "Build with " .. conf .. " support.", default = (conf == "libwebp"), type = "boolean"})
     end
@@ -31,6 +33,7 @@ package("openimageio")
     if is_plat("windows") then
         add_syslinks("shell32")
     end
+    add_links("OpenImageIO", "OpenImageIO_Util")
 
     on_load("windows", "macosx", "linux", function (package)
         if package:is_plat("windows") and not package:config("shared") then
@@ -51,11 +54,12 @@ package("openimageio")
         io.replace("CMakeLists.txt", "NOT ${PROJECT_NAME}_IS_SUBPROJECT", "TRUE", {plain = true})
         local configs = {"-DBUILD_DOCS=OFF",
                          "-DINSTALL_DOCS=OFF",
+                         "-DOIIO_BUILD_TESTS=OFF",
                          "-DUSE_QT=OFF",
                          "-DUSE_EXTERNAL_PUGIXML=ON",
                          "-DLINKSTATIC=ON",
+                         "-DBoost_USE_STATIC_LIBS=ON",
                          "-DCMAKE_DISABLE_FIND_PACKAGE_Nuke=ON",
-                         "-DCMAKE_DISABLE_FIND_PACKAGE_DCMTK=ON",
                          "-DCMAKE_DISABLE_FIND_PACKAGE_R3DSDK=ON"}
         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"))
@@ -83,5 +87,5 @@ package("openimageio")
                 out->write_image(TypeDesc::UINT8, pixels);
                 out->close();
             }
-        ]]}, {configs = {languages = "c++11"}, includes = "OpenImageIO/imageio.h"}))
+        ]]}, {configs = {languages = "c++17"}, includes = "OpenImageIO/imageio.h"}))
     end)