From eb6a19a607159f1d965eb7745fef0ec0d156f460 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Sat, 30 Apr 2022 21:42:31 -0700 Subject: [PATCH 1/7] Updated directx-headers port for v.1.600.10 --- ports/directx-headers/portfile.cmake | 6 +++--- ports/directx-headers/vcpkg.json | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ports/directx-headers/portfile.cmake b/ports/directx-headers/portfile.cmake index 93ec93f09c30de..16f293eb13b1b4 100644 --- a/ports/directx-headers/portfile.cmake +++ b/ports/directx-headers/portfile.cmake @@ -1,15 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectX-Headers - REF v1.4.9 - SHA512 439d28a8344ef3a012428f53fcb9d2d9823d51c61786363d87f8ba15921326c220478b2557aab3f641a2406f1e5f299a8e21a82547febff3b9cd7b26b09b1c22 + REF v1.600.10 + SHA512 79a5ba64679523d3fa4887a5eb442237794ab399137659ff523955e4287c8feec08c85bae9692cc38c77262957d0a0f43782dfbfab926b27d1a5b3b67f490457 HEAD_REF master ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DDXHEADERS_BUILD_TEST=OFF + OPTIONS -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF ) vcpkg_install_cmake() diff --git a/ports/directx-headers/vcpkg.json b/ports/directx-headers/vcpkg.json index b0723567c13f00..df1a78f7510af3 100644 --- a/ports/directx-headers/vcpkg.json +++ b/ports/directx-headers/vcpkg.json @@ -1,7 +1,6 @@ { "name": "directx-headers", - "version": "1.4.9", - "port-version": 1, + "version": "1.600.10", "description": "Official DirectX 12 Headers", "homepage": "https://devblogs.microsoft.com/directx/", "supports": "windows | linux" From 595c10d0a47f5e90e97a6cc77de1281b908cbeb7 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Sat, 30 Apr 2022 21:45:30 -0700 Subject: [PATCH 2/7] Update baseline --- versions/baseline.json | 4 ++-- versions/d-/directx-headers.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index d24eaa5d93ee9e..7ef903faadd4ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1857,8 +1857,8 @@ "port-version": 3 }, "directx-headers": { - "baseline": "1.4.9", - "port-version": 1 + "baseline": "1.600.10", + "port-version": 0 }, "directxmath": { "baseline": "2022-01-18", diff --git a/versions/d-/directx-headers.json b/versions/d-/directx-headers.json index 7f8bb1812bf07a..9dfa10f5cff520 100644 --- a/versions/d-/directx-headers.json +++ b/versions/d-/directx-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cac371748d8d7627e43890fd109d05e5ee48d105", + "version": "1.600.10", + "port-version": 0 + }, { "git-tree": "e9da93d00966da04931e1eab14be7bb4fc8998d5", "version": "1.4.9", From 56a59d4e1c24bd42ea1089e37f96f889e1ec3d3e Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Sat, 30 Apr 2022 21:47:29 -0700 Subject: [PATCH 3/7] Updated directx-headers port for v.1.602.0 --- ports/directx-headers/portfile.cmake | 4 ++-- ports/directx-headers/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/directx-headers/portfile.cmake b/ports/directx-headers/portfile.cmake index 16f293eb13b1b4..ae968118699712 100644 --- a/ports/directx-headers/portfile.cmake +++ b/ports/directx-headers/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectX-Headers - REF v1.600.10 - SHA512 79a5ba64679523d3fa4887a5eb442237794ab399137659ff523955e4287c8feec08c85bae9692cc38c77262957d0a0f43782dfbfab926b27d1a5b3b67f490457 + REF v1.602.0 + SHA512 75d81191e3e0b60bc901f04fcb9cf53f0faae7f0c196a1b04f2b9199c72243d4dddaeacad29d82ca7ccb209b16d07b4f1b71a58368fccad13c4d8421e0c9f0d9 HEAD_REF master ) diff --git a/ports/directx-headers/vcpkg.json b/ports/directx-headers/vcpkg.json index df1a78f7510af3..f6fdf29c223cff 100644 --- a/ports/directx-headers/vcpkg.json +++ b/ports/directx-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directx-headers", - "version": "1.600.10", + "version": "1.602.0", "description": "Official DirectX 12 Headers", "homepage": "https://devblogs.microsoft.com/directx/", "supports": "windows | linux" From 86a6a8143ee7228945f48485c11da5646829cbc9 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Sat, 30 Apr 2022 21:47:54 -0700 Subject: [PATCH 4/7] Update baseline --- versions/baseline.json | 2 +- versions/d-/directx-headers.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 7ef903faadd4ec..37187e9574b294 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1857,7 +1857,7 @@ "port-version": 3 }, "directx-headers": { - "baseline": "1.600.10", + "baseline": "1.602.0", "port-version": 0 }, "directxmath": { diff --git a/versions/d-/directx-headers.json b/versions/d-/directx-headers.json index 9dfa10f5cff520..00a03c52f80263 100644 --- a/versions/d-/directx-headers.json +++ b/versions/d-/directx-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13d6bb4697c4abd15628c2c3584196c40600beb1", + "version": "1.602.0", + "port-version": 0 + }, { "git-tree": "cac371748d8d7627e43890fd109d05e5ee48d105", "version": "1.600.10", From af4de3911a70a0dfb9e0211ff72bf76174474c95 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 2 May 2022 15:39:28 -0700 Subject: [PATCH 5/7] Updated per github-actions bot recommendations --- ports/directx-headers/portfile.cmake | 7 +++---- ports/directx-headers/vcpkg.json | 14 +++++++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ports/directx-headers/portfile.cmake b/ports/directx-headers/portfile.cmake index ae968118699712..02dad035541c95 100644 --- a/ports/directx-headers/portfile.cmake +++ b/ports/directx-headers/portfile.cmake @@ -6,14 +6,13 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/directx-headers/cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/directx-headers/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directx-headers/vcpkg.json b/ports/directx-headers/vcpkg.json index f6fdf29c223cff..b250c966d03b8a 100644 --- a/ports/directx-headers/vcpkg.json +++ b/ports/directx-headers/vcpkg.json @@ -3,5 +3,17 @@ "version": "1.602.0", "description": "Official DirectX 12 Headers", "homepage": "https://devblogs.microsoft.com/directx/", - "supports": "windows | linux" + "documentation": "https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/", + "license": "MIT", + "supports": "windows | linux", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } From 7df23e2eba111af4321f839b3efaf81a0cef754d Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 2 May 2022 15:39:50 -0700 Subject: [PATCH 6/7] Update baseline --- versions/d-/directx-headers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/d-/directx-headers.json b/versions/d-/directx-headers.json index 00a03c52f80263..bd8b93f2c15db2 100644 --- a/versions/d-/directx-headers.json +++ b/versions/d-/directx-headers.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "13d6bb4697c4abd15628c2c3584196c40600beb1", + "git-tree": "f6271f7dc1af5888b39b0443ff7ecc9d01f1db94", "version": "1.602.0", "port-version": 0 }, From 22040b0f103aa9c31b544f9bdfb98ba0f3ba88d8 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 3 May 2022 10:29:56 -0700 Subject: [PATCH 7/7] Update versions/d-/directx-headers.json Co-authored-by: Billy O'Neal --- versions/d-/directx-headers.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/d-/directx-headers.json b/versions/d-/directx-headers.json index bd8b93f2c15db2..bb915e8257c307 100644 --- a/versions/d-/directx-headers.json +++ b/versions/d-/directx-headers.json @@ -5,11 +5,6 @@ "version": "1.602.0", "port-version": 0 }, - { - "git-tree": "cac371748d8d7627e43890fd109d05e5ee48d105", - "version": "1.600.10", - "port-version": 0 - }, { "git-tree": "e9da93d00966da04931e1eab14be7bb4fc8998d5", "version": "1.4.9",