add szip (#596)

* improve openimageio

* add szip

* update libcurl

* fix libcurl

* fix missing framework

packages/l/libcurl/versions.lua

@@ -1,4 +1,9 @@
 function add_versions_list()
+    add_versions("7.78.0", "98530b317dc95ccb324bbe4f834f07bb642fbc393b794ddf3434f246a71ea44a")
+    add_versions("7.77.0", "6c0c28868cb82593859fc43b9c8fdb769314c855c05cf1b56b023acf855df8ea")
+    add_versions("7.76.1", "7a8e184d7d31312c4ebf6a8cb59cd757e61b2b2833a9ed4f9bf708066e7695e9")
+    add_versions("7.75.0", "50552d4501c178e4cc68baaecc487f466a3d6d19bbf4e50a01869effb316d026")
+    add_versions("7.74.0", "0f4d63e6681636539dc88fa8e929f934cd3a840c46e0bf28c73be11e521b77a5")
     add_versions("7.73.0", "cf34fe0b07b800f1c01a499a6e8b2af548f6d0e044dca4a29d88a4bee146d131")
     add_versions("7.72.0", "ad91970864102a59765e20ce16216efc9d6ad381471f7accceceab7d905703ef")
     add_versions("7.71.1", "9d52a4d80554f9b0d460ea2be5d7be99897a1a9f681ffafe739169afd6b4f224")

packages/l/libcurl/xmake.lua

@@ -18,16 +18,16 @@ package("libcurl")
     end
 
     if is_plat("macosx") then
-        add_frameworks("Security", "CoreFoundation")
+        add_frameworks("Security", "CoreFoundation", "SystemConfiguration")
     elseif is_plat("linux") then
         add_syslinks("pthread")
     elseif is_plat("windows", "mingw") then
         add_syslinks("advapi32", "crypt32", "winmm", "ws2_32")
     end
 
-    add_configs("zlib",    { description = "Enable zlib compression library.", default = false, type = "boolean"})
-    add_configs("zstd",    { description = "Enable zstd compression library.", default = false, type = "boolean"})
-    add_configs("openssl", { description = "Enable openssl library.", default = false, type = "boolean"})
+    add_configs("zlib",    {description = "Enable zlib compression library.", default = false, type = "boolean"})
+    add_configs("zstd",    {description = "Enable zstd compression library.", default = false, type = "boolean"})
+    add_configs("openssl", {description = "Enable openssl library.", default = false, type = "boolean"})
 
     on_load(function (package)
         if package:is_plat("windows", "mingw") then
@@ -81,7 +81,7 @@ package("libcurl")
             table.insert(configs, "--with-pic")
         end
         if is_plat("macosx") then
-            table.insert(configs, "--with-darwinssl")
+            table.insert(configs, (package:version():ge("7.77") and "--with-secure-transport" or "--with-darwinssl"))
         end
         table.insert(configs, "--without-libidn2")
         table.insert(configs, "--without-nghttp2")

packages/o/openimageio/xmake.lua

@@ -21,7 +21,8 @@ package("openimageio")
                         openvdb  = "OpenVDB",
                         ptex     = "Ptex",
                         libwebp  = "WebP",
-                        libraw   = "LibRaw"}
+                        libraw   = "LibRaw",
+                        field3d  = "Field3D"}
     for conf, dep in pairs(configdeps) do
         add_configs(conf, {description = "Build with " .. conf .. " support.", default = (conf == "libwebp"), type = "boolean"})
     end
@@ -55,7 +56,6 @@ package("openimageio")
                          "-DLINKSTATIC=ON",
                          "-DCMAKE_DISABLE_FIND_PACKAGE_Nuke=ON",
                          "-DCMAKE_DISABLE_FIND_PACKAGE_DCMTK=ON",
-                         "-DCMAKE_DISABLE_FIND_PACKAGE_Field3D=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"))

packages/s/szip/xmake.lua

@@ -0,0 +1,41 @@
+package("szip")
+
+    set_homepage("https://support.hdfgroup.org/doc_resource/SZIP/")
+    set_description("Szip is an implementation of the extended-Rice lossless compression algorithm.")
+
+    add_urls("https://support.hdfgroup.org/ftp/lib-external/szip/$(version)/src/szip-$(version).tar.gz")
+    add_versions("2.1.1", "21ee958b4f2d4be2c9cabfa5e1a94877043609ce86fde5f286f105f7ff84d412")
+
+    on_load("windows|x64", function (package)
+        if package:config("shared") then
+            package:add("defines", "SZ_BUILT_AS_DYNAMIC_LIB")
+        end
+        if not package.is_built or package:is_built() then
+            package:add("deps", "cmake")
+        end
+    end)
+
+    on_install("windows|x64", function (package)
+        local configs = {}
+        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"))
+        import("package.tools.cmake").install(package, configs)
+        os.tryrm(package:installdir("bin", "*.dll|szip.dll"))
+        if package:config("shared") then
+            os.tryrm(package:installdir("lib", "libszip.lib"))
+        end
+    end)
+
+    on_install("macosx", "linux", function (package)
+        local configs = {}
+        table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
+        table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
+        if package:config("pic") ~= false then
+            table.insert(configs, "--with-pic")
+        end
+        import("package.tools.autoconf").install(package, configs)
+    end)
+
+    on_test(function (package)
+        assert(package:has_cfuncs("SZ_Compress", {includes = {"stddef.h", "szlib.h"}}))
+    end)