Pārlūkot izejas kodu

update spirv-cross, moltenvk, volk (#1586)

* update spirv-cross

* update volk

* update moltenvk
Hoildkv 2 gadi atpakaļ
vecāks
revīzija
1e515ca05f

+ 1 - 0
packages/m/moltenvk/xmake.lua

@@ -8,6 +8,7 @@ package("moltenvk")
     add_versions("1.1.0", "0538fa1c23ddae495c7f82ccd0db90790a90b7017a258ca7575fbae8021f3058")
     add_versions("1.1.4", "f9bba6d3bf3648e7685c247cb6d126d62508af614bc549cedd5859a7da64967e")
     add_versions("1.1.5", "2cdcb8dbf2acdcd8cbe70b109dadc05a901038c84970afbe4863e5e23f33deae")
+    add_versions("1.2.0", "6e7af2dad0530b2b404480dbe437ca4670c6615cc2ec6cf6a20ed04d9d75e0bd")
 
     on_fetch("macosx", function (package, opt)
         if opt.system then

+ 2 - 1
packages/s/spirv-cross/xmake.lua

@@ -8,6 +8,7 @@ package("spirv-cross")
     add_versions("1.2.154+1", "e6f5ce6b8998f551f3400ad743b77be51bbe3019")
     add_versions("1.2.162+0", "6d10da0224bd3214c9a507832e62d9fb6ae9620d")
     add_versions("1.2.189+1", "0e2880ab990e79ce6cc8c79c219feda42d98b1e8")
+    add_versions("1.3.231.1", "f09ba2777714871bddb70d049878af34b94fa54d")
 
     add_deps("cmake")
     add_links("spirv-cross-c", "spirv-cross-cpp", "spirv-cross-reflect", "spirv-cross-msl", "spirv-cross-util", "spirv-cross-hlsl", "spirv-cross-glsl", "spirv-cross-core")
@@ -24,7 +25,7 @@ package("spirv-cross")
     end)
 
     on_test(function (package)
-        if not package:is_plat("mingw") or is_subhost("msys") then
+        if not package:is_cross() then
             os.vrun("spirv-cross --help")
         end
         assert(package:has_cfuncs("spvc_get_version", {includes = "spirv_cross/spirv_cross_c.h"}))

+ 1 - 1
packages/s/spirv-headers/xmake.lua

@@ -8,7 +8,7 @@ package("spirv-headers")
     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_versions("1.3.211+0", "30a78e61bd812c75e09fdc7a319af206b1044536326bc3e85fea818376a12568")
-    add_versions("1.3.231+0", "dbd579f6d1351d03f49b821fb273a068ab6ca9e4e0beb498d48eb4d5f72d8dee")
+    add_versions("1.3.231+1", "fc340700b005e9a2adc98475b5afbbabd1bc931f789a2afd02d54ebc22522af3")
 
     add_deps("cmake")
     on_install(function (package)

+ 1 - 1
packages/s/spirv-reflect/xmake.lua

@@ -8,7 +8,7 @@ package("spirv-reflect")
     add_versions("1.2.154+1", "5de48fe8d3ef434e846d64ed758adc5d26335ae5")
     add_versions("1.2.162+0", "481e34d666031eae28423f3b723a1a8c717d7636")
     add_versions("1.2.189+1", "272e050728de8d4a4ce9e7101c1244e6ff56e5b0")
-    add_versions("1.3.231+0", "b68b5a8a5d8ab5fce79e6596f3a731291046393a")
+    add_versions("1.3.231+1", "b68b5a8a5d8ab5fce79e6596f3a731291046393a")
 
     add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
 

+ 5 - 2
packages/v/volk/xmake.lua

@@ -4,11 +4,14 @@ package("volk")
     set_description("volk is a meta-loader for Vulkan")
     set_license("MIT")
 
-    add_urls("https://github.com/zeux/volk/archive/$(version).tar.gz",
-            "https://github.com/zeux/volk.git")
+    add_urls("https://github.com/zeux/volk/archive/$(version).tar.gz", {version = function (version)
+        return version:ge("1.3.226") and format("sdk-%s", version:gsub("%+", ".")) or version
+    end})
+    add_urls("https://github.com/zeux/volk.git")
     add_versions("1.2.190", "07f03720b8c70a626c98cc9545350538122bca9f853e6ed20ccad5a25d55fa4b")
     add_versions("1.2.162", "ac4d9d6e88dee5a83ad176e2da57f1989ca2c6df155a0aeb5e18e9471aa4d777")
     add_versions("1.3.204", "7776e7f3c70f199579da33d2ccd7152ca8b96182fa98c31fbe80880cef0fdf70")
+    add_versions("1.3.231+1", "fac8d3d295e88bcc6bfb2b729d2c4babb2ea04ccb39fd918a3471b2d756789b9")
 
     add_deps("vulkan-headers")
 

+ 1 - 1
packages/v/vulkan-headers/xmake.lua

@@ -6,7 +6,7 @@ package("vulkan-headers")
     set_license("Apache-2.0")
 
     add_urls("https://github.com/KhronosGroup/Vulkan-Headers/archive/$(version).tar.gz", {version = function (version) return version:startswith("v") and version or "sdk-" .. version:gsub("%+", ".") end})
-    add_versions("1.3.231+0", "f7c185dedf7753d58e7b59913dd4b77006a6ed91fae598c5961f77d85b183da0")
+    add_versions("1.3.231+1", "6e16051ccb28821b907a08025eedb82cc73e1056924b32f75880ecae2499f7f6")
     add_versions("1.3.211+0", "c464bcdc24b7541ac4378a270617a23d4d92699679a73f95dc4b9e1da924810a")
     add_versions("1.2.198+0", "34782c61cad9b3ccf2fa0a31ec397d4fce99490500b4f3771cb1a48713fece80")
     add_versions("1.2.189+1", "ce2eb5995dddd8ff2cee897ab91c30a35d6096d5996fc91cec42bfb37112d3f8")

+ 1 - 1
packages/v/vulkan-loader/xmake.lua

@@ -5,7 +5,7 @@ package("vulkan-loader")
     set_license("Apache-2.0")
 
     add_urls("https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$(version).tar.gz", {version = function (version) return version:gsub("%+", ".") end})
-    add_versions("1.3.231+0", "5253f2145114a5da95be6c88a724f782242b26c59d8394fe4e0a640225e0044c")
+    add_versions("1.3.231+1", "5226fbc6a90e4405200c8cfdd5733d5e0c6a64e64dcc614c485ea06e03d66578")
     add_versions("1.2.198+0", "7d5d56296dcd88af84ed0fde969038370cac8600c4ef7e328788b7422d9025bb")
     add_versions("1.2.189+1", "1d9f539154d37cea0ca336341c3b25e73d5a5320f2f9c9c55f8309422fe6ec3c")
     add_versions("1.2.182+0", "7088fb6922a3af41efd0499b8e66e971164da1e583410d29f801f991a31b180c")