From 8a67c780178c1fe93dbb89a97fdbe4b95da3addb Mon Sep 17 00:00:00 2001 From: Sander Cox Date: Wed, 18 Jun 2025 00:24:24 +0200 Subject: [PATCH] [vulkan-*] Update to version 1.4.309.0 (#45844) --- .../lunarg-vulkantools/disable-qtdeploy.patch | 15 ++++++++++ ports/lunarg-vulkantools/portfile.cmake | 5 +++- ports/lunarg-vulkantools/vcpkg.json | 2 +- ports/spirv-cross/portfile.cmake | 2 +- ports/spirv-cross/vcpkg.json | 2 +- ports/spirv-headers/portfile.cmake | 2 +- ports/spirv-headers/vcpkg.json | 2 +- ports/spirv-reflect/portfile.cmake | 2 +- ports/spirv-reflect/vcpkg.json | 2 +- ports/spirv-tools/portfile.cmake | 7 ++--- ports/spirv-tools/vcpkg.json | 5 ++-- ports/volk/portfile.cmake | 2 +- ports/volk/vcpkg.json | 2 +- ports/vulkan-extensionlayer/portfile.cmake | 2 +- ports/vulkan-extensionlayer/vcpkg.json | 3 +- ports/vulkan-headers/fix-headers.patch | 13 --------- ports/vulkan-headers/portfile.cmake | 3 +- ports/vulkan-headers/vcpkg.json | 3 +- ports/vulkan-loader/portfile.cmake | 2 +- ports/vulkan-loader/vcpkg.json | 2 +- ports/vulkan-sdk-components/vcpkg.json | 2 +- ports/vulkan-tools/portfile.cmake | 2 +- ports/vulkan-tools/vcpkg.json | 2 +- ports/vulkan-utility-libraries/portfile.cmake | 2 +- ports/vulkan-utility-libraries/vcpkg.json | 2 +- ports/vulkan-validationlayers/portfile.cmake | 2 +- ports/vulkan-validationlayers/vcpkg.json | 2 +- scripts/ci.baseline.txt | 1 - versions/baseline.json | 28 +++++++++---------- versions/l-/lunarg-vulkantools.json | 5 ++++ versions/s-/spirv-cross.json | 5 ++++ versions/s-/spirv-headers.json | 5 ++++ versions/s-/spirv-reflect.json | 5 ++++ versions/s-/spirv-tools.json | 5 ++++ versions/v-/volk.json | 5 ++++ versions/v-/vulkan-extensionlayer.json | 5 ++++ versions/v-/vulkan-headers.json | 5 ++++ versions/v-/vulkan-loader.json | 5 ++++ versions/v-/vulkan-sdk-components.json | 5 ++++ versions/v-/vulkan-tools.json | 5 ++++ versions/v-/vulkan-utility-libraries.json | 5 ++++ versions/v-/vulkan-validationlayers.json | 5 ++++ 42 files changed, 126 insertions(+), 60 deletions(-) create mode 100644 ports/lunarg-vulkantools/disable-qtdeploy.patch delete mode 100644 ports/vulkan-headers/fix-headers.patch diff --git a/ports/lunarg-vulkantools/disable-qtdeploy.patch b/ports/lunarg-vulkantools/disable-qtdeploy.patch new file mode 100644 index 0000000000..9431cc0b88 --- /dev/null +++ b/ports/lunarg-vulkantools/disable-qtdeploy.patch @@ -0,0 +1,15 @@ +diff --git a/vkconfig_gui/CMakeLists.txt b/vkconfig_gui/CMakeLists.txt +index 2dbaabead..b9d836139 100644 +--- a/vkconfig_gui/CMakeLists.txt ++++ b/vkconfig_gui/CMakeLists.txt +@@ -59,8 +59,8 @@ endif() + get_filename_component(QT_BIN_DIR "${QMAKE_EXE}" DIRECTORY) + find_program(WINDEPLOYQT_EXE windeployqt HINTS "${QT_BIN_DIR}") + +- message(STATUS "Will run ${WINDEPLOYQT_EXE} at ${CMAKE_INSTALL_FULL_BINDIR}/vkconfig-gui.exe") +- install(CODE "execute_process(COMMAND ${WINDEPLOYQT_EXE} ${CMAKE_INSTALL_FULL_BINDIR}/vkconfig-gui.exe)") ++ # message(STATUS "Will run ${WINDEPLOYQT_EXE} at ${CMAKE_INSTALL_FULL_BINDIR}/vkconfig-gui.exe") ++ # install(CODE "execute_process(COMMAND ${WINDEPLOYQT_EXE} ${CMAKE_INSTALL_FULL_BINDIR}/vkconfig-gui.exe)") + endif() + else() + include(macOS/vkconfig.cmake) diff --git a/ports/lunarg-vulkantools/portfile.cmake b/ports/lunarg-vulkantools/portfile.cmake index a2d2f8e7d5..1d22a4cb9e 100644 --- a/ports/lunarg-vulkantools/portfile.cmake +++ b/ports/lunarg-vulkantools/portfile.cmake @@ -4,8 +4,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LunarG/VulkanTools REF "vulkan-sdk-${VERSION}" - SHA512 7548de6a8374d1be853308cd593583b970002ba673458ef84a62376f187d8453b2e433df7f08c78d0c675ce560c3d854db7efc764995b7cc3f54d57d8a80f565 + SHA512 c4d44f94e93234a5b5a98f3a76072d43b1c08b44dcf68a0bbbdc711e487b9e3b1be0fc8ab084b8d19662ac7394f25ec3ad2430fb2c79497d6e3e715c93d4f306 HEAD_REF main + PATCHES + disable-qtdeploy.patch ) vcpkg_replace_string("${SOURCE_PATH}/via/CMakeLists.txt" "jsoncpp_static" "JsonCpp::JsonCpp") @@ -18,6 +20,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DVULKAN_HEADERS_INSTALL_DIR=${CURRENT_INSTALLED_DIR} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON -DBUILD_TESTS:BOOL=OFF OPTIONS_RELEASE -DVULKAN_LOADER_INSTALL_DIR=${CURRENT_INSTALLED_DIR} diff --git a/ports/lunarg-vulkantools/vcpkg.json b/ports/lunarg-vulkantools/vcpkg.json index 47a4b8cbda..d08aa56367 100644 --- a/ports/lunarg-vulkantools/vcpkg.json +++ b/ports/lunarg-vulkantools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lunarg-vulkantools", - "version": "1.4.304.1", + "version": "1.4.309.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 index 35fd64daf2..6836eba6c3 100644 --- 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 589f1ce5c3eb8cf3be13214cff607beeb07d8e663366b8f75f59044656692c9c45ffd8db599c634fd8b76a268c1af6b4818eec5a7ea37b106b83a2c4ad0b623d + SHA512 7b3c68fb9c2a8ff665096d03291e0339b679f80cc190b626c94a072a515a702d1bf168a6e0c618795273570a8e5c29498c041b92beb860d931f000bc8c3bb72f HEAD_REF master ) diff --git a/ports/spirv-cross/vcpkg.json b/ports/spirv-cross/vcpkg.json index a3e48b4291..e2cbd5ecd0 100644 --- a/ports/spirv-cross/vcpkg.json +++ b/ports/spirv-cross/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-cross", - "version": "1.4.304.1", + "version": "1.4.309.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 index 6f8f5f08ba..2907a6b392 100644 --- 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 5d9210e32e4bad681951646857afa59698455618c79713eb5a98f785317ca2965b9640f1fce3e1ca6650e847a4a74688d12ebc2b5943f336df0163feea67acc2 + SHA512 545526940e5b42a53143732d6d00b61ee544f8137507f86b32230fb5110cf2cc8f3fc71d0b167e614ab2dd5faa1c4915965627146d519832d73f23ee6a2aa4bb HEAD_REF master ) diff --git a/ports/spirv-headers/vcpkg.json b/ports/spirv-headers/vcpkg.json index e23925d738..19600ea8bc 100644 --- a/ports/spirv-headers/vcpkg.json +++ b/ports/spirv-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-headers", - "version": "1.4.304.1", + "version": "1.4.309.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 index f0a744c86e..6562216552 100644 --- 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 d78dab3a5fcc25be15976b6d25cc77ebf93c920295015ca5cdd137079a5b6074d70c93af3e18c267253091168f75d5e7c7a1c0ec80c3e9d795a4bbecde0c306d + SHA512 d87ab91fd9b2ca6c86aaf72fd19332fb2d9eb7d5056480868ed79312fe111a3832099806d7a297fc82024683c8fe7ab96d7bec260f2828c111e535a85e288efb HEAD_REF main PATCHES export-targets.patch diff --git a/ports/spirv-reflect/vcpkg.json b/ports/spirv-reflect/vcpkg.json index d9f7bee4c6..8022a11501 100644 --- a/ports/spirv-reflect/vcpkg.json +++ b/ports/spirv-reflect/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-reflect", - "version": "1.4.304.1", + "version": "1.4.309.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 index 1331ab6935..b38bebf463 100644 --- 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 c393609b81e74dcf5d9889c2b34599611965353884aa474c11f8a2a815d3eac00f5b34c3a78aba9983b96cae651c6bd313654048100a4be3a35ccaf56a6cdc2d + SHA512 aa8163ad79eb5e60b8b373cbb49f1a140426f6346d5cb8e8a9aa2c72d6feaa528a9d690e0c52b44f3e4b2f60206050601441351f777752d6bf6c1b143f55589d PATCHES cmake-config-dir.diff spirv-tools-shared.diff @@ -43,10 +43,7 @@ if("tools" IN_LIST FEATURES) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/spirv-lesspipe.sh" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/spirv-lesspipe.sh") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/spirv-lesspipe.sh") - set(tools spirv-as spirv-cfg spirv-dis spirv-link spirv-lint spirv-opt spirv-val) - if(NOT VCPKG_TARGET_IS_IOS) - list(APPEND tools spirv-reduce) - endif() + set(tools spirv-as spirv-cfg spirv-dis spirv-link spirv-lint spirv-objdump spirv-opt spirv-reduce spirv-val) vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) endif() diff --git a/ports/spirv-tools/vcpkg.json b/ports/spirv-tools/vcpkg.json index 905e9982c6..d1f9db71c6 100644 --- a/ports/spirv-tools/vcpkg.json +++ b/ports/spirv-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-tools", - "version": "1.4.304.1", + "version": "1.4.309.0", "description": "API and commands for processing SPIR-V modules", "homepage": "https://github.com/KhronosGroup/SPIRV-Tools", "license": "Apache-2.0", @@ -17,7 +17,8 @@ ], "features": { "tools": { - "description": "Build tools." + "description": "Build tools.", + "supports": "!android & !ios" } } } diff --git a/ports/volk/portfile.cmake b/ports/volk/portfile.cmake index ff1907e6d3..a2685a0d22 100644 --- a/ports/volk/portfile.cmake +++ b/ports/volk/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/volk REF "vulkan-sdk-${VERSION}" - SHA512 fd3815c35e1c7f2d1e0d34f25a4411c3199b2994ec93bdc44b2d5b21803463b9cae34896a5f46eaa3ecece0dc6fe89a3bbd4b092b533ce81942a86a58f2017bc + SHA512 0be7705dfd643582fcd156972b69216e2f42bdf4cf42846a9ad21e5165cb38c0c1912d2786d4bfff8553c3b9b3664318e6efe9067ce1d73417539999434826cb HEAD_REF master ) diff --git a/ports/volk/vcpkg.json b/ports/volk/vcpkg.json index 92efde6ba5..7adc2c1bd1 100644 --- a/ports/volk/vcpkg.json +++ b/ports/volk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "volk", - "version": "1.4.304.1", + "version": "1.4.309.0", "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-extensionlayer/portfile.cmake b/ports/vulkan-extensionlayer/portfile.cmake index 770bb99b46..9119214aa9 100644 --- a/ports/vulkan-extensionlayer/portfile.cmake +++ b/ports/vulkan-extensionlayer/portfile.cmake @@ -7,7 +7,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-ExtensionLayer REF "vulkan-sdk-${VERSION}" - SHA512 50ab9bbd920e98ac74b54260e0fb1845f79b10fc16d8f13ac47998eaf4db5931d08a40999735157f39c1607cef4f35e2aa8eed3ee8dc3005bcf3ee08282d5b55 + SHA512 a58d52dfdb73624a739784bfcb5e775ba7318478d6844a09a3fbbf71d092e080664b3dbde2eba282c671286e2f925b3f70986a09d97784256b88de8cabb67d47 HEAD_REF main ) diff --git a/ports/vulkan-extensionlayer/vcpkg.json b/ports/vulkan-extensionlayer/vcpkg.json index a497c0d2aa..08dd0ecf2a 100644 --- a/ports/vulkan-extensionlayer/vcpkg.json +++ b/ports/vulkan-extensionlayer/vcpkg.json @@ -1,9 +1,10 @@ { "name": "vulkan-extensionlayer", - "version": "1.4.304.1", + "version": "1.4.309.0", "description": "Layer providing Vulkan features when native support is unavailable", "homepage": "https://github.com/KhronosGroup/Vulkan-ExtensionLayer", "license": "Apache-2.0", + "supports": "!static", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/vulkan-headers/fix-headers.patch b/ports/vulkan-headers/fix-headers.patch deleted file mode 100644 index 64101b91c8..0000000000 --- a/ports/vulkan-headers/fix-headers.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/vulkan/vulkan_handles.hpp b/include/vulkan/vulkan_handles.hpp -index 304e9ed..4fd23cf 100644 ---- a/include/vulkan/vulkan_handles.hpp -+++ b/include/vulkan/vulkan_handles.hpp -@@ -2085,6 +2085,8 @@ namespace VULKAN_HPP_NAMESPACE - class IndirectCommandsLayoutEXT; - class IndirectExecutionSetEXT; - -+ typedef void( VKAPI_PTR * PFN_VoidFunction )(); -+ - #ifndef VULKAN_HPP_NO_SMART_HANDLE - //====================== - //=== UNIQUE HANDLEs === diff --git a/ports/vulkan-headers/portfile.cmake b/ports/vulkan-headers/portfile.cmake index ee9d74cec6..77389b5839 100644 --- a/ports/vulkan-headers/portfile.cmake +++ b/ports/vulkan-headers/portfile.cmake @@ -2,9 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Headers REF "vulkan-sdk-${VERSION}" - SHA512 5cc23875fc4f548e6669936d290a05a09da36c2e6b73f1c904fa8b750a3bb695c7ef197ef9a0b788d1bb51021d4dd464f847fcec9909cb867618558b34fbcd6b + SHA512 1199344dcfe8c074926cffad6b921730ba46802d39e70d7acc23d8764549cf1070432215095b7305f7b61397d14a5e48966ced87f1a39b93d5992c1d8e97ba35 HEAD_REF main - PATCHES fix-headers.patch ) set(VCPKG_BUILD_TYPE release) # header-only port diff --git a/ports/vulkan-headers/vcpkg.json b/ports/vulkan-headers/vcpkg.json index d29ffd70d1..d594e35585 100644 --- a/ports/vulkan-headers/vcpkg.json +++ b/ports/vulkan-headers/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vulkan-headers", - "version": "1.4.304.1", - "port-version": 1, + "version": "1.4.309.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 index 338c85b1c8..313a382a78 100644 --- a/ports/vulkan-loader/portfile.cmake +++ b/ports/vulkan-loader/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Loader REF "vulkan-sdk-${VERSION}" - SHA512 974da8a010ed41eec465ef964f7c944f1d10c8a73f6b234da5b0ea341ff805de6bfa88643b2debb88f4d95752d9df144066cb5e10fcb0f9b1b5c0c7e233e0aad + SHA512 f77d42639037b79eeeba4007eded039527a345cd39ed1b6a3c5e786a418c481811a72c43cb24821268c7bc57c39941cfe5511e86362ac892c51d45a062dc0e2c HEAD_REF main ) diff --git a/ports/vulkan-loader/vcpkg.json b/ports/vulkan-loader/vcpkg.json index 9c4b2291b8..0e34492f6f 100644 --- a/ports/vulkan-loader/vcpkg.json +++ b/ports/vulkan-loader/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-loader", - "version": "1.4.304.1", + "version": "1.4.309.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 index 598eef4402..4832ac86e6 100644 --- 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.4.304.1", + "version": "1.4.309.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 index c26f442f91..dd82eda419 100644 --- 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 c6cee270573e0fd255fc012eeadf0433acb0640e86286c3c4ff0eac946b08abd3b65d503b3c87a797ad11ace6e3545939a18dfa117ab1cf4a488087eb12f808b + SHA512 ff505ba27556261103664b50ee88d26efdd040d7e0168ec0a37cdcebf421fbf75f73bdae55282c1e82b913491abd365a61edf95a5b917eb0b20abf6f60b89742 HEAD_REF main ) diff --git a/ports/vulkan-tools/vcpkg.json b/ports/vulkan-tools/vcpkg.json index 8e66a9acc6..94f81ffa55 100644 --- a/ports/vulkan-tools/vcpkg.json +++ b/ports/vulkan-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-tools", - "version": "1.4.304.1", + "version": "1.4.309.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 index a048f118a0..3d6240395f 100644 --- 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 580a25dad78b89b6ca5913b1023a06a0442c011fdbeb409e84e9bad20d869a4686088528f1f6f222bbcf78cb6365af09de2b6b9c88043b6b3a9e6928f1f77d62 + SHA512 9b875fecc295a45cdb8e6ff26345cf2b7df3959e2271e3f26546df3b415bf46a7bfd709ec482659fc86c35ff4314d7df482641f4c2e82e1b03f4c7ffc26d2a64 HEAD_REF main ) diff --git a/ports/vulkan-utility-libraries/vcpkg.json b/ports/vulkan-utility-libraries/vcpkg.json index 3e37ac4dcc..b8134dec30 100644 --- a/ports/vulkan-utility-libraries/vcpkg.json +++ b/ports/vulkan-utility-libraries/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-utility-libraries", - "version": "1.4.304.1", + "version": "1.4.309.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 index 2fb8ca2cdc..135298ab74 100644 --- 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 1f5f5ad537c56d8790b3f8ff87fb8ce145d83771832b2d03aa11dd2b4db2757bed3a9b5e41b3328ac13d6d296a6915a5cce256b8ae03db8b1ee006beab1d36c1 + SHA512 453fb519e2b4e035e82f9e372e235e6870eff7e32938fc903a3ee35354f4a535393f9f45264518e8ff5113ce3d59450668253b8d9b833c6f0669b7a1373cb7cc HEAD_REF main ) diff --git a/ports/vulkan-validationlayers/vcpkg.json b/ports/vulkan-validationlayers/vcpkg.json index 01a10f8e87..5d353d682b 100644 --- a/ports/vulkan-validationlayers/vcpkg.json +++ b/ports/vulkan-validationlayers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-validationlayers", - "version": "1.4.304.1", + "version": "1.4.309.0", "description": "Vulkan Validation Layers (VVL)", "homepage": "https://github.com/KhronosGroup/Vulkan-ValidationLayers", "license": null, diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2d778f48d5..980035bbe0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1053,7 +1053,6 @@ vowpal-wabbit:x64-android=fail # vst3sdk CMake files work only with the GUI version of Xcode vst3sdk:arm64-osx=fail vst3sdk:x64-osx=fail -vulkan-extensionlayer:x64-windows-static=fail vulkan-validationlayers:x64-windows-release=fail # VS2022 17.14.0 ICEs vulkan-validationlayers:x64-windows-static-md=fail vulkan-validationlayers:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index 849629cf34..f18fbce4f9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5893,7 +5893,7 @@ "port-version": 1 }, "lunarg-vulkantools": { - "baseline": "1.4.304.1", + "baseline": "1.4.309.0", "port-version": 0 }, "lunasvg": { @@ -8965,19 +8965,19 @@ "port-version": 4 }, "spirv-cross": { - "baseline": "1.4.304.1", + "baseline": "1.4.309.0", "port-version": 0 }, "spirv-headers": { - "baseline": "1.4.304.1", + "baseline": "1.4.309.0", "port-version": 0 }, "spirv-reflect": { - "baseline": "1.4.304.1", + "baseline": "1.4.309.0", "port-version": 0 }, "spirv-tools": { - "baseline": "1.4.304.1", + "baseline": "1.4.309.0", "port-version": 0 }, "spout2": { @@ -9941,7 +9941,7 @@ "port-version": 0 }, "volk": { - "baseline": "1.4.304.1", + "baseline": "1.4.309.0", "port-version": 0 }, "voro": { @@ -9989,19 +9989,19 @@ "port-version": 0 }, "vulkan-extensionlayer": { - "baseline": "1.4.304.1", + "baseline": "1.4.309.0", "port-version": 0 }, "vulkan-headers": { - "baseline": "1.4.304.1", - "port-version": 1 + "baseline": "1.4.309.0", + "port-version": 0 }, "vulkan-hpp": { "baseline": "deprecated", "port-version": 0 }, "vulkan-loader": { - "baseline": "1.4.304.1", + "baseline": "1.4.309.0", "port-version": 0 }, "vulkan-memory-allocator": { @@ -10013,19 +10013,19 @@ "port-version": 1 }, "vulkan-sdk-components": { - "baseline": "1.4.304.1", + "baseline": "1.4.309.0", "port-version": 0 }, "vulkan-tools": { - "baseline": "1.4.304.1", + "baseline": "1.4.309.0", "port-version": 0 }, "vulkan-utility-libraries": { - "baseline": "1.4.304.1", + "baseline": "1.4.309.0", "port-version": 0 }, "vulkan-validationlayers": { - "baseline": "1.4.304.1", + "baseline": "1.4.309.0", "port-version": 0 }, "vvenc": { diff --git a/versions/l-/lunarg-vulkantools.json b/versions/l-/lunarg-vulkantools.json index 5687385cac..cd0005db4d 100644 --- a/versions/l-/lunarg-vulkantools.json +++ b/versions/l-/lunarg-vulkantools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e556ea3035f1822d6af25c004bf5991b6ea472e1", + "version": "1.4.309.0", + "port-version": 0 + }, { "git-tree": "75aa88dc6358874f72ff9bc08aa21aa7e623ef25", "version": "1.4.304.1", diff --git a/versions/s-/spirv-cross.json b/versions/s-/spirv-cross.json index 57d22677fb..253ae896ad 100644 --- a/versions/s-/spirv-cross.json +++ b/versions/s-/spirv-cross.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3246574c039c7c7b5c1fc8c4f5ba6aac45e3f4ab", + "version": "1.4.309.0", + "port-version": 0 + }, { "git-tree": "44a3b11f8f83ad81b0d8e2a4744fce0beb1d3093", "version": "1.4.304.1", diff --git a/versions/s-/spirv-headers.json b/versions/s-/spirv-headers.json index eb5b8c771d..e68c00edd3 100644 --- a/versions/s-/spirv-headers.json +++ b/versions/s-/spirv-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a41db95cf3e45fc0db319e8fe55d8866ce5d9924", + "version": "1.4.309.0", + "port-version": 0 + }, { "git-tree": "31e7088416b817e44b57cab3a368a94e25a8a223", "version": "1.4.304.1", diff --git a/versions/s-/spirv-reflect.json b/versions/s-/spirv-reflect.json index 1f010f7d15..5d1322fdae 100644 --- a/versions/s-/spirv-reflect.json +++ b/versions/s-/spirv-reflect.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bad0b3d0a4517898ddbe6c0295b096a7f48680a", + "version": "1.4.309.0", + "port-version": 0 + }, { "git-tree": "22e0940af8ec667e303f4a23a9e92e45e8f38998", "version": "1.4.304.1", diff --git a/versions/s-/spirv-tools.json b/versions/s-/spirv-tools.json index d4eea8c841..02f5af439c 100644 --- a/versions/s-/spirv-tools.json +++ b/versions/s-/spirv-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc4dbd60fdf45319d659f2465b7f34c596395f94", + "version": "1.4.309.0", + "port-version": 0 + }, { "git-tree": "04cccd11f516a8d7ec9645d5b79202b92867a4db", "version": "1.4.304.1", diff --git a/versions/v-/volk.json b/versions/v-/volk.json index 9fb0c40abb..a6e6dd479c 100644 --- a/versions/v-/volk.json +++ b/versions/v-/volk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f038baf96536e3865f387943f07900527936699f", + "version": "1.4.309.0", + "port-version": 0 + }, { "git-tree": "f8679a3152361fb2851d7b30212592bd05e7d570", "version": "1.4.304.1", diff --git a/versions/v-/vulkan-extensionlayer.json b/versions/v-/vulkan-extensionlayer.json index 5aa77fdc01..453e6fa1cc 100644 --- a/versions/v-/vulkan-extensionlayer.json +++ b/versions/v-/vulkan-extensionlayer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "726011480060e48c4b9fe13e9a20fc09704ceab3", + "version": "1.4.309.0", + "port-version": 0 + }, { "git-tree": "676bed9bd226f397730c88fee681dd30a30c11ac", "version": "1.4.304.1", diff --git a/versions/v-/vulkan-headers.json b/versions/v-/vulkan-headers.json index 4931420e1c..35331fc80a 100644 --- a/versions/v-/vulkan-headers.json +++ b/versions/v-/vulkan-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7d36ff535cf43f24afaec43d86ca5b9145456bb", + "version": "1.4.309.0", + "port-version": 0 + }, { "git-tree": "fcdf63adddcd20343e1847def6d582642dc88bb9", "version": "1.4.304.1", diff --git a/versions/v-/vulkan-loader.json b/versions/v-/vulkan-loader.json index 3e864c0b6e..8d1d94765e 100644 --- a/versions/v-/vulkan-loader.json +++ b/versions/v-/vulkan-loader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afb73e0a27223a20bf5b3e59e2bae972a8c3a645", + "version": "1.4.309.0", + "port-version": 0 + }, { "git-tree": "289901bb5f8c0556eff1349905adefde912ee81d", "version": "1.4.304.1", diff --git a/versions/v-/vulkan-sdk-components.json b/versions/v-/vulkan-sdk-components.json index 0082e925eb..e1ababcf2b 100644 --- a/versions/v-/vulkan-sdk-components.json +++ b/versions/v-/vulkan-sdk-components.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65c6b3463b44db7c0e7c39c23872fd6418e1a642", + "version": "1.4.309.0", + "port-version": 0 + }, { "git-tree": "92503841c53d219338ae0e1a0dcc47b352aeb3ef", "version": "1.4.304.1", diff --git a/versions/v-/vulkan-tools.json b/versions/v-/vulkan-tools.json index 2122d7922f..b74b32ec5d 100644 --- a/versions/v-/vulkan-tools.json +++ b/versions/v-/vulkan-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "074f1241bbbc7049eb2549053c92d2e9d8e727c3", + "version": "1.4.309.0", + "port-version": 0 + }, { "git-tree": "84263056b8c36ca13fd5c7dd33e0aa0887308769", "version": "1.4.304.1", diff --git a/versions/v-/vulkan-utility-libraries.json b/versions/v-/vulkan-utility-libraries.json index d45068452f..1617c43b9a 100644 --- a/versions/v-/vulkan-utility-libraries.json +++ b/versions/v-/vulkan-utility-libraries.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "964a4f5e9c2e9f21f9b817c03bad37a50bf07c3e", + "version": "1.4.309.0", + "port-version": 0 + }, { "git-tree": "cc0589e07fd2c856fe66976411227d67f98e51ec", "version": "1.4.304.1", diff --git a/versions/v-/vulkan-validationlayers.json b/versions/v-/vulkan-validationlayers.json index 69ca5bd858..dad1968583 100644 --- a/versions/v-/vulkan-validationlayers.json +++ b/versions/v-/vulkan-validationlayers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67c2d8e4b781d617803afb86c11f5d7953dafd71", + "version": "1.4.309.0", + "port-version": 0 + }, { "git-tree": "5d4278e88716efb2b09d51f8abcf6e971624cec0", "version": "1.4.304.1",