From 4f75a794652757f12b55ef6ad70699895e0368e7 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 12 Apr 2022 12:39:42 -0700 Subject: [PATCH 1/3] Update ports to support static-md triplets --- ports/dstorage/vcpkg.json | 3 ++- ports/dxsdk-d3dx/vcpkg.json | 4 ++-- ports/xaudio2redist/vcpkg.json | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/dstorage/vcpkg.json b/ports/dstorage/vcpkg.json index 66ada05dfe7e28..344cee267fc3c7 100644 --- a/ports/dstorage/vcpkg.json +++ b/ports/dstorage/vcpkg.json @@ -1,8 +1,9 @@ { "name": "dstorage", "version": "1.0.0", + "port-version": 1, "description": "DirectStorage for Windows", "homepage": "https://aka.ms/directstorage/", "license": null, - "supports": "windows & !uwp & !static" + "supports": "windows & !uwp & !(static & staticcrt)" } diff --git a/ports/dxsdk-d3dx/vcpkg.json b/ports/dxsdk-d3dx/vcpkg.json index 7b0cf6d69e353d..e2f2bbca3a4a29 100644 --- a/ports/dxsdk-d3dx/vcpkg.json +++ b/ports/dxsdk-d3dx/vcpkg.json @@ -1,9 +1,9 @@ { "name": "dxsdk-d3dx", "version": "9.29.952.8", - "port-version": 3, + "port-version": 4, "description": "Redistributable package for the legacy DirectX SDK's D3DX9, D3DX10, and/or D3DX11 utility libraries.", "homepage": "https://walbourn.github.io/legacy-d3dx-on-nuget/", "license": null, - "supports": "windows & !arm & !uwp & !static" + "supports": "windows & !arm & !uwp & !(static & staticcrt)" } diff --git a/ports/xaudio2redist/vcpkg.json b/ports/xaudio2redist/vcpkg.json index 3c610f1f99f2c1..77dc7b3294018b 100644 --- a/ports/xaudio2redist/vcpkg.json +++ b/ports/xaudio2redist/vcpkg.json @@ -1,9 +1,9 @@ { "name": "xaudio2redist", "version": "1.2.8", - "port-version": 2, + "port-version": 3, "description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later", "homepage": "https://aka.ms/XAudio2Redist", "license": null, - "supports": "windows & !arm & !uwp & !static" + "supports": "windows & !arm & !uwp & !(static & staticcrt)" } From 12fa451d7a5371bda24455efdee2e0906799502a Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 12 Apr 2022 12:40:56 -0700 Subject: [PATCH 2/3] Update baseline --- versions/baseline.json | 6 +++--- versions/d-/dstorage.json | 5 +++++ versions/d-/dxsdk-d3dx.json | 5 +++++ versions/x-/xaudio2redist.json | 5 +++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 0bf2ca3bcdf34f..3c1efc9653b4a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1946,7 +1946,7 @@ }, "dstorage": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "dtl": { "baseline": "1.19", @@ -1970,7 +1970,7 @@ }, "dxsdk-d3dx": { "baseline": "9.29.952.8", - "port-version": 3 + "port-version": 4 }, "dxut": { "baseline": "11.26", @@ -7526,7 +7526,7 @@ }, "xaudio2redist": { "baseline": "1.2.8", - "port-version": 2 + "port-version": 3 }, "xbyak": { "baseline": "6.00", diff --git a/versions/d-/dstorage.json b/versions/d-/dstorage.json index cc27ca92254889..268d2ade5a8840 100644 --- a/versions/d-/dstorage.json +++ b/versions/d-/dstorage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fcdd5850cd949e7b08d9b00546036d96d9e098d", + "version": "1.0.0", + "port-version": 1 + }, { "git-tree": "b2494bc112c6d12ffbb8a8bc687a1ae2ad583221", "version": "1.0.0", diff --git a/versions/d-/dxsdk-d3dx.json b/versions/d-/dxsdk-d3dx.json index 81208748aaa73e..ce02c83e366378 100644 --- a/versions/d-/dxsdk-d3dx.json +++ b/versions/d-/dxsdk-d3dx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04be889f8dd81029b8f4e37a74e348453c1bdbbc", + "version": "9.29.952.8", + "port-version": 4 + }, { "git-tree": "4f9cac012452363e92e36d5978972cee3b9154e5", "version": "9.29.952.8", diff --git a/versions/x-/xaudio2redist.json b/versions/x-/xaudio2redist.json index 2f86ccea7786ac..845c66535993cc 100644 --- a/versions/x-/xaudio2redist.json +++ b/versions/x-/xaudio2redist.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c7cb7e25cd63531fb0a4be66deee41b0b6eae87", + "version": "1.2.8", + "port-version": 3 + }, { "git-tree": "8ae7aaec9ebb9859356736f91710e8d9727d7a81", "version": "1.2.8", From 3532ed0f836db45a601c51b5d9853e2e59a19bdd Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Wed, 13 Apr 2022 11:07:46 -0700 Subject: [PATCH 3/3] !(static & staticcrt) -> !staticcrt --- ports/dstorage/vcpkg.json | 2 +- ports/dxsdk-d3dx/vcpkg.json | 2 +- ports/xaudio2redist/vcpkg.json | 2 +- versions/d-/dstorage.json | 2 +- versions/d-/dxsdk-d3dx.json | 2 +- versions/x-/xaudio2redist.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/dstorage/vcpkg.json b/ports/dstorage/vcpkg.json index 344cee267fc3c7..a0f7f24f6f2a34 100644 --- a/ports/dstorage/vcpkg.json +++ b/ports/dstorage/vcpkg.json @@ -5,5 +5,5 @@ "description": "DirectStorage for Windows", "homepage": "https://aka.ms/directstorage/", "license": null, - "supports": "windows & !uwp & !(static & staticcrt)" + "supports": "windows & !uwp & !staticcrt" } diff --git a/ports/dxsdk-d3dx/vcpkg.json b/ports/dxsdk-d3dx/vcpkg.json index e2f2bbca3a4a29..d4a9518152f49a 100644 --- a/ports/dxsdk-d3dx/vcpkg.json +++ b/ports/dxsdk-d3dx/vcpkg.json @@ -5,5 +5,5 @@ "description": "Redistributable package for the legacy DirectX SDK's D3DX9, D3DX10, and/or D3DX11 utility libraries.", "homepage": "https://walbourn.github.io/legacy-d3dx-on-nuget/", "license": null, - "supports": "windows & !arm & !uwp & !(static & staticcrt)" + "supports": "windows & !arm & !uwp & !staticcrt" } diff --git a/ports/xaudio2redist/vcpkg.json b/ports/xaudio2redist/vcpkg.json index 77dc7b3294018b..0840cb7fc51b92 100644 --- a/ports/xaudio2redist/vcpkg.json +++ b/ports/xaudio2redist/vcpkg.json @@ -5,5 +5,5 @@ "description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later", "homepage": "https://aka.ms/XAudio2Redist", "license": null, - "supports": "windows & !arm & !uwp & !(static & staticcrt)" + "supports": "windows & !arm & !uwp & !staticcrt" } diff --git a/versions/d-/dstorage.json b/versions/d-/dstorage.json index 268d2ade5a8840..5d72f09e7b8992 100644 --- a/versions/d-/dstorage.json +++ b/versions/d-/dstorage.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5fcdd5850cd949e7b08d9b00546036d96d9e098d", + "git-tree": "8b3e0c3eaf98dec92b8e97f19e10efac69c6a187", "version": "1.0.0", "port-version": 1 }, diff --git a/versions/d-/dxsdk-d3dx.json b/versions/d-/dxsdk-d3dx.json index ce02c83e366378..8da67907f9aa71 100644 --- a/versions/d-/dxsdk-d3dx.json +++ b/versions/d-/dxsdk-d3dx.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "04be889f8dd81029b8f4e37a74e348453c1bdbbc", + "git-tree": "14db52bb5daba8ba8e0a93b0e41ffa676935923a", "version": "9.29.952.8", "port-version": 4 }, diff --git a/versions/x-/xaudio2redist.json b/versions/x-/xaudio2redist.json index 845c66535993cc..2b305feb0181b6 100644 --- a/versions/x-/xaudio2redist.json +++ b/versions/x-/xaudio2redist.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3c7cb7e25cd63531fb0a4be66deee41b0b6eae87", + "git-tree": "fe3229572bacd0c7076a7a4d710f96e6b3a66a3f", "version": "1.2.8", "port-version": 3 },