update zlib, minizip and spirv-headers (#1155)

* update zlib

* update spirv-headers

* update zlib-ng

* update minizip

* update minizip-ng

* fix spirv-headers

* fix zlib-ng

packages/m/minizip-ng/xmake.lua

@@ -2,14 +2,17 @@ package("minizip-ng")
 
     set_homepage("https://github.com/zlib-ng/minizip-ng")
     set_description("Fork of the popular zip manipulation library found in the zlib distribution.")
+    set_license("zlib")
 
-    add_urls("https://github.com/zlib-ng/minizip-ng/archive/refs/tags/$(version).tar.gz")
+    add_urls("https://github.com/zlib-ng/minizip-ng/archive/refs/tags/$(version).tar.gz",
+             "https://github.com/zlib-ng/minizip-ng.git")
     add_versions("3.0.3", "5f1dd0d38adbe9785cb9c4e6e47738c109d73a0afa86e58c4025ce3e2cc504ed")
+    add_versions("3.0.5", "1a248c378fdf4ef6c517024bb65577603d5146cffaebe81900bec9c0a5035d4d")
 
-    add_configs("zlib",  { description = "Enable zlib compression library.", default = true, type = "boolean"})
-    add_configs("lzma",  { description = "Enable liblzma compression library.", default = false, type = "boolean"})
-    add_configs("bzip2", { description = "Enable bzip2 comppressression library.", default = false, type = "boolean"})
-    add_configs("zstd",  { description = "Enable zstd comppressression library.", default = false, type = "boolean"})
+    add_configs("zlib",  {description = "Enable zlib compression library.", default = true, type = "boolean"})
+    add_configs("lzma",  {description = "Enable liblzma compression library.", default = false, type = "boolean"})
+    add_configs("bzip2", {description = "Enable bzip2 comppressression library.", default = false, type = "boolean"})
+    add_configs("zstd",  {description = "Enable zstd comppressression library.", default = false, type = "boolean"})
 
     add_deps("cmake")
     if is_plat("macosx") then

packages/m/minizip/xmake.lua

@@ -2,10 +2,13 @@ package("minizip")
 
     set_homepage("https://www.zlib.net/")
     set_description("Mini zip and unzip based on zlib")
+    set_license("zlib")
 
-    add_urls("https://github.com/madler/zlib/archive/v$(version).tar.gz")
-    add_versions("1.2.10", "42cd7b2bdaf1c4570e0877e61f2fdc0bce8019492431d054d3d86925e5058dc5")
-    add_versions("1.2.11", "629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff")
+    add_urls("https://github.com/madler/zlib/archive/$(version).tar.gz",
+             "https://github.com/madler/zlib.git")
+    add_versions("v1.2.10", "42cd7b2bdaf1c4570e0877e61f2fdc0bce8019492431d054d3d86925e5058dc5")
+    add_versions("v1.2.11", "629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff")
+    add_versions("v1.2.12", "d8688496ea40fb61787500e863cc63c9afcbc524468cedeb478068924eb54932")
 
     add_deps("zlib")
     on_install(function (package)

packages/s/spirv-headers/xmake.lua

@@ -5,14 +5,10 @@ package("spirv-headers")
     set_description("SPIR-V Headers")
     set_license("MIT")
 
-    local map = {["1.5.4+2"] = "1.5.4.raytracing.fixed",
-                 ["1.5.5"] = "sdk-1.2.198.0"}
-    add_urls("https://github.com/KhronosGroup/SPIRV-Headers/archive/$(version).tar.gz", {version = function (version) return map[tostring(version)] end})
-    add_versions("1.5.4+2", "df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6")
-    add_versions("1.5.5", "3301a23aca0434336a643e433dcacacdd60000ab3dd35dc0078a297c06124a12")
+    add_urls("https://github.com/KhronosGroup/SPIRV-Headers/archive/$(version).tar.gz", {version = function (version) return version:startswith("v") and version or "sdk-" .. version:gsub("%+", ".") end})
+    add_versions("1.2.198+0", "3301a23aca0434336a643e433dcacacdd60000ab3dd35dc0078a297c06124a12")
 
     add_deps("cmake")
-
     on_install(function (package)
         import("package.tools.cmake").install(package, {"-DSPIRV_HEADERS_SKIP_EXAMPLES=ON"})
     end)

packages/z/zlib-ng/xmake.lua

@@ -2,23 +2,20 @@ package("zlib-ng")
 
     set_homepage("https://github.com/zlib-ng/zlib-ng")
     set_description("zlib replacement with optimizations for next generation systems.")
+    set_license("zlib")
 
-    add_urls("https://github.com/zlib-ng/zlib-ng.git")
-
-    add_versions("2.0.5", "c69f78bc5e18a0f6de2dcbd8af863f59a14194f0")
+    add_urls("https://github.com/zlib-ng/zlib-ng/archive/refs/tags/$(version).tar.gz",
+             "https://github.com/zlib-ng/zlib-ng.git")
+    add_versions("2.0.5", "eca3fe72aea7036c31d00ca120493923c4d5b99fe02e6d3322f7c88dbdcd0085")
+    add_versions("2.0.6", "8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6")
 
     add_deps("cmake")
-
-    on_install(function (package)
+    on_install("windows", "macosx", "linux", "android", function (package)
         local configs = {"-DZLIB_COMPAT=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"))
         table.insert(configs, "-DINC_INSTALL_DIR=" .. package:installdir("include"))
         table.insert(configs, "-DLIB_INSTALL_DIR=" .. package:installdir("lib"))
-        if package:config("shared") then
-            table.insert(configs, "-DBUILD_SHARED_LIBS=on")
-        else
-            table.insert(configs, "-DBUILD_SHARED_LIBS=off")
-        end
         import("package.tools.cmake").install(package, configs)
     end)
 

packages/z/zlib/xmake.lua

@@ -5,9 +5,9 @@ package("zlib")
 
     add_urls("https://github.com/madler/zlib/archive/$(version).tar.gz",
              "https://github.com/madler/zlib.git")
-
     add_versions("v1.2.10", "42cd7b2bdaf1c4570e0877e61f2fdc0bce8019492431d054d3d86925e5058dc5")
     add_versions("v1.2.11", "629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff")
+    add_versions("v1.2.12", "d8688496ea40fb61787500e863cc63c9afcbc524468cedeb478068924eb54932")
 
     if is_plat("linux") then
         add_extsources("pacman::zlib", "apt::zlib1g-dev")
@@ -48,6 +48,7 @@ package("zlib")
                     add_defines("_CRT_SECURE_NO_DEPRECATE")
                     add_defines("_CRT_NONSTDC_NO_DEPRECATE")
                     if is_kind("shared") then
+                        add_files("win32/zlib1.rc")
                         add_defines("ZLIB_DLL")
                     end
                 else