update vulkan-loader (#1576)

* update vulkan-loader

* disable ninja

* disable arm

* disable loader arm

packages/c/cuda/xmake.lua

@@ -3,7 +3,7 @@ package("cuda")
     set_homepage("https://developer.nvidia.com/cuda-zone/")
     set_description("CUDA® is a parallel computing platform and programming model developed by NVIDIA for general computing on graphical processing units (GPUs).")
 
-    add_configs("utils", {description = "enabled cuda utilities.", default = {}, type = "table"})
+    add_configs("utils", {description = "Enabled cuda utilities.", default = {}, type = "table"})
 
     on_load(function (package)
         import("detect.sdks.find_cuda")

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.3.231+0", "f7c185dedf7753d58e7b59913dd4b77006a6ed91fae598c5961f77d85b183da0")
     add_versions("1.3.211+0", "c464bcdc24b7541ac4378a270617a23d4d92699679a73f95dc4b9e1da924810a")
     add_versions("1.2.198+0", "34782c61cad9b3ccf2fa0a31ec397d4fce99490500b4f3771cb1a48713fece80")
     add_versions("1.2.189+1", "ce2eb5995dddd8ff2cee897ab91c30a35d6096d5996fc91cec42bfb37112d3f8")
@@ -16,7 +17,7 @@ package("vulkan-headers")
     add_deps("cmake")
 
     if is_plat("linux") then
-      add_extsources("pacman::vulkan-headers")
+        add_extsources("pacman::vulkan-headers")
     end
 
     on_install(function (package)

packages/v/vulkan-hpp/xmake.lua

@@ -1,5 +1,6 @@
 package("vulkan-hpp")
 
+    set_kind("library", {headeronly = true})
     set_homepage("https://github.com/KhronosGroup/Vulkan-Hpp/")
     set_description("Open-Source Vulkan C++ API")
     set_license("Apache-2.0")
@@ -8,14 +9,15 @@ package("vulkan-hpp")
     add_versions("v1.2.180", "bfa6d4765212505c8241a44b97dc5a9ce3aa2969")
     add_versions("v1.2.189", "58ff1da4c03f5f124eb835f41a9dd8fe3c2e8087")
     add_versions("v1.2.198", "d8c9f4f0eee6972622a1c3aabab5ed558d37c1c0")
+    add_versions("v1.3.231", "ef609a2f77dd1756e672712f264e76b64acdba61")
 
     add_deps("cmake")
 
     if is_plat("linux") then
-      add_extsources("pacman::vulkan-headers")
+        add_extsources("pacman::vulkan-headers")
     end
 
-    on_install("windows", "linux", "macosx", "mingw", function (package)
+    on_install("windows|x86", "windows|x64", "linux", "macosx", "mingw", function (package)
         local arch_prev
         if package:is_plat("mingw") and package.plat_set then
             arch_prev = package:arch()

packages/v/vulkan-loader/xmake.lua

@@ -5,12 +5,15 @@ 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.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")
     add_versions("1.2.154+1", "889e45f7175d915dd0d702013b8021192e181d20f2ad4021c94006088f1edfe5")
 
+    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean", readonly = true})
+
     if is_plat("linux") then
         add_extsources("apt::libvulkan-dev", "pacman::vulkan-icd-loader")
         add_deps("wayland", "libxrandr", "libxrender", "libxcb", "libxkbcommon")
@@ -20,7 +23,7 @@ package("vulkan-loader")
         local sdkver = package:version():split("%+")[1]
         package:add("deps", "vulkan-headers " .. sdkver)
         if not package.is_built or package:is_built() then
-            package:add("deps", "cmake", "ninja")
+            package:add("deps", "cmake")
         end
         if package:is_plat("macosx") then
             package:add("links", "vulkan")
@@ -38,29 +41,15 @@ package("vulkan-loader")
         end
     end)
 
-    on_install("windows", "linux", "macosx", function (package)
-        import("package.tools.cmake")
-        local envs = cmake.buildenvs(package, {cmake_generator = "Ninja"})
-        if package:is_plat("linux") then
-            local includes = {}
-            local linkdirs = {}
-            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)
-                end
-                for _, dir in ipairs(fetchinfo.linkdirs) do
-                    table.insert(linkdirs, dir)
-                end
-            end
-            envs.C_INCLUDE_PATH = (envs.C_INCLUDE_PATH or "") .. path.envsep() .. path.joinenv(table.unique(includes))
-            envs.LD_LIBRARY_PATH = (envs.LD_LIBRARY_PATH or "") .. path.envsep() .. path.joinenv(table.unique(linkdirs))
-        end
-
+    on_install("windows|x86", "windows|x64", "linux", "macosx", function (package)
         local configs = {"-DBUILD_TESTS=OFF"}
         local vulkan_headers = package:dep("vulkan-headers")
         table.insert(configs, "-DVULKAN_HEADERS_INSTALL_DIR=" .. vulkan_headers:installdir())
-        cmake.install(package, configs, {cmake_generator = "Ninja", envs = envs})
+        if package:is_plat("linux") then
+            import("package.tools.cmake").install(package, configs, {packagedeps = {"wayland", "libxrandr", "libxrender", "libxcb", "libxkbcommon"}})
+        else
+            import("package.tools.cmake").install(package, configs)
+        end
     end)
 
     on_test(function (package)

packages/v/vulkansdk/xmake.lua

@@ -4,7 +4,7 @@ package("vulkansdk")
     set_description("LunarG Vulkan® SDK")
 
     add_configs("shared", {description = "Build shared library.", default = true, type = "boolean", readonly = true})
-    add_configs("utils",  {description = "enabled vulkan utilities.", default = {}, type = "table"})
+    add_configs("utils",  {description = "Enabled vulkan utilities.", default = {}, type = "table"})
 
     on_load(function (package)
         import("detect.sdks.find_vulkansdk")