diff --git a/packages/g/glslang/xmake.lua b/packages/g/glslang/xmake.lua index 0bdf75b6a..276d2f9b1 100644 --- a/packages/g/glslang/xmake.lua +++ b/packages/g/glslang/xmake.lua @@ -18,6 +18,7 @@ package("glslang") add_versions("1.3.275+0", "a91631b260cba3f22858d6c6827511e636c2458a") add_versions("1.3.280+0", "ee2f5d09eaf8f4e8d0d598bd2172fce290d4ca60") add_versions("1.3.283+0", "e8dd0b6903b34f1879520b444634c75ea2deedf5") + add_versions("1.3.290+0", "fa9c3deb49e035a8abcabe366f26aac010f6cbfb") add_patches("1.3.246+1", "https://github.com/KhronosGroup/glslang/commit/1e4955adbcd9b3f5eaf2129e918ca057baed6520.patch", "47893def550f1684304ef7c49da38f0a8fe35c190a3452d3bf58370b3ee7165d") diff --git a/packages/s/spirv-headers/xmake.lua b/packages/s/spirv-headers/xmake.lua index 1b714848e..93f7c32a5 100644 --- a/packages/s/spirv-headers/xmake.lua +++ b/packages/s/spirv-headers/xmake.lua @@ -24,6 +24,7 @@ package("spirv-headers") add_versions("1.3.275+0", "d46b261f1fbc5e85022cb2fada9a6facb5b0c9932b45007a77fe05639a605bd1") add_versions("1.3.280+0", "a00906b6bddaac1e37192eff2704582f82ce2d971f1aacee4d51d9db33b0f772") add_versions("1.3.283+0", "a68a25996268841073c01514df7bab8f64e2db1945944b45087e5c40eed12cb9") + add_versions("1.3.290+0", "1b9ff8a33e07814671dee61fe246c67ccbcfc9be6581f229e251784499700e24") add_patches("1.3.261+1", "https://github.com/KhronosGroup/SPIRV-Headers/commit/c43effd54686240d8b13762279d5392058d10e27.patch", "b97a05c35c00620519a5f3638a974fc2a01f062bf6e86b74b49a234f82cc55ce") diff --git a/packages/s/spirv-reflect/xmake.lua b/packages/s/spirv-reflect/xmake.lua index 7144bef76..a97822d84 100644 --- a/packages/s/spirv-reflect/xmake.lua +++ b/packages/s/spirv-reflect/xmake.lua @@ -14,6 +14,7 @@ package("spirv-reflect") add_versions("1.3.275+0", "2f7460f0be0f73c9ffde719bc3e924b4250f4d98") add_versions("1.3.280+0", "8406f76dcf6cca11fe430058c4f0ed4b846f3be4") add_versions("1.3.283+0", "ee5b57fba6a986381f998567761bbc064428e645") + add_versions("1.3.290+0", "b4dc70d8e6ac30c719a2d05b8ad05e1d277c92b4") add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) diff --git a/packages/s/spirv-tools/xmake.lua b/packages/s/spirv-tools/xmake.lua index 8940f4d8c..ad2a8a163 100644 --- a/packages/s/spirv-tools/xmake.lua +++ b/packages/s/spirv-tools/xmake.lua @@ -18,6 +18,7 @@ package("spirv-tools") add_versions("1.3.275+0", "vulkan-sdk-1.3.275.0") add_versions("1.3.280+0", "vulkan-sdk-1.3.280.0") add_versions("1.3.283+0", "vulkan-sdk-1.3.283.0") + add_versions("1.3.290+0", "vulkan-sdk-1.3.290.0") add_deps("cmake >=3.17.2") add_deps("python 3.x", {kind = "binary"}) diff --git a/packages/v/volk/xmake.lua b/packages/v/volk/xmake.lua index f678b8533..c938d2545 100644 --- a/packages/v/volk/xmake.lua +++ b/packages/v/volk/xmake.lua @@ -23,6 +23,7 @@ package("volk") add_versions("1.3.275+0", "b68d24e139190e49e5eafd72894f6e85c80472b8745bddc6ef91d6bf339df813") add_versions("1.3.280+0", "af9c98d09284eef29f6826bb1620bfe551a91a864fce707416b83c255efe3c25") add_versions("1.3.283+0", "872035f1f26c53b218632a3a8dbccbd276710aaabafb9bb1bc1a6c0633ee6aab") + add_versions("1.3.290+0", "bb6a6d616c0f2bbd5d180da982a6d92a0948581cec937de69f17883980c6ca06") add_deps("vulkan-headers") diff --git a/packages/v/vulkan-headers/xmake.lua b/packages/v/vulkan-headers/xmake.lua index 8208517af..0316d3b47 100644 --- a/packages/v/vulkan-headers/xmake.lua +++ b/packages/v/vulkan-headers/xmake.lua @@ -16,6 +16,7 @@ package("vulkan-headers") add_configs("modules", {description = "Build with C++20 modules support.", default = false, type = "boolean"}) -- when adding a new sdk version, please also update vulkan-hpp, vulkan-loader, vulkan-utility-libraries, spirv-headers, spirv-reflect, glslang and volk packages + add_versions("1.3.290+0", "5b186e1492d97c44102fe858fb9f222b55524a8b6da940a8795c9e326ae6d722") add_versions("1.3.283+0", "cf54a812911b4e3e4ff15716c222a8fb9a87c2771c0b86060cb0ca2570ea55a9") add_versions("1.3.280+0", "14caa991988be6451755ad1c81df112f4b6f2bea05f0cf2888a52d4d0f0910f6") add_versions("1.3.275+0", "fcd2136a9feb0402820b334d8242773462cc47ed397aa20c8f4d04f7ea18d810") @@ -48,7 +49,10 @@ package("vulkan-headers") on_install(function (package) if not package:config("modules") then - import("package.tools.cmake").install(package) + import("package.tools.cmake").install(package, { + "-DVULKAN_HEADERS_ENABLE_MODULE=OFF", + "-DVULKAN_HEADERS_ENABLE_TESTS=OFF" + }) else io.writefile("xmake.lua", [[ target("vulkan-headers") diff --git a/packages/v/vulkan-hpp/xmake.lua b/packages/v/vulkan-hpp/xmake.lua index 1f6afc351..3d0b23170 100644 --- a/packages/v/vulkan-hpp/xmake.lua +++ b/packages/v/vulkan-hpp/xmake.lua @@ -27,6 +27,7 @@ package("vulkan-hpp") add_versions("v1.3.281", "88d508b32f207ba85b37fe22fe3732322d1c248d") add_versions("v1.3.282", "4bf2835dd1a530291cd2b340a58dd7e369d5c86c") add_versions("v1.3.283", "2fbc146feefa43b8201af4b01eb3570110f9fa32") + add_versions("v1.3.290", "e3b0737d57e81875361bf1943f083eac902dacb7") add_configs("modules", {description = "Build with C++20 modules support.", default = false, type = "boolean"}) diff --git a/packages/v/vulkan-loader/xmake.lua b/packages/v/vulkan-loader/xmake.lua index 3342ceb2f..69c171bb4 100644 --- a/packages/v/vulkan-loader/xmake.lua +++ b/packages/v/vulkan-loader/xmake.lua @@ -11,6 +11,7 @@ package("vulkan-loader") return prefix .. version:gsub("%+", ".") end}) + add_versions("1.3.290+0", "0cd31fdb9b576e432a85ad4d555fac4f4e5ede22ca37ff534ab67c71cd172644") add_versions("1.3.283+0", "59151a3cdbf8dcfe9c2ce4b5bf33358255a197f48d8d0ee8a1d8642ed9ace80f") add_versions("1.3.280+0", "f9317667a180257381dcbc74726083af581189f51e10e0246adaa86df075fe16") add_versions("1.3.275+0", "f49a2653cd592439c5b4b987ffa0b2577b7fa72b7d344d7a2a89f7d6cb2b342e") diff --git a/packages/v/vulkan-utility-libraries/xmake.lua b/packages/v/vulkan-utility-libraries/xmake.lua index 924505307..97caa0326 100644 --- a/packages/v/vulkan-utility-libraries/xmake.lua +++ b/packages/v/vulkan-utility-libraries/xmake.lua @@ -12,6 +12,7 @@ package("vulkan-utility-libraries") return version:startswith("v") and version or prefix .. version:gsub("%+", ".") end}) + add_versions("v1.3.290", "5173690276d25e51b63132ed6907542b9bc2d64150db0fe057ff59067493e33c") add_versions("v1.3.283", "a446616dede2b0168726f4e1b51777ba5c20ec46c475b378e2c07fd4ab4375ee") add_versions("v1.3.280", "075e13f2fdeeca3bb6fb39155c8cc345cf216ab93661549b1a33368aa28a9dea") add_versions("v1.3.275", "96d3ec7bda7b6e9fabbb471c570104a7b1cb56928d097dd0441c96129468b888") diff --git a/packages/v/vulkan-validationlayers/xmake.lua b/packages/v/vulkan-validationlayers/xmake.lua index 958f00d81..ffe5691ac 100644 --- a/packages/v/vulkan-validationlayers/xmake.lua +++ b/packages/v/vulkan-validationlayers/xmake.lua @@ -18,6 +18,7 @@ package("vulkan-validationlayers") end end}) + add_versions("1.3.290+0", "eb26b4bf1f031e57d1624c53d489279076b893b0383fddccc79de7ee2caaa128") add_versions("1.3.275+0", "6e22fb13601c1e780c44a17497a3c999cc5207e52a09819e7c32ecd8439eff7a") add_versions("1.2.198+0", "5436e974d6b3133b3454edf1910f76b9f869db8bbe086859b2abe32fdb539cbc") add_versions("1.2.189+1", "b3e69b60a67a17b023825f9eb0ce1aef22e6b59d095afa204d883a9ce3d81021") @@ -30,6 +31,7 @@ package("vulkan-validationlayers") return version:startswith("v") and version or prefix .. version:gsub("%+", ".") end}) + add_versions("1.3.290+0", "59be2c0a5bdbfdbdebdcda48bd65ffa3b219f681c73a90fc683cd4708c1b79de") add_versions("1.3.275+0", "acfd84039109220129624b0ecb69980bbc3a858978c62b556dbe16efd0f26755") add_versions("1.2.198+0", "4a70cc5da26baf873fcf69b081eeeda545515dd66e5904f18fee32b4d275593a") add_versions("1.2.189+1", "d169ae71ae3ba12159df355b58f86f5635062c695d1deac9b97d5653561d517d") @@ -51,7 +53,7 @@ package("vulkan-validationlayers") elseif is_plat("linux") then add_extsources("apt::vulkan-validationlayers-dev", "pacman::vulkan-validation-layers") add_deps("ninja") - add_deps("wayland", "libxrandr", "libxcb", "libxkbcommon") + add_deps("wayland", "libxrandr", "libxrender", "libxcb", "libxkbcommon") elseif is_plat("macosx") then add_extsources("brew::vulkan-validationlayers") end @@ -76,7 +78,7 @@ package("vulkan-validationlayers") if package:is_plat("linux") then local includes = {} local linkdirs = {} - for _, lib in ipairs({"wayland", "libxrandr", "libxcb", "libxkbcommon"}) do + for _, lib in ipairs({"wayland", "libxrandr", "libxrender", "libxcb", "libxkbcommon"}) do local fetchinfo = package:dep(lib):fetch() for _, dir in ipairs(fetchinfo.sysincludedirs or fetchinfo.includedirs) do table.insert(includes, dir)