[vulkan-sdk-*] Update to 1.3.296 (microsoft#41586)

myd7349 · Oct 19, 2024 · d567b66 · d567b66
1 parent b4f2e2b
commit d567b66
Show file tree

Hide file tree

Showing 40 changed files with 123 additions and 100 deletions.
diff --git a/ports/glslang/0001-Fix-glslangValidator-installation.patch b/ports/glslang/0001-Fix-glslangValidator-installation.patch
diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake
@@ -4,10 +4,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/glslang
     REF "${VERSION}"
-    SHA512 ce6d09cc4d98b01d162ec5a196eec017c4a5f25eaf98c6612695d911f8d136c2f7193ff8f2c07931b2e94182d2c654833adc3b645f0c225e1d07c4e6e7abfd76
+    SHA512 b246c6f280891b7c9b6cd0b5e85e03ccf1fe173cdfc40e566339a5698176cbcfe23eb7aeaba277f071222d76b9f2a00376d790d4d604aedad82e6196fab7fc70
     HEAD_REF master
-    PATCHES
-        0001-Fix-glslangValidator-installation.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "glslang",
-  "version": "14.3.0",
+  "version": "15.0.0",
   "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.",
   "homepage": "https://github.com/KhronosGroup/glslang",
   "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later",

diff --git a/ports/lunarg-vulkantools/portfile.cmake b/ports/lunarg-vulkantools/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO LunarG/VulkanTools
     REF "vulkan-sdk-${VERSION}"
-    SHA512 6F5081BDA20BDC79CCA89E515B5DA902884562460312FCAE6FDF4DB8029D00401B445E96BD37DA05EA8FB0CC169DE93E2821550DAC90C49CE2EBD7489593F256
+    SHA512 2d1f5d91aa79b206640e65bba2dadfe881524e9a5e1694df5092e6d59d00f06cd981bd026c0c12528f6b243da7564be98211ce6f6538bd1fd51698f91aa24d47
     HEAD_REF main
 )
 

diff --git a/ports/lunarg-vulkantools/vcpkg.json b/ports/lunarg-vulkantools/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "lunarg-vulkantools",
-  "version": "1.3.290.0",
+  "version": "1.3.296.0",
   "description": "Tools to aid in Vulkan development",
   "homepage": "https://github.com/LunarG/VulkanTools",
   "license": null,

diff --git a/ports/spirv-cross/portfile.cmake b/ports/spirv-cross/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/SPIRV-Cross
     REF vulkan-sdk-${VERSION}
-    SHA512 923ba1564aee36bc6ebd61ee30ec43d61dbc28c23b172fa9a81688f1ca899a950e221a8b07134ccef14c6d5818c0f0fc33a53b8e38f28a956e1119b3974825e7
+    SHA512 943453df60744fe32123df7e366b27d30d57947b22bf7c087090e70f398305b37a47826abc60cdf912f0240c4ff3190e9d0f03d1d4e85f73c13b8a6196611640
     HEAD_REF master
 )
 

diff --git a/ports/spirv-cross/vcpkg.json b/ports/spirv-cross/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "spirv-cross",
-  "version": "1.3.290.0",
+  "version": "1.3.296.0",
   "description": "SPIRV-Cross is a practical tool and library for performing reflection on SPIR-V and disassembling SPIR-V back to high level languages.",
   "homepage": "https://github.com/KhronosGroup/SPIRV-Cross",
   "dependencies": [

diff --git a/ports/spirv-headers/portfile.cmake b/ports/spirv-headers/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/SPIRV-Headers
     REF "vulkan-sdk-${VERSION}"
-    SHA512 d3328cd4ddf87d075afacfb7ada01dbd16a3ff39b831e9ebe4ce3c32af0ff0c8822811b0e0d273a54b4acaba29b63b099efcf0150424bd9074d24d04a9974d89
+    SHA512 b4f975d3051eda41ef5c3a6efc832607a165adfd6f43d7af171d2c0446b227bdcb5de0017a081fa9e7a3d2710ba8583fadbc06c0a364043b2778b02818d01040
     HEAD_REF master
 )
 

diff --git a/ports/spirv-headers/vcpkg.json b/ports/spirv-headers/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "spirv-headers",
-  "version": "1.3.290.0",
+  "version": "1.3.296.0",
   "description": "Machine-readable files for the SPIR-V Registry",
   "homepage": "https://github.com/KhronosGroup/SPIRV-Headers",
   "dependencies": [

diff --git a/ports/spirv-reflect/portfile.cmake b/ports/spirv-reflect/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/SPIRV-Reflect
     REF "vulkan-sdk-${VERSION}"
-    SHA512 5de92dbd04424fb09f6c2a4c890572b2789017b737822d5bc8ab713aeede0796cdcc7ffe74e3ffe25cdd4c626e94bd60757e1cc625ede02b8fe3994b07588b44
+    SHA512 770d46172fed140816dcecc3155bce62ce319f5cbe99bb58e81994e07aed14ebc8f65675c6e47dde2148e2706603ba470f364ab41bcbfbc05c69e25be7c5a898
     HEAD_REF main
     PATCHES
         export-targets.patch

diff --git a/ports/spirv-reflect/vcpkg.json b/ports/spirv-reflect/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "spirv-reflect",
-  "version": "1.3.290.0",
+  "version": "1.3.296.0",
   "description": "SPIRV-Reflect is a lightweight library that provides a C/C++ reflection API for SPIR-V shader bytecode in Vulkan applications.",
   "homepage": "https://github.com/KhronosGroup/SPIRV-Reflect",
   "license": "Apache-2.0",

diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/SPIRV-Tools
     REF "vulkan-sdk-${VERSION}"
-    SHA512 d4e8440c0843fb084dde4a576b95442783ab8204670b199798bd87f754d77f3c258bb69ab1d4dd7859c1d2c681ed8813309c76c6f70b5a7d8d21b6a48ef63b67
+    SHA512 62f0a6034bd016aedfb8975bbd3bb134ef928bd6bafbb61d9f73c46760019597b9841b80243c86e5e5e0576824cd20255067e447590eb0d2d51593439152215e
     PATCHES
         cmake-config-dir.diff
         spirv-tools-shared.diff

diff --git a/ports/spirv-tools/vcpkg.json b/ports/spirv-tools/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "spirv-tools",
-  "version": "1.3.290.0",
+  "version": "1.3.296.0",
   "description": "API and commands for processing SPIR-V modules",
   "homepage": "https://github.com/KhronosGroup/SPIRV-Tools",
   "license": "Apache-2.0",

diff --git a/ports/volk/portfile.cmake b/ports/volk/portfile.cmake
@@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zeux/volk
-    REF "${VERSION}"
-    SHA512 1e0b05f0a7aa9e185b4b7ef42d53c1a23ccb8511cd3c2821e8976c11130ea196a24612ca18319fc2c0ac99bc2b1d334fc62ea9863f45800007b9bc92978da665
+    REF "vulkan-sdk-${VERSION}"
+    SHA512 bc57ab2d0408fba6d66c91eb477392e217ec5b4185db1191c9ed7750f3773c513674b0bb4f3378a0ee38038d0447aa868ca79842192c6060a6e8b33ca81552f0
     HEAD_REF master
 )
 

diff --git a/ports/volk/vcpkg.json b/ports/volk/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "volk",
-  "version": "1.3.295",
+  "version": "1.3.296",
   "description": [
     "Meta loader for Vulkan API.",
     "Note that the static library target volk::volk is built without platform-specific defines.",

diff --git a/ports/vulkan-headers/portfile.cmake b/ports/vulkan-headers/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/Vulkan-Headers
     REF "vulkan-sdk-${VERSION}"
-    SHA512 2bba1b9f3b97e22066ad89bce48a999dd253baf47ed3c76575777e7fc03199c67b1f8b301c1e152eaf4ce63351af9901bcea3a34f2d8cdcea81c25648bfb4706
+    SHA512 475cd0c3249c7998e5e85390651a6652e229d65e42adf3b4d18f9f7509037d217e87de01632c9b4142d26ab295cd2272c2e88f897a5420d693a82ff7e4003157
     HEAD_REF main
 )
 

diff --git a/ports/vulkan-headers/vcpkg.json b/ports/vulkan-headers/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "vulkan-headers",
-  "version": "1.3.290.0",
-  "port-version": 1,
+  "version": "1.3.296.0",
   "description": "Vulkan header files and API registry",
   "homepage": "https://github.com/KhronosGroup/Vulkan-Headers",
   "license": "Apache-2.0 OR MIT",

diff --git a/ports/vulkan-loader/portfile.cmake b/ports/vulkan-loader/portfile.cmake
@@ -1,17 +1,35 @@
 set(VCPKG_LIBRARY_LINKAGE dynamic)
 
+vcpkg_download_distfile(ARM_COMMENT_SYNTAX_FIX
+  URLS https://github.com/KhronosGroup/Vulkan-Loader/commit/ce3a4db90513c2dd10fbe56a21207945fbc9339f.patch?full_index=1
+  SHA512 e08d0be965f2430a5353a30339e1c29e5074d5b751f7894bdfec8c2031916b0e4d39fff1dad0e5ec94e4f2f296fac230dbfcb9a04af4b2d1ad51dffe270d232a
+  FILENAME vulkan-loader-arm-comment-syntax-ce3a4db90513c2dd10fbe56a21207945fbc9339f.patch
+)
+
+vcpkg_download_distfile(NINJA_CLANG_CL_WORKAROUND
+  URLS https://github.com/KhronosGroup/Vulkan-Loader/commit/4b043de5655d41cee12ef73d986cb7f7a7dbc239.patch?full_index=1
+  SHA512 327ce23dc1a4e68ef31a02e9847c7aa740f0a81cd62d3fecf5e7efd84149909f2377e031064346ecb6aa2c5ec094413627a3f4b34c674d8713fc1ca01f88fc22
+  FILENAME vulkan-loader-clang-cl-workaround-4b043de5655d41cee12ef73d986cb7f7a7dbc239.patch
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/Vulkan-Loader
     REF "vulkan-sdk-${VERSION}"
-    SHA512 42ecf05e498f6422cea9d6ef70df5a936536524c1ff4d8cb391b5c55dd409082a6b2fc2eee5b395306c782ca32a7344faceef3e5385b382fb5a7e6564cfce4b5
+    SHA512 535b7f324348e9edf44ff6a6a6e9eabe6e3a4bfad79bef789d1dc0cbbe3de36b6495a05236323d155631b081b89c18bb8668c79d1f735b59fc85ebee555aa682
     HEAD_REF main
+    PATCHES
+        "${ARM_COMMENT_SYNTAX_FIX}"
+        "${NINJA_CLANG_CL_WORKAROUND}"
 )
 
+vcpkg_find_acquire_program(PYTHON3)
+
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
   OPTIONS
     -DBUILD_TESTS:BOOL=OFF
+    -DPython3_EXECUTABLE=${PYTHON3}
 )
 vcpkg_cmake_install()
 vcpkg_fixup_pkgconfig()

diff --git a/ports/vulkan-loader/vcpkg.json b/ports/vulkan-loader/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vulkan-loader",
-  "version": "1.3.290.0",
+  "version": "1.3.296.0",
   "description": "Vulkan Development Tools",
   "homepage": "https://github.com/KhronosGroup/Vulkan-Loader",
   "license": null,

diff --git a/ports/vulkan-sdk-components/vcpkg.json b/ports/vulkan-sdk-components/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "$comment": "Dependencies extracted from e.g. https://sdk.lunarg.com/sdk/download/1.3.290.0/windows/config.json",
   "name": "vulkan-sdk-components",
-  "version": "1.3.290.0",
+  "version": "1.3.296.0",
   "description": "Installs packages which are part of the Vulkan SDK.",
   "license": null,
   "supports": "!uwp & !xbox",

diff --git a/ports/vulkan-tools/portfile.cmake b/ports/vulkan-tools/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/Vulkan-Tools
     REF "vulkan-sdk-${VERSION}"
-    SHA512 e5f6daa12ba2e8098f939cc06e732efd89f616fd9babf00d2fb8b9a73671143961a4c5b84879a4f9c4a7312bb393874f065222602e3619db5ad7fb9f8b868422
+    SHA512 66bc89272f150198cd52f2971ad67a2fd6c922ac4bafb420c0d54788ca6bab2246e8a153a09eccce15a87e1fe16fdeef16af1c6b6b13386bff79dd73858f3cae
     HEAD_REF main
     PATCHES
         fix-parallel-config.patch

diff --git a/ports/vulkan-tools/vcpkg.json b/ports/vulkan-tools/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vulkan-tools",
-  "version": "1.3.290.0",
+  "version": "1.3.296.0",
   "description": "Vulkan Development Tools",
   "homepage": "https://github.com/KhronosGroup/Vulkan-Tools",
   "license": "Apache-2.0",

diff --git a/ports/vulkan-utility-libraries/portfile.cmake b/ports/vulkan-utility-libraries/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/Vulkan-Utility-Libraries
     REF "vulkan-sdk-${VERSION}"
-    SHA512 73637d7fb511aa00b267d415e4bef780f8b3ffc206a6da4c3447472fbb3e358de6c1ea15601e4c951b6bfb49b736c2449d58dd257f2870388b5b3f9fd396dc62
+    SHA512 03466c78fbd43461990014a02deb06d2c4668c6230f336d3d9710e93aefa56d0ffadf959892c6d85c409088705e8ecf5fdd0a037b99af767b832f17fe4a44454
     HEAD_REF main
 )
 

diff --git a/ports/vulkan-utility-libraries/vcpkg.json b/ports/vulkan-utility-libraries/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vulkan-utility-libraries",
-  "version": "1.3.290.0",
+  "version": "1.3.296.0",
   "description": "Utility libraries for Vulkan developers",
   "homepage": "https://github.com/KhronosGroup/Vulkan-Utility-Libraries",
   "license": null,

diff --git a/ports/vulkan-validationlayers/portfile.cmake b/ports/vulkan-validationlayers/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KhronosGroup/Vulkan-ValidationLayers
     REF "vulkan-sdk-${VERSION}"
-    SHA512 9f1d512b4bafbcef586789e933f903c383bbb9644d0a978a390da16e03ee2395c39c9c7b622e437e1c74880409df0a3cfc3a44b066cc0efeaee8d1edb9349d26
+    SHA512 457edee35a347456391c9b36bdf5d457f05210b6a8889d0623498582d3385bed474fbd7dae66406d20f70d96238ca752414eaa844b86b431ec7f8cf721d46d08
     HEAD_REF main
 )
 

diff --git a/ports/vulkan-validationlayers/vcpkg.json b/ports/vulkan-validationlayers/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vulkan-validationlayers",
-  "version": "1.3.290.0",
+  "version": "1.3.296.0",
   "description": "Vulkan Validation Layers (VVL)",
   "homepage": "https://github.com/KhronosGroup/Vulkan-ValidationLayers",
   "license": null,

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3157,7 +3157,7 @@
       "port-version": 3
     },
     "glslang": {
-      "baseline": "14.3.0",
+      "baseline": "15.0.0",
       "port-version": 0
     },
     "glui": {
@@ -5633,7 +5633,7 @@
       "port-version": 1
     },
     "lunarg-vulkantools": {
-      "baseline": "1.3.290.0",
+      "baseline": "1.3.296.0",
       "port-version": 0
     },
     "lunasvg": {
@@ -8533,19 +8533,19 @@
       "port-version": 4
     },
     "spirv-cross": {
-      "baseline": "1.3.290.0",
+      "baseline": "1.3.296.0",
       "port-version": 0
     },
     "spirv-headers": {
-      "baseline": "1.3.290.0",
+      "baseline": "1.3.296.0",
       "port-version": 0
     },
     "spirv-reflect": {
-      "baseline": "1.3.290.0",
+      "baseline": "1.3.296.0",
       "port-version": 0
     },
     "spirv-tools": {
-      "baseline": "1.3.290.0",
+      "baseline": "1.3.296.0",
       "port-version": 0
     },
     "spout2": {
@@ -9405,7 +9405,7 @@
       "port-version": 0
     },
     "volk": {
-      "baseline": "1.3.295",
+      "baseline": "1.3.296",
       "port-version": 0
     },
     "vowpal-wabbit": {
@@ -9445,15 +9445,15 @@
       "port-version": 0
     },
     "vulkan-headers": {
-      "baseline": "1.3.290.0",
-      "port-version": 1
+      "baseline": "1.3.296.0",
+      "port-version": 0
     },
     "vulkan-hpp": {
       "baseline": "deprecated",
       "port-version": 0
     },
     "vulkan-loader": {
-      "baseline": "1.3.290.0",
+      "baseline": "1.3.296.0",
       "port-version": 0
     },
     "vulkan-memory-allocator": {
@@ -9465,19 +9465,19 @@
       "port-version": 0
     },
     "vulkan-sdk-components": {
-      "baseline": "1.3.290.0",
+      "baseline": "1.3.296.0",
       "port-version": 0
     },
     "vulkan-tools": {
-      "baseline": "1.3.290.0",
+      "baseline": "1.3.296.0",
       "port-version": 0
     },
     "vulkan-utility-libraries": {
-      "baseline": "1.3.290.0",
+      "baseline": "1.3.296.0",
       "port-version": 0
     },
     "vulkan-validationlayers": {
-      "baseline": "1.3.290.0",
+      "baseline": "1.3.296.0",
       "port-version": 0
     },
     "vvenc": {