[vulkan-loader] Use upstream's actual commits.

microsoft · Oct 18, 2024 · 57ad898 · 57ad898
1 parent ec9c17c
commit 57ad898
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 166 deletions.
diff --git a/ports/vulkan-loader/0001-fix-comments-and-lib.patch b/ports/vulkan-loader/0001-fix-comments-and-lib.patch
diff --git a/ports/vulkan-loader/portfile.cmake b/ports/vulkan-loader/portfile.cmake
@@ -1,13 +1,26 @@
 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 535b7f324348e9edf44ff6a6a6e9eabe6e3a4bfad79bef789d1dc0cbbe3de36b6495a05236323d155631b081b89c18bb8668c79d1f735b59fc85ebee555aa682
     HEAD_REF main
     PATCHES
-        0001-fix-comments-and-lib.patch
+        "${ARM_COMMENT_SYNTAX_FIX}"
+        "${NINJA_CLANG_CL_WORKAROUND}"
 )
 
 vcpkg_find_acquire_program(PYTHON3)

diff --git a/versions/v-/vulkan-loader.json b/versions/v-/vulkan-loader.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "6ff5e777666c586b39164f3f74e08ac242febfaf",
+      "git-tree": "f96603152b3334e095d5e365effab5588f875000",
       "version": "1.3.296.0",
       "port-version": 0
     },