Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[vulkan*] update to 1.3.275.0 (#36262) 

* [vulkan*] update to 1.3.275.0

* fix cmake config path

* update volk to fix vulkan-tools

* fix lunarg-vulkantools

* fix android

* build vulkan layers always dynamic

* fix android

* staticcrt

* fix description

* remove debug layer json files

* fix android

* fix parallel config
This commit is contained in:
moritz-h 2024-01-24 20:26:41 +01:00 committed by GitHub
parent dd4b1504d7
commit 5d03478623
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
37 changed files with 135 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/lunarg-vulkantools/portfile.cmake
View File

@ -1,8 +1,10 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LunarG/VulkanTools
REF "vulkan-sdk-${VERSION}"
SHA512 83be64eccb2841de4ae67f3936b6dd4433cdbd2b604329914a8bc43c1f7fc6dd2dba0eaf2f9527b231c6d54d3d390d79defc6de228baff5cba1add8c5ad6d9cd
SHA512 fcaa25375caad32800dbf015672bb9cb23ad90469fc63a259e43789bbe82e460d94f0d8e87f8bc4b624974dc2511af19e04da763483aea1cf34e6f78818b2383
HEAD_REF main
)
@ -25,13 +27,11 @@ vcpkg_cmake_configure(
)
vcpkg_cmake_install()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
vcpkg_copy_tools(TOOL_NAMES vkvia vkconfig AUTO_CLEAN )
if(VCPKG_TARGET_IS_WINDOWS)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
endif()
set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

8
ports/lunarg-vulkantools/vcpkg.json
View File

@ -1,10 +1,10 @@
{
"name": "lunarg-vulkantools",
"version": "1.3.268.0",
"description": "Vulkan header files and API registry",
"homepage": "https://github.com/KhronosGroup/Vulkan-Headers",
"version": "1.3.275.0",
"description": "Tools to aid in Vulkan development",
"homepage": "https://github.com/LunarG/VulkanTools",
"license": null,
"supports": "!osx",
"supports": "!osx & !staticcrt",
"dependencies": [
"jsoncpp",
"qt5-base",

2
ports/spirv-cross/portfile.cmake
View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Cross
REF vulkan-sdk-${VERSION}
SHA512 27cf3c1455c0edeba0a494ef7c8f23d3b22e3427ac7ce0681d3c15c8f1510cf449054a98793e6d3f3bbe7c6ef92f0203bb50b93f806e02676727a2cf38233547
SHA512 970b4903af87aa4b8258b29d9c998931c1a7cd59ef7ddd13ffa75bcbb5fb7ca2040544aa87b7b13364920706313743574a9761ba10d2d596ffdad41576cac2c1
HEAD_REF master
)

2
ports/spirv-cross/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "spirv-cross",
"version": "1.3.268.0",
"version": "1.3.275.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": [

2
ports/spirv-headers/portfile.cmake
View File

@ -3,7 +3,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Headers
REF "vulkan-sdk-${VERSION}"
SHA512 3500c299a51dacc3e89066cfcfa8762cb6bc1be10ffff492fb3041831627e065cd836e3e0165df750dd22873a1772d916158e1e1c4701dc60efbb2edb17753ca
SHA512 c9d448a74006a5fdf59993e6d6a9c617bab4c5df23c333b7ada386e4ca25caaae28fc83f71963ce8468646113d83d6e7b17c26c46c3b6485c8df91f142755977
HEAD_REF master
)

2
ports/spirv-headers/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "spirv-headers",
"version": "1.3.268.0",
"version": "1.3.275.0",
"description": "Machine-readable files for the SPIR-V Registry",
"homepage": "https://github.com/KhronosGroup/SPIRV-Headers",
"dependencies": [

2
ports/spirv-reflect/portfile.cmake
View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Reflect
REF "vulkan-sdk-${VERSION}"
SHA512 fdc6d6fe707d21296c5c0a84388e8b9c687945264fb602e286e5ba399ac674e68bc89b25f4bb0a3fc4d59deb2dafe5fbe3e07b59162c420c25c9e923f3220849
SHA512 9bfcc88d541a4e96b22408b9c37be223ffe7010eb54c3f3c9091872311b34e52000ce31d165d3914bfabf7f9c1d5f0fa85fac9038271296a4fceb6d1a6b99030
HEAD_REF master
)

2
ports/spirv-reflect/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "spirv-reflect",
"version": "1.3.268.0",
"version": "1.3.275.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",

2
ports/spirv-tools/portfile.cmake
View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Tools
REF "vulkan-sdk-${VERSION}"
SHA512 317ce91ae229efddb98028840fbb6c9000c6a09aace2f04c2f59fdeb3a73b8fdb75048bf5a2189135a734a30b1ead57dc7dc5fcfd70a7267d17c743238a19899
SHA512 f17692509ecfbd753a853eaa01d559c06b06fa15b287971da814044418da71a94813606acfe536fa519e8aeba92bdfc80971acb749dab6e7cc395773c4f05693
PATCHES
cmake-config-dir.diff
spirv-tools-shared.diff

2
ports/spirv-tools/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "spirv-tools",
"version": "1.3.268.0",
"version": "1.3.275.0",
"description": "API and commands for processing SPIR-V modules",
"homepage": "https://github.com/KhronosGroup/SPIRV-Tools",
"license": "Apache-2.0",

4
ports/volk/portfile.cmake
View File

@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zeux/volk
REF "${VERSION}"
SHA512 a273ecbd68ade7677bd4cc2cf32d0f728ac959ad48c506beff413dc7e6b11b1d5f74ee1d213a71f1452980b291d6ef41ad8e3a4a0c4e6839e9918594d1f98715
REF "vulkan-sdk-${VERSION}"
SHA512 5c61448c93171917c55a9fc50f102a2d52165a150eb0c3cfd31e41a32e38c673b597888b82685f3bb1e23883f7218e8ae6326f08c4c257ebddd42b0492bdf466
HEAD_REF master
)

2
ports/volk/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "volk",
"version": "1.3.250",
"version": "1.3.275.0",
"description": [
"Meta loader for Vulkan API.",
"Note that the static library target volk::volk is built without platform-specific defines.",

2
ports/vulkan-headers/portfile.cmake
View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-Headers
REF "vulkan-sdk-${VERSION}"
SHA512 adab4c97050aeb396445cd5352e4252b74d2a02856ffd369caa0df50ba544b8b8ab9e1630f30ce73c56751c987e2435263214547457b8ca9430c5ad2dadaabaf
SHA512 e4ceb5d5d4e66bb683fb1c4ce97edeb559f833d391b75e1b095ee0eabb96e4bebb964d37f57719ac14f95657d4e39282b8450add5f4ee325f45c3a257d99ea39
HEAD_REF main
)

2
ports/vulkan-headers/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "vulkan-headers",
"version": "1.3.268.0",
"version": "1.3.275.0",
"description": "Vulkan header files and API registry",
"homepage": "https://github.com/KhronosGroup/Vulkan-Headers",
"license": "Apache-2.0 OR MIT",

2
ports/vulkan-loader/portfile.cmake
View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-Loader
REF "vulkan-sdk-${VERSION}"
SHA512 15a326480e8d47f35a5e0c08ac915e047c90f2b99e8b6ac483bc1835e5b8bf2fd759b6fbf61dae9f89103e91067e60ff5f1817ce6aebecf95529bcc6d1326e66
SHA512 965bfeb238d088f80d36a3a5711be5de48c7c8547710bc0b0888ff36e5b36d37eb540c02e7aec04e4bf21129cfccd2e31e700010c7caecfd35403ba8e619beee
HEAD_REF main
)

2
ports/vulkan-loader/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "vulkan-loader",
"version": "1.3.268.0",
"version": "1.3.275.0",
"description": "Vulkan Development Tools",
"homepage": "https://github.com/KhronosGroup/Vulkan-Loader",
"license": null,

2
ports/vulkan-sdk-components/vcpkg.json
View File

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

13
ports/vulkan-tools/fix-parallel-config.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d770ca57..00c49887 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,7 +144,7 @@ if(BUILD_ICD)
add_subdirectory(icd)
endif()
-add_subdirectory(windows-runtime-installer)
+#add_subdirectory(windows-runtime-installer)
option(BUILD_TESTS "Build the tests")
if(BUILD_TESTS)

18
ports/vulkan-tools/portfile.cmake
View File

@ -2,11 +2,15 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-Tools
REF "vulkan-sdk-${VERSION}"
SHA512 9359e9528bfe507870bd83f9e8860b3d82555c0d8a6a19284f150dd2288b204f2c9dc9b3f62be4efbbb5e2983862459b2131de126a603cc5531ef8df72f4458f
SHA512 5d70498341b8d2447128cd5ab3fd081b706830f5f85d9f7e752dfca9c74fa4c1567207eef6e34e9bf99ff65ec2855b835eb30362fd544e1cf61ecc7a7119df06
HEAD_REF main
PATCHES
fix-parallel-config.patch
)
set(VCPKG_BUILD_TYPE release) # only builds tools
if(NOT VCPKG_TARGET_IS_ANDROID)
set(VCPKG_BUILD_TYPE release) # only builds tools
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
@ -17,8 +21,14 @@ vcpkg_cmake_install()
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
vcpkg_copy_tools(TOOL_NAMES vkcube vkcubepp vulkaninfo AUTO_CLEAN )
set(tools vulkaninfo)
if(NOT VCPKG_TARGET_IS_ANDROID)
list(APPEND tools vkcube vkcubepp)
endif()
vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN)
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
if(NOT VCPKG_TARGET_IS_ANDROID)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
endif()

5
ports/vulkan-tools/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "vulkan-tools",
"version": "1.3.268.0",
"version": "1.3.275.0",
"description": "Vulkan Development Tools",
"homepage": "https://github.com/KhronosGroup/Vulkan-Tools",
"license": "Apache-2.0",
@ -15,7 +15,6 @@
"host": true
},
"volk",
"vulkan-headers",
"vulkan-loader"
"vulkan-headers"
]
}

6
ports/vulkan-utility-libraries/portfile.cmake
View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-Utility-Libraries
REF "vulkan-sdk-${VERSION}"
SHA512 4bcb3f5f9a1567427675c5186a04c9d152b791989aaaba5f43a46cc8db7a8ab08626d5f9a101234b595fe283aa493655e26a521c17cf28752d30437d896fce40
SHA512 113be0cc1b7c3f7cce8c8cfe2459ed36e5b906e55b34f03ce1c211889a9a5a9539d2fa608919e8506e372c3bca521a23cdd1c20d4834e7914696dce33a95fc71
HEAD_REF main
)
@ -14,6 +14,10 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/VulkanUtilityLibraries PACKAGE_NAME VulkanUtilityLibraries)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/VulkanUtilityLibraries/VulkanUtilityLibrariesConfig.cmake"
[[${PACKAGE_PREFIX_DIR}/lib/cmake/VulkanUtilityLibraries/VulkanUtilityLibraries-targets.cmake]]
[[${CMAKE_CURRENT_LIST_DIR}/VulkanUtilityLibraries-targets.cmake]]
)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")

2
ports/vulkan-utility-libraries/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "vulkan-utility-libraries",
"version": "1.3.268.0",
"version": "1.3.275.0",
"port-version": 1,
"description": "Utility libraries for Vulkan developers",
"homepage": "https://github.com/KhronosGroup/Vulkan-Utility-Libraries",

2
ports/vulkan-validationlayers/portfile.cmake
View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-ValidationLayers
REF "vulkan-sdk-${VERSION}"
SHA512 74282cede73f67ee39ab78b99cd53f78ac0427ec6ca897ec41eb28b0e2d1106006d688bfbfdb2f0924b84149d516d42b1abe3680cdc6019c66457451f19b44dd
SHA512 755bdde7e7129b7a3ed06a4bebdaf11212288802119e0dc224aab63491de30c9b1c25972bdafd4fedbfea43bf6c29cdbc409374e57fbf0331798530a8ae94a70
HEAD_REF main
)

2
ports/vulkan-validationlayers/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "vulkan-validationlayers",
"version": "1.3.268.0",
"version": "1.3.275.0",
"description": "Vulkan Validation Layers (VVL)",
"homepage": "https://github.com/KhronosGroup/Vulkan-ValidationLayers",
"license": null,

24
versions/baseline.json
View File

@ -5373,7 +5373,7 @@
"port-version": 1
},
"lunarg-vulkantools": {
"baseline": "1.3.268.0",
"baseline": "1.3.275.0",
"port-version": 0
},
"lunasvg": {
@ -8173,19 +8173,19 @@
"port-version": 3
},
"spirv-cross": {
"baseline": "1.3.268.0",
"baseline": "1.3.275.0",
"port-version": 0
},
"spirv-headers": {
"baseline": "1.3.268.0",
"baseline": "1.3.275.0",
"port-version": 0
},
"spirv-reflect": {
"baseline": "1.3.268.0",
"baseline": "1.3.275.0",
"port-version": 0
},
"spirv-tools": {
"baseline": "1.3.268.0",
"baseline": "1.3.275.0",
"port-version": 0
},
"spout2": {
@ -8997,7 +8997,7 @@
"port-version": 1
},
"volk": {
"baseline": "1.3.250",
"baseline": "1.3.275.0",
"port-version": 0
},
"vowpal-wabbit": {
@ -9033,7 +9033,7 @@
"port-version": 0
},
"vulkan-headers": {
"baseline": "1.3.268.0",
"baseline": "1.3.275.0",
"port-version": 0
},
"vulkan-hpp": {
@ -9041,7 +9041,7 @@
"port-version": 0
},
"vulkan-loader": {
"baseline": "1.3.268.0",
"baseline": "1.3.275.0",
"port-version": 0
},
"vulkan-memory-allocator": {
@ -9053,19 +9053,19 @@
"port-version": 0
},
"vulkan-sdk-components": {
"baseline": "1.3.268.0",
"baseline": "1.3.275.0",
"port-version": 0
},
"vulkan-tools": {
"baseline": "1.3.268.0",
"baseline": "1.3.275.0",
"port-version": 0
},
"vulkan-utility-libraries": {
"baseline": "1.3.268.0",
"baseline": "1.3.275.0",
"port-version": 1
},
"vulkan-validationlayers": {
"baseline": "1.3.268.0",
"baseline": "1.3.275.0",
"port-version": 0
},
"vvenc": {

5
versions/l-/lunarg-vulkantools.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ea54ec6c488d1f5ba33497de042aade3d49c29fb",
"version": "1.3.275.0",
"port-version": 0
},
{
"git-tree": "f6b2a11e7bfefb0423ba878f8bbf6030c27f5c77",
"version": "1.3.268.0",

5
versions/s-/spirv-cross.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "84e71bc5b393bcd79a4093a3100d9a05f879d8b4",
"version": "1.3.275.0",
"port-version": 0
},
{
"git-tree": "8c3a9c2839a67379dfebc9e4f3df038359a8383c",
"version": "1.3.268.0",

5
versions/s-/spirv-headers.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d0bd177162a784f4939c6e142a9fe590e4c10dce",
"version": "1.3.275.0",
"port-version": 0
},
{
"git-tree": "a169757648a3ab575795f1d4b417d5c1e545fb81",
"version": "1.3.268.0",

5
versions/s-/spirv-reflect.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3ec7c21ce674b3369a7ca32f4822e463815931a5",
"version": "1.3.275.0",
"port-version": 0
},
{
"git-tree": "640aba022004347ac98e964b8a932dde3f677d5f",
"version": "1.3.268.0",

5
versions/s-/spirv-tools.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d85b9c9f0dcec75a5748e685d30b952fb97e431b",
"version": "1.3.275.0",
"port-version": 0
},
{
"git-tree": "73ef0c502cabbe79cfcef62b67ec352e8675c721",
"version": "1.3.268.0",

5
versions/v-/volk.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "707ef05c176dde719096f9737b77ce51390c951d",
"version": "1.3.275.0",
"port-version": 0
},
{
"git-tree": "8b2d72fd71caeb51d471a390221f70dfe27fd803",
"version": "1.3.250",

5
versions/v-/vulkan-headers.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5fd55b5328f4cc92680685bb3492092e7a919fbe",
"version": "1.3.275.0",
"port-version": 0
},
{
"git-tree": "ffd9715c99bc1d2b115a27616e17319ab10d47d2",
"version": "1.3.268.0",

5
versions/v-/vulkan-loader.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "53fab978fa1af1363dd629deaedda328acafa01e",
"version": "1.3.275.0",
"port-version": 0
},
{
"git-tree": "058ede4fd9458f7fc471ea3663e4e8e6f455f638",
"version": "1.3.268.0",

5
versions/v-/vulkan-sdk-components.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d2488a944354eab0570fcda95657275850ea1c21",
"version": "1.3.275.0",
"port-version": 0
},
{
"git-tree": "efe1324e0d30a235687686111be4daa4605083e6",
"version": "1.3.268.0",

5
versions/v-/vulkan-tools.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9e8ff435bcda0de218d540c39c0796a446f6b6fe",
"version": "1.3.275.0",
"port-version": 0
},
{
"git-tree": "720b109686183339d148fb303b53abfd128e9ec2",
"version": "1.3.268.0",

5
versions/v-/vulkan-utility-libraries.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d5abe73f20f44a0d03163eb8fdbd3714f1b57b8a",
"version": "1.3.275.0",
"port-version": 1
},
{
"git-tree": "d90089cebfde86dcb2c554b9e45271889503fc36",
"version": "1.3.268.0",

5
versions/v-/vulkan-validationlayers.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9e3c7cb8b034a637486a7a2fb1c695771170cb5d",
"version": "1.3.275.0",
"port-version": 0
},
{
"git-tree": "993862940154ca8e6692e31ad7387261566ca757",
"version": "1.3.268.0",