From b3dfebb85e6be6e6414244a65603cf0d9fbc09e7 Mon Sep 17 00:00:00 2001 From: Louis Bailleau Date: Tue, 30 Nov 2021 12:44:03 +0100 Subject: [PATCH] update vulkan packages to 1.2.198 (#721) * Updated vulkan packages version from 1.2.189 to 1.2.198 * Update xmake.lua * updated `spirv-headers` and `spirv-tools` versions * changed `spirv-headers` to respect semver version format * Update xmake.lua * Update xmake.lua * Update xmake.lua Co-authored-by: ruki --- packages/s/spirv-headers/xmake.lua | 5 ++--- packages/s/spirv-tools/xmake.lua | 1 + packages/v/vulkan-headers/xmake.lua | 1 + packages/v/vulkan-hpp/xmake.lua | 1 + packages/v/vulkan-loader/xmake.lua | 3 ++- packages/v/vulkan-tools/xmake.lua | 1 + packages/v/vulkan-validationlayers/xmake.lua | 2 ++ 7 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/s/spirv-headers/xmake.lua b/packages/s/spirv-headers/xmake.lua index 2376ed509..c1a1d305b 100644 --- a/packages/s/spirv-headers/xmake.lua +++ b/packages/s/spirv-headers/xmake.lua @@ -6,11 +6,10 @@ package("spirv-headers") set_license("MIT") local map = {["1.5.4+2"] = "1.5.4.raytracing.fixed", - -- Workaround since no new releases are available for spirv-headers, will be removed in future - ["1.5.5"] = "e71feddb3f17c5586ff7f4cfb5ed1258b800574b"} + ["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", "9eb56548460fd8850250ebf78071528fb66c2a5db2ef535edc1d493b2581ec66") + add_versions("1.5.5", "3301a23aca0434336a643e433dcacacdd60000ab3dd35dc0078a297c06124a12") add_deps("cmake") diff --git a/packages/s/spirv-tools/xmake.lua b/packages/s/spirv-tools/xmake.lua index 74c83edea..3baf71450 100644 --- a/packages/s/spirv-tools/xmake.lua +++ b/packages/s/spirv-tools/xmake.lua @@ -8,6 +8,7 @@ package("spirv-tools") add_versions("2020.5", "947ee994ba416380bd7ccc1c6377ac28a4802a55ca81ccc06796c28e84c00b71") add_versions("2020.6", "de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3") add_versions("2021.3", "b6b4194121ee8084c62b20f8d574c32f766e4e9237dfe60b0658b316d19c6b13") + add_versions("2021.4", "d68de260708dda785d109ff1ceeecde2d2ab71142fa5bf59061bb9f47dd3bb2c") add_patches("2020.5", "https://github.com/KhronosGroup/SPIRV-Tools/commit/a1d38174b1f7d2651c718ae661886d606cb50a32.patch", "2811faeef3ad53a83e409c8ef9879badcf9dc04fc3d98dbead7313514b819933") diff --git a/packages/v/vulkan-headers/xmake.lua b/packages/v/vulkan-headers/xmake.lua index a3b59746a..143701e0b 100644 --- a/packages/v/vulkan-headers/xmake.lua +++ b/packages/v/vulkan-headers/xmake.lua @@ -6,6 +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.2.198+0", "34782c61cad9b3ccf2fa0a31ec397d4fce99490500b4f3771cb1a48713fece80") add_versions("1.2.189+1", "ce2eb5995dddd8ff2cee897ab91c30a35d6096d5996fc91cec42bfb37112d3f8") add_versions("1.2.182+0", "61c05dc8a24d5a9104ca2cd233cb9febc3455d69a64e404c3535293f3a463d02") add_versions("1.2.162+0", "eb0f6a79ac38e137f55a0e13641140e63b765c8ec717a65bf3904614ef754365") diff --git a/packages/v/vulkan-hpp/xmake.lua b/packages/v/vulkan-hpp/xmake.lua index 7ac8ba00e..f77860a2e 100644 --- a/packages/v/vulkan-hpp/xmake.lua +++ b/packages/v/vulkan-hpp/xmake.lua @@ -7,6 +7,7 @@ package("vulkan-hpp") add_urls("https://github.com/KhronosGroup/Vulkan-Hpp.git") add_versions("v1.2.180", "bfa6d4765212505c8241a44b97dc5a9ce3aa2969") add_versions("v1.2.189", "58ff1da4c03f5f124eb835f41a9dd8fe3c2e8087") + add_versions("v1.2.198", "d8c9f4f0eee6972622a1c3aabab5ed558d37c1c0") add_deps("cmake") diff --git a/packages/v/vulkan-loader/xmake.lua b/packages/v/vulkan-loader/xmake.lua index e6912b153..180190d6b 100644 --- a/packages/v/vulkan-loader/xmake.lua +++ b/packages/v/vulkan-loader/xmake.lua @@ -5,6 +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.2.198+0", "7d5d56296dcd88af84ed0fde969038370cac8600c4ef7e328788b7422d9025bb") add_versions("1.2.189+1", "1d9f539154d37cea0ca336341c3b25e73d5a5320f2f9c9c55f8309422fe6ec3c") add_versions("1.2.182+0", "7088fb6922a3af41efd0499b8e66e971164da1e583410d29f801f991a31b180c") add_versions("1.2.162+0", "f8f5ec2485e7fdba3f58c1cde5a25145ece1c6a686c91ba4016b28c0af3f21dd") @@ -12,7 +13,7 @@ package("vulkan-loader") if is_plat("linux") then add_extsources("apt::libvulkan-dev") - add_deps("wayland", "libxrandr", "libxcb", "libxkbcommon") + add_deps("wayland", "libxrandr", "libxrender", "libxcb", "libxkbcommon") end on_load("windows", "linux", "macosx", function (package) diff --git a/packages/v/vulkan-tools/xmake.lua b/packages/v/vulkan-tools/xmake.lua index a942835b7..c01001dc1 100644 --- a/packages/v/vulkan-tools/xmake.lua +++ b/packages/v/vulkan-tools/xmake.lua @@ -6,6 +6,7 @@ package("vulkan-tools") 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_versions("1.2.198+0", "06e174bca7834df73dc6ce3c2a72ab3bc34b63e16fdb9a486bf1315f02768032") add_versions("1.2.189+1", "ef5db0934ff7192657bbfc675f6e3e1ee009f2ad34aab915d2bd9993a59add81") add_versions("1.2.162+0", "8324a6dfd1bc20d4fad45c4ea56357d8354fc03e3e4529d0a4919f124d9e6106") add_versions("1.2.154+0", "c7d66ec1f5fe5c0a13e487fe5c6eefd3a954522c0b05f06bd2ae41792aeea272") diff --git a/packages/v/vulkan-validationlayers/xmake.lua b/packages/v/vulkan-validationlayers/xmake.lua index 3d62e5503..e19fcd04a 100644 --- a/packages/v/vulkan-validationlayers/xmake.lua +++ b/packages/v/vulkan-validationlayers/xmake.lua @@ -8,11 +8,13 @@ package("vulkan-validationlayers") add_urls("https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download/sdk-$(version)/android-binaries-$(version).tar.gz", {version = function (version) return version:gsub("%+", ".") end}) + add_versions("1.2.198+0", "5436e974d6b3133b3454edf1910f76b9f869db8bbe086859b2abe32fdb539cbc") add_versions("1.2.189+1", "b3e69b60a67a17b023825f9eb0ce1aef22e6b59d095afa204d883a9ce3d81021") else add_urls("https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$(version).tar.gz", {version = function (version) return version:gsub("%+", ".") end}) + add_versions("1.2.198+0", "4a70cc5da26baf873fcf69b081eeeda545515dd66e5904f18fee32b4d275593a") add_versions("1.2.189+1", "d169ae71ae3ba12159df355b58f86f5635062c695d1deac9b97d5653561d517d") add_versions("1.2.162+0", "80aa9e180b3900598121d7a3ea613665b99aae21bb40268ecafd82df8016c6f5") add_versions("1.2.154+0", "8898ab05d0d8dec04fbba03d0ed2e79a1eb5c0382e5c89d4c737b45a6648f7f9")