From 40be35f612f329c8d426dccf23f5303d6c6c49b5 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 8 Mar 2023 19:52:13 -0800 Subject: [PATCH 01/10] UWP toolchain fix and update some ports supports expressions for uwp/xbox --- ports/cuda/vcpkg.json | 4 ++-- ports/kinectsdk1/vcpkg.json | 4 ++-- ports/kinectsdk2/vcpkg.json | 4 ++-- ports/opengl-registry/vcpkg.json | 4 ++-- ports/opengl/vcpkg.json | 4 ++-- ports/vulkan-headers/vcpkg.json | 4 ++-- ports/vulkan-hpp/vcpkg.json | 4 ++-- ports/vulkan/vcpkg.json | 4 ++-- scripts/toolchains/uwp.cmake | 8 +++----- 9 files changed, 19 insertions(+), 21 deletions(-) diff --git a/ports/cuda/vcpkg.json b/ports/cuda/vcpkg.json index 4a17ad81e6111e..7d96303688f032 100644 --- a/ports/cuda/vcpkg.json +++ b/ports/cuda/vcpkg.json @@ -1,9 +1,9 @@ { "name": "cuda", "version": "10.1", - "port-version": 11, + "port-version": 12, "description": "A parallel computing platform and programming model", "homepage": "https://developer.nvidia.com/cuda-toolkit", "license": null, - "supports": "(windows & x64 & !uwp) | (linux & x64) | (linux & arm64)" + "supports": "(windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)" } diff --git a/ports/kinectsdk1/vcpkg.json b/ports/kinectsdk1/vcpkg.json index cc1943704549ac..e13a4e8f086f7e 100644 --- a/ports/kinectsdk1/vcpkg.json +++ b/ports/kinectsdk1/vcpkg.json @@ -1,10 +1,10 @@ { "name": "kinectsdk1", "version": "1.8", - "port-version": 6, + "port-version": 7, "description": "Kinect for Windows SDK for Kinect v1 sensor.", "license": null, - "supports": "!arm & windows", + "supports": "!arm & windows & !uwp & !xbox", "dependencies": [ { "name": "vcpkg-tool-lessmsi", diff --git a/ports/kinectsdk2/vcpkg.json b/ports/kinectsdk2/vcpkg.json index 7fa6bf711c29a2..6bfde2f6a33aae 100644 --- a/ports/kinectsdk2/vcpkg.json +++ b/ports/kinectsdk2/vcpkg.json @@ -1,10 +1,10 @@ { "name": "kinectsdk2", "version": "2.0", - "port-version": 5, + "port-version": 6, "description": "Kinect for Windows SDK for Kinect v2 sensor.", "license": null, - "supports": "!arm & windows", + "supports": "!arm & windows & !uwp & !xbox", "dependencies": [ { "name": "vcpkg-tool-lessmsi", diff --git a/ports/opengl-registry/vcpkg.json b/ports/opengl-registry/vcpkg.json index 1464f4faab401f..57c0de515c20c2 100644 --- a/ports/opengl-registry/vcpkg.json +++ b/ports/opengl-registry/vcpkg.json @@ -1,10 +1,10 @@ { "name": "opengl-registry", "version-date": "2022-09-29", - "port-version": 1, + "port-version": 2, "description": "the API and Extension registries for the OpenGL family APIs", "homepage": "https://github.com/KhronosGroup/OpenGL-Registry", - "supports": "!xbox", + "supports": "!uwp & !xbox", "dependencies": [ "egl-registry" ] diff --git a/ports/opengl/vcpkg.json b/ports/opengl/vcpkg.json index ad72b1346ce7b1..6e3a19686eb3bf 100644 --- a/ports/opengl/vcpkg.json +++ b/ports/opengl/vcpkg.json @@ -1,10 +1,10 @@ { "name": "opengl", "version-date": "2022-12-04", - "port-version": 2, + "port-version": 3, "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics.", "license": null, - "supports": "!xbox", + "supports": "!uwp & !xbox", "dependencies": [ "opengl-registry" ] diff --git a/ports/vulkan-headers/vcpkg.json b/ports/vulkan-headers/vcpkg.json index a5d722902409df..83f560a7726d95 100644 --- a/ports/vulkan-headers/vcpkg.json +++ b/ports/vulkan-headers/vcpkg.json @@ -1,11 +1,11 @@ { "name": "vulkan-headers", "version": "1.3.239", - "port-version": 1, + "port-version": 2, "description": "Vulkan header files and API registry", "homepage": "https://github.com/KhronosGroup/Vulkan-Headers", "license": "Apache-2.0", - "supports": "!xbox", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/vulkan-hpp/vcpkg.json b/ports/vulkan-hpp/vcpkg.json index 9f5f695493e3e3..c00a35303d8c03 100644 --- a/ports/vulkan-hpp/vcpkg.json +++ b/ports/vulkan-hpp/vcpkg.json @@ -1,10 +1,10 @@ { "name": "vulkan-hpp", "version": "1.3.231", - "port-version": 1, + "port-version": 2, "description": "Header only C++ bindings for the Vulkan C API", "license": "Apache-2.0", - "supports": "!xbox", + "supports": "!uwp & !xbox", "dependencies": [ "vulkan" ] diff --git a/ports/vulkan/vcpkg.json b/ports/vulkan/vcpkg.json index 724b52f7ef7ccf..450f28bd2cfc0a 100644 --- a/ports/vulkan/vcpkg.json +++ b/ports/vulkan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vulkan", "version": "1.1.82.1", - "port-version": 4, + "port-version": 5, "description": "A graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs on a wide variety of devices.", - "supports": "!xbox" + "supports": "!uwp & !xbox" } diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index 669bf81081f164..4656108782b8d1 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -18,12 +18,10 @@ if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE) endif() -if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - set(CMAKE_CROSSCOMPILING ON CACHE STRING "") +set(CMAKE_CROSSCOMPILING ON CACHE STRING "") - if(NOT DEFINED CMAKE_SYSTEM_VERSION) - set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") - endif() +if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") endif() get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) From 359aad9532a8b9129abad2f3977310eadc23d273 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 8 Mar 2023 19:59:18 -0800 Subject: [PATCH 02/10] Update baseline --- versions/baseline.json | 16 ++++++++-------- versions/c-/cuda.json | 5 +++++ versions/k-/kinectsdk1.json | 5 +++++ versions/k-/kinectsdk2.json | 5 +++++ versions/o-/opengl-registry.json | 5 +++++ versions/o-/opengl.json | 5 +++++ versions/v-/vulkan-headers.json | 5 +++++ versions/v-/vulkan-hpp.json | 5 +++++ versions/v-/vulkan.json | 5 +++++ 9 files changed, 48 insertions(+), 8 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 9495d7342fcfda..5d8ac8a03557dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1886,7 +1886,7 @@ }, "cuda": { "baseline": "10.1", - "port-version": 11 + "port-version": 12 }, "cudnn": { "baseline": "7.6.5", @@ -3590,11 +3590,11 @@ }, "kinectsdk1": { "baseline": "1.8", - "port-version": 6 + "port-version": 7 }, "kinectsdk2": { "baseline": "2.0", - "port-version": 5 + "port-version": 6 }, "kissfft": { "baseline": "2021-11-14", @@ -5738,11 +5738,11 @@ }, "opengl": { "baseline": "2022-12-04", - "port-version": 2 + "port-version": 3 }, "opengl-registry": { "baseline": "2022-09-29", - "port-version": 1 + "port-version": 2 }, "openh264": { "baseline": "2021-03-16", @@ -8242,15 +8242,15 @@ }, "vulkan": { "baseline": "1.1.82.1", - "port-version": 4 + "port-version": 5 }, "vulkan-headers": { "baseline": "1.3.239", - "port-version": 1 + "port-version": 2 }, "vulkan-hpp": { "baseline": "1.3.231", - "port-version": 1 + "port-version": 2 }, "vulkan-memory-allocator": { "baseline": "3.0.1", diff --git a/versions/c-/cuda.json b/versions/c-/cuda.json index 05fbc129641cad..faedc161e45306 100644 --- a/versions/c-/cuda.json +++ b/versions/c-/cuda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85508d056c8d9e006b455ee71e29ab015abd8d63", + "version": "10.1", + "port-version": 12 + }, { "git-tree": "1d190177076c48287897d233ae2fa8c241f28f40", "version": "10.1", diff --git a/versions/k-/kinectsdk1.json b/versions/k-/kinectsdk1.json index 69568b944ced67..3c12c23ce49af7 100644 --- a/versions/k-/kinectsdk1.json +++ b/versions/k-/kinectsdk1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "95650640a3c97fff440182fb35e878cc0b3111de", + "version": "1.8", + "port-version": 7 + }, { "git-tree": "bc44fc3968647d5e6a43066a8d2b0cf6be3f4405", "version": "1.8", diff --git a/versions/k-/kinectsdk2.json b/versions/k-/kinectsdk2.json index c3792155202eee..805c9c7d6f717b 100644 --- a/versions/k-/kinectsdk2.json +++ b/versions/k-/kinectsdk2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e703f6797d85c9d99a150e4325c67bf7f3a7ea3f", + "version": "2.0", + "port-version": 6 + }, { "git-tree": "0de915e33cfe92b9972e0227eae6be31b6846fc5", "version": "2.0", diff --git a/versions/o-/opengl-registry.json b/versions/o-/opengl-registry.json index b719a06a5b0958..69fbb0f9b16b6b 100644 --- a/versions/o-/opengl-registry.json +++ b/versions/o-/opengl-registry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e54a57f66f2e2d670f947d72b9ac65bc053d1c5f", + "version-date": "2022-09-29", + "port-version": 2 + }, { "git-tree": "367e1502c966f1df0656bdea115989650d01a781", "version-date": "2022-09-29", diff --git a/versions/o-/opengl.json b/versions/o-/opengl.json index 1e1e959a5b835d..27cf08751b3945 100644 --- a/versions/o-/opengl.json +++ b/versions/o-/opengl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3ae71738f88449ebcd781cef60d9a253fa091d4", + "version-date": "2022-12-04", + "port-version": 3 + }, { "git-tree": "23351e9e47639fa099352a258530b4c70dbc3ad5", "version-date": "2022-12-04", diff --git a/versions/v-/vulkan-headers.json b/versions/v-/vulkan-headers.json index 2b04fb25eaeec6..849b95c7d5c715 100644 --- a/versions/v-/vulkan-headers.json +++ b/versions/v-/vulkan-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0e10b5347c26f2917d90b107a6177af1c270b65", + "version": "1.3.239", + "port-version": 2 + }, { "git-tree": "052634f8b28833b2d5302a0b4437031908eecde6", "version": "1.3.239", diff --git a/versions/v-/vulkan-hpp.json b/versions/v-/vulkan-hpp.json index ce71021def172f..3c6b4f285f599f 100644 --- a/versions/v-/vulkan-hpp.json +++ b/versions/v-/vulkan-hpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61fc021c36380e8be0bf1742784dea14c9fe4a97", + "version": "1.3.231", + "port-version": 2 + }, { "git-tree": "794ed471d4b90ebb0ecad8adbb2f10fb57a7f0f6", "version": "1.3.231", diff --git a/versions/v-/vulkan.json b/versions/v-/vulkan.json index 99ab508c2892a6..b0a3ef8a8686cf 100644 --- a/versions/v-/vulkan.json +++ b/versions/v-/vulkan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4418737ec49a989a26abf7b122fa3ac61c928b67", + "version": "1.1.82.1", + "port-version": 5 + }, { "git-tree": "a0810feaa193deb10db91cd9cfe727a13fba5b84", "version": "1.1.82.1", From 5b82fdc667ac4890d992bca2ecafef61fde1af40 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 8 Mar 2023 20:53:37 -0800 Subject: [PATCH 03/10] More ports updated for !xbox --- ports/cppxaml/vcpkg.json | 4 +++- ports/vulkan-memory-allocator-hpp/vcpkg.json | 2 ++ ports/vulkan-memory-allocator/vcpkg.json | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/cppxaml/vcpkg.json b/ports/cppxaml/vcpkg.json index d99f003879c2fd..8953b4a4cb5bc7 100644 --- a/ports/cppxaml/vcpkg.json +++ b/ports/cppxaml/vcpkg.json @@ -1,7 +1,9 @@ { "name": "cppxaml", "version": "0.0.16", + "port-version": 1, "description": "CppXaml is a library to facilitate usage of the XAML UI framework in C++ Windows apps.", "homepage": "https://asklar.github.io/xaml-islands", - "supports": "windows" + "license": "MIT", + "supports": "windows & !xbox" } diff --git a/ports/vulkan-memory-allocator-hpp/vcpkg.json b/ports/vulkan-memory-allocator-hpp/vcpkg.json index 00b8ac1067566d..e1f34a37684776 100644 --- a/ports/vulkan-memory-allocator-hpp/vcpkg.json +++ b/ports/vulkan-memory-allocator-hpp/vcpkg.json @@ -1,9 +1,11 @@ { "name": "vulkan-memory-allocator-hpp", "version": "3.0.1", + "port-version": 1, "description": "C++ bindings for VulkanMemoryAllocator", "homepage": "https://github.com/YaaZ/VulkanMemoryAllocator-Hpp", "license": "CC0-1.0", + "supports": "!uwp & !xbox", "dependencies": [ "vulkan" ] diff --git a/ports/vulkan-memory-allocator/vcpkg.json b/ports/vulkan-memory-allocator/vcpkg.json index 77296dbf521544..ec3a725743f04b 100644 --- a/ports/vulkan-memory-allocator/vcpkg.json +++ b/ports/vulkan-memory-allocator/vcpkg.json @@ -1,7 +1,9 @@ { "name": "vulkan-memory-allocator", "version": "3.0.1", + "port-version": 1, "description": "Easy to integrate Vulkan memory allocation library from GPUOpen", "homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator", - "license": "MIT" + "license": "MIT", + "supports": "!uwp & !xbox" } From dac4120737c796a5b7539fd4ace051e67676e290 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 8 Mar 2023 20:54:43 -0800 Subject: [PATCH 04/10] Update baseline --- versions/baseline.json | 6 +++--- versions/c-/cppxaml.json | 5 +++++ versions/v-/vulkan-memory-allocator-hpp.json | 5 +++++ versions/v-/vulkan-memory-allocator.json | 5 +++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 5d8ac8a03557dc..7ef1cb1cfe6840 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1790,7 +1790,7 @@ }, "cppxaml": { "baseline": "0.0.16", - "port-version": 0 + "port-version": 1 }, "cppzmq": { "baseline": "4.9.0", @@ -8254,11 +8254,11 @@ }, "vulkan-memory-allocator": { "baseline": "3.0.1", - "port-version": 0 + "port-version": 1 }, "vulkan-memory-allocator-hpp": { "baseline": "3.0.1", - "port-version": 0 + "port-version": 1 }, "vvenc": { "baseline": "1.7.0", diff --git a/versions/c-/cppxaml.json b/versions/c-/cppxaml.json index 94f9a1ec7730e6..efdb058666d7f6 100644 --- a/versions/c-/cppxaml.json +++ b/versions/c-/cppxaml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85dcf687925f266a40cf039aa8696b729f7b084e", + "version": "0.0.16", + "port-version": 1 + }, { "git-tree": "57d825ac962df4a92481b82161ea7b7088929a82", "version": "0.0.16", diff --git a/versions/v-/vulkan-memory-allocator-hpp.json b/versions/v-/vulkan-memory-allocator-hpp.json index 76a330bc905dfb..5dfb4cd1d20b97 100644 --- a/versions/v-/vulkan-memory-allocator-hpp.json +++ b/versions/v-/vulkan-memory-allocator-hpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "572ac6bfc63ddd4a37633aa76f54ff4c8325cb85", + "version": "3.0.1", + "port-version": 1 + }, { "git-tree": "2f76c60d16fb75bdbf3bfa08039557bfbe0ff84a", "version": "3.0.1", diff --git a/versions/v-/vulkan-memory-allocator.json b/versions/v-/vulkan-memory-allocator.json index 5748219dbe2500..0c9d5deed3cfc1 100644 --- a/versions/v-/vulkan-memory-allocator.json +++ b/versions/v-/vulkan-memory-allocator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49c724c78cf76e8858c92ce7b1acdc52fd9bf62b", + "version": "3.0.1", + "port-version": 1 + }, { "git-tree": "3e9468d6877548306f7d94800031ef9d04541529", "version": "3.0.1", From 96ab824b15c932950ee584f3edb74d32a7c349c4 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 8 Mar 2023 23:44:47 -0800 Subject: [PATCH 05/10] Update support expression for ms-gdkx --- ports/ms-gdkx/vcpkg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/ms-gdkx/vcpkg.json b/ports/ms-gdkx/vcpkg.json index 35db3a97b95b7a..005151386322f5 100644 --- a/ports/ms-gdkx/vcpkg.json +++ b/ports/ms-gdkx/vcpkg.json @@ -1,9 +1,10 @@ { "name": "ms-gdkx", "version": "1.0.0", + "port-version": 1, "description": "Stub port that ensures the Microsoft GDK with Xbox Extensions is installed.", "homepage": "https://aka.ms/gdkx", "documentation": "https://aka.ms/gamedevdocs", "license": null, - "supports": "xbox" + "supports": "windows & x64 & !uwp" } From 9477da3ac095c7a9d5fc79d937eba1e01892aa5e Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 8 Mar 2023 23:46:49 -0800 Subject: [PATCH 06/10] Update baseline --- versions/baseline.json | 2 +- versions/m-/ms-gdkx.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 7ef1cb1cfe6840..3ad57f9a06ba26 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5238,7 +5238,7 @@ }, "ms-gdkx": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "ms-gltf": { "baseline": "2022-06-28", diff --git a/versions/m-/ms-gdkx.json b/versions/m-/ms-gdkx.json index 15d05c4d429ca6..eb522c0250ebe2 100644 --- a/versions/m-/ms-gdkx.json +++ b/versions/m-/ms-gdkx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88dfc0932dd418a9099759f87a60dab8a0df8d6e", + "version": "1.0.0", + "port-version": 1 + }, { "git-tree": "db060bcb7476b1f3f593027c28f4ff5e8589da7b", "version": "1.0.0", From 605f6bc22b8ed1f612340fb46663dab3a79bb8e9 Mon Sep 17 00:00:00 2001 From: walbourn Date: Thu, 9 Mar 2023 01:21:29 -0800 Subject: [PATCH 07/10] ms-gdkx port should fail on ado system --- scripts/ci.baseline.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a2b96890c9bd24..53735026ae5cff 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1105,6 +1105,11 @@ sentencepiece:x64-windows-static-md=fail symengine:x64-windows-static-md=fail unicorn:x64-windows-static-md=fail +# these ports require the Microsoft GDK with Xbox Extensions which is not installed on the CI pipeline machines +ms-gdkx:x64-windows=fail +ms-gdkx:x64-windows-static=fail +ms-gdkx:x64-windows-static-md=fail + # the version of v8 we have in the repo doesn't support VS2022 v8:x86-windows=fail v8:x64-windows=fail From c63baac8dd6957c7a612db5e1f671af699a0a00f Mon Sep 17 00:00:00 2001 From: walbourn Date: Thu, 9 Mar 2023 01:32:53 -0800 Subject: [PATCH 08/10] Revert change to opengl-registry since its needed for angle on UWP --- ports/opengl-registry/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/o-/opengl-registry.json | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ports/opengl-registry/vcpkg.json b/ports/opengl-registry/vcpkg.json index 57c0de515c20c2..1464f4faab401f 100644 --- a/ports/opengl-registry/vcpkg.json +++ b/ports/opengl-registry/vcpkg.json @@ -1,10 +1,10 @@ { "name": "opengl-registry", "version-date": "2022-09-29", - "port-version": 2, + "port-version": 1, "description": "the API and Extension registries for the OpenGL family APIs", "homepage": "https://github.com/KhronosGroup/OpenGL-Registry", - "supports": "!uwp & !xbox", + "supports": "!xbox", "dependencies": [ "egl-registry" ] diff --git a/versions/baseline.json b/versions/baseline.json index 3ad57f9a06ba26..5ec01b23cd2d0f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5742,7 +5742,7 @@ }, "opengl-registry": { "baseline": "2022-09-29", - "port-version": 2 + "port-version": 1 }, "openh264": { "baseline": "2021-03-16", diff --git a/versions/o-/opengl-registry.json b/versions/o-/opengl-registry.json index 69fbb0f9b16b6b..b719a06a5b0958 100644 --- a/versions/o-/opengl-registry.json +++ b/versions/o-/opengl-registry.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "e54a57f66f2e2d670f947d72b9ac65bc053d1c5f", - "version-date": "2022-09-29", - "port-version": 2 - }, { "git-tree": "367e1502c966f1df0656bdea115989650d01a781", "version-date": "2022-09-29", From 2807ae68e80c8b0d9220acf1021895ba534fdb82 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 9 Mar 2023 17:09:21 -0800 Subject: [PATCH 09/10] Minor github actions cr --- ports/vulkan/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/vulkan/vcpkg.json b/ports/vulkan/vcpkg.json index 450f28bd2cfc0a..96bd75075f5826 100644 --- a/ports/vulkan/vcpkg.json +++ b/ports/vulkan/vcpkg.json @@ -3,5 +3,6 @@ "version": "1.1.82.1", "port-version": 5, "description": "A graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs on a wide variety of devices.", + "license": null, "supports": "!uwp & !xbox" } From af6e6d5a761e257da40e6388e7e0195cf19505b7 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 9 Mar 2023 17:11:58 -0800 Subject: [PATCH 10/10] Refresh baseline --- versions/v-/vulkan.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/v-/vulkan.json b/versions/v-/vulkan.json index b0a3ef8a8686cf..08a39ad3a218d0 100644 --- a/versions/v-/vulkan.json +++ b/versions/v-/vulkan.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4418737ec49a989a26abf7b122fa3ac61c928b67", + "git-tree": "80d4793fe3882fca0afcb470183f404d97c22981", "version": "1.1.82.1", "port-version": 5 },