فهرست منبع

upgrade vulkan and openblas (#218)

* upgrade spirv

* upgrade glslang

* upgrade openblas

* upgrade vulkan-header

* upgrade vulkan-loader

* upgrade vulkan-tools

* upgrade vulkan-validationlayers

* fix openblas on mac

* add msys subhost
Hoildkv 4 سال پیش
والد
کامیت
25af388065

+ 1 - 0
packages/g/glslang/xmake.lua

@@ -6,6 +6,7 @@ package("glslang")
 
 
     add_urls("https://github.com/KhronosGroup/glslang.git")
     add_urls("https://github.com/KhronosGroup/glslang.git")
     add_versions("1.2.154+1", "bacaef3237c515e40d1a24722be48c0a0b30f75f")
     add_versions("1.2.154+1", "bacaef3237c515e40d1a24722be48c0a0b30f75f")
+    add_versions("1.2.162+0", "c594de23cdd790d64ad5f9c8b059baae0ee2941d")
 
 
     add_deps("cmake", "python 3.x", {kind = "binary"})
     add_deps("cmake", "python 3.x", {kind = "binary"})
     add_deps("spirv-tools")
     add_deps("spirv-tools")

+ 4 - 2
packages/o/openblas/xmake.lua

@@ -7,10 +7,12 @@ package("openblas")
         if is_arch("x64", "x86_64") then
         if is_arch("x64", "x86_64") then
             add_urls("https://github.com/xianyi/OpenBLAS/releases/download/v$(version)/OpenBLAS-$(version)-x64.zip")
             add_urls("https://github.com/xianyi/OpenBLAS/releases/download/v$(version)/OpenBLAS-$(version)-x64.zip")
             add_versions("0.3.12", "f1d231594365d5c7f2c625f9d8bd4eeea4f7b748675a95301d3cb2c0aa118e26")
             add_versions("0.3.12", "f1d231594365d5c7f2c625f9d8bd4eeea4f7b748675a95301d3cb2c0aa118e26")
+            add_versions("0.3.13", "85cacd71dec9bc1e1168a8463fd0aa29a31f449b4583ed3a1c689a56df8eae29")
         end
         end
     else
     else
         add_urls("https://github.com/xianyi/OpenBLAS/releases/download/v$(version)/OpenBLAS-$(version).tar.gz")
         add_urls("https://github.com/xianyi/OpenBLAS/releases/download/v$(version)/OpenBLAS-$(version).tar.gz")
         add_versions("0.3.12", "65a7d3a4010a4e3bd5c0baa41a234797cd3a1735449a4a5902129152601dc57b")
         add_versions("0.3.12", "65a7d3a4010a4e3bd5c0baa41a234797cd3a1735449a4a5902129152601dc57b")
+        add_versions("0.3.13", "79197543b17cc314b7e43f7a33148c308b0807cd6381ee77f77e15acf3e6459e")
 
 
         add_configs("with_fortran", {description="Compile with fortran enabled.", default = true, type = "boolean"})
         add_configs("with_fortran", {description="Compile with fortran enabled.", default = true, type = "boolean"})
     end
     end
@@ -19,7 +21,7 @@ package("openblas")
         add_syslinks("pthread")
         add_syslinks("pthread")
     end
     end
 
 
-    on_install("windows", function (package)
+    on_install("windows|x64", function (package)
         if package:is_arch("x64", "x86_64") then
         if package:is_arch("x64", "x86_64") then
             os.cp("bin", package:installdir())
             os.cp("bin", package:installdir())
             os.cp("include", package:installdir())
             os.cp("include", package:installdir())
@@ -28,7 +30,7 @@ package("openblas")
         end
         end
     end)
     end)
 
 
-    on_install("linux", "mingw", function (package)
+    on_install("linux", "mingw@windows,msys", function (package)
         local configs = {}
         local configs = {}
         if package:config("debug") then table.insert(configs, "DEBUG=1") end
         if package:config("debug") then table.insert(configs, "DEBUG=1") end
         if not package:config("shared") then
         if not package:config("shared") then

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

@@ -4,8 +4,9 @@ package("spirv-cross")
     set_description("SPIRV-Cross is a practical tool and library for performing reflection on SPIR-V and disassembling SPIR-V back to high level languages.")
     set_description("SPIRV-Cross is a practical tool and library for performing reflection on SPIR-V and disassembling SPIR-V back to high level languages.")
     set_license("Apache-2.0")
     set_license("Apache-2.0")
 
 
-    add_urls("https://github.com/KhronosGroup/SPIRV-Cross/archive/$(version).tar.gz", {version = function (version) return version:gsub("%.", "-") end})
-    add_versions("2020.09.17", "a3351742fe1fae9a15e91abbfb5314d96f5f77927ed07f55124d6df830ac97a7")
+    add_urls("https://github.com/KhronosGroup/SPIRV-Cross.git")
+    add_versions("1.2.154+1", "e6f5ce6b8998f551f3400ad743b77be51bbe3019")
+    add_versions("1.2.162+0", "6d10da0224bd3214c9a507832e62d9fb6ae9620d")
 
 
     add_deps("cmake")
     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")
     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")

+ 3 - 2
packages/s/spirv-headers/xmake.lua

@@ -4,8 +4,9 @@ package("spirv-headers")
     set_description("SPIR-V Headers")
     set_description("SPIR-V Headers")
     set_license("MIT")
     set_license("MIT")
 
 
-    add_urls("https://github.com/KhronosGroup/SPIRV-Headers/archive/$(version).tar.gz")
-    add_versions("1.5.4", "fc026b6566167f6db03dc48779f0f986f9ff8c93ed651a557f28cfbe2dff4ede")
+    local map = {["1.5.4+2"] = "1.5.4.raytracing.fixed"}
+    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_deps("cmake")
     add_deps("cmake")
 
 

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

@@ -6,6 +6,7 @@ package("spirv-reflect")
 
 
     add_urls("https://github.com/KhronosGroup/SPIRV-Reflect.git")
     add_urls("https://github.com/KhronosGroup/SPIRV-Reflect.git")
     add_versions("1.2.154+1", "5de48fe8d3ef434e846d64ed758adc5d26335ae5")
     add_versions("1.2.154+1", "5de48fe8d3ef434e846d64ed758adc5d26335ae5")
+    add_versions("1.2.162+0", "481e34d666031eae28423f3b723a1a8c717d7636")
 
 
     add_deps("spirv-headers")
     add_deps("spirv-headers")
 
 

+ 1 - 0
packages/s/spirv-tools/xmake.lua

@@ -6,6 +6,7 @@ package("spirv-tools")
 
 
     add_urls("https://github.com/KhronosGroup/SPIRV-Tools/archive/v$(version).tar.gz")
     add_urls("https://github.com/KhronosGroup/SPIRV-Tools/archive/v$(version).tar.gz")
     add_versions("2020.5", "947ee994ba416380bd7ccc1c6377ac28a4802a55ca81ccc06796c28e84c00b71")
     add_versions("2020.5", "947ee994ba416380bd7ccc1c6377ac28a4802a55ca81ccc06796c28e84c00b71")
+    add_versions("2020.6", "de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3")
 
 
     add_patches("2020.5", "https://github.com/KhronosGroup/SPIRV-Tools/commit/a1d38174b1f7d2651c718ae661886d606cb50a32.patch", "2811faeef3ad53a83e409c8ef9879badcf9dc04fc3d98dbead7313514b819933")
     add_patches("2020.5", "https://github.com/KhronosGroup/SPIRV-Tools/commit/a1d38174b1f7d2651c718ae661886d606cb50a32.patch", "2811faeef3ad53a83e409c8ef9879badcf9dc04fc3d98dbead7313514b819933")
 
 

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

@@ -5,7 +5,7 @@ package("vulkan-headers")
     set_license("Apache-2.0")
     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_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("v1.2.162", "deab1a7a28ad3e0a7a0a1c4cd9c54758dce115a5f231b7205432d2bbbfb4d456")
+    add_versions("1.2.162+0", "eb0f6a79ac38e137f55a0e13641140e63b765c8ec717a65bf3904614ef754365")
     add_versions("1.2.154+0", "a0528ade4dd3bd826b960ba4ccabc62e92ecedc3c70331b291e0a7671b3520f9")
     add_versions("1.2.154+0", "a0528ade4dd3bd826b960ba4ccabc62e92ecedc3c70331b291e0a7671b3520f9")
 
 
     add_deps("cmake")
     add_deps("cmake")

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

@@ -5,6 +5,7 @@ package("vulkan-loader")
     set_license("Apache-2.0")
     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_urls("https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$(version).tar.gz", {version = function (version) return version:gsub("%+", ".") end})
+    add_versions("1.2.162+0", "f8f5ec2485e7fdba3f58c1cde5a25145ece1c6a686c91ba4016b28c0af3f21dd")
     add_versions("1.2.154+1", "889e45f7175d915dd0d702013b8021192e181d20f2ad4021c94006088f1edfe5")
     add_versions("1.2.154+1", "889e45f7175d915dd0d702013b8021192e181d20f2ad4021c94006088f1edfe5")
 
 
     add_deps("cmake", "ninja")
     add_deps("cmake", "ninja")

+ 1 - 0
packages/v/vulkan-tools/xmake.lua

@@ -5,6 +5,7 @@ package("vulkan-tools")
     set_license("Apache-2.0")
     set_license("Apache-2.0")
 
 
     add_urls("https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$(version).tar.gz", {version = function (version) return version:gsub("%+", ".") end})
     add_urls("https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$(version).tar.gz", {version = function (version) return version:gsub("%+", ".") end})
+    add_versions("1.2.162+0", "8324a6dfd1bc20d4fad45c4ea56357d8354fc03e3e4529d0a4919f124d9e6106")
     add_versions("1.2.154+0", "c7d66ec1f5fe5c0a13e487fe5c6eefd3a954522c0b05f06bd2ae41792aeea272")
     add_versions("1.2.154+0", "c7d66ec1f5fe5c0a13e487fe5c6eefd3a954522c0b05f06bd2ae41792aeea272")
 
 
     add_deps("cmake", "ninja")
     add_deps("cmake", "ninja")

+ 1 - 0
packages/v/vulkan-validationlayers/xmake.lua

@@ -5,6 +5,7 @@ package("vulkan-validationlayers")
     set_license("Apache-2.0")
     set_license("Apache-2.0")
 
 
     add_urls("https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$(version).tar.gz", {version = function (version) return version:gsub("%+", ".") end})
     add_urls("https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$(version).tar.gz", {version = function (version) return version:gsub("%+", ".") end})
+    add_versions("1.2.162+0", "80aa9e180b3900598121d7a3ea613665b99aae21bb40268ecafd82df8016c6f5")
     add_versions("1.2.154+0", "8898ab05d0d8dec04fbba03d0ed2e79a1eb5c0382e5c89d4c737b45a6648f7f9")
     add_versions("1.2.154+0", "8898ab05d0d8dec04fbba03d0ed2e79a1eb5c0382e5c89d4c737b45a6648f7f9")
 
 
     add_patches("1.2.154+0", "https://github.com/KhronosGroup/Vulkan-ValidationLayers/commit/9d3ef3258715573b17e8195855c76626600998be.patch", "1fa39483c345fbfb43b925e8410a55e58fa8a9776f9e5443c6e4ec994a554749")
     add_patches("1.2.154+0", "https://github.com/KhronosGroup/Vulkan-ValidationLayers/commit/9d3ef3258715573b17e8195855c76626600998be.patch", "1fa39483c345fbfb43b925e8410a55e58fa8a9776f9e5443c6e4ec994a554749")