diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake index 8d7b63a96d..50a4aaf7c6 100644 --- a/ports/dxut/portfile.cmake +++ b/ports/dxut/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/DXUT - REF dec2022 - SHA512 c4987f2a6a5d71ee639a223e83ad607c6ffd6e5045dde5d47fd62222067ed7616d4841e011f5acc4086831ddc62040df3e106e71ed4794ae9326f726a20537f3 + REF dec2022b + SHA512 2af04127e40d6037e19fe396993f332b36de15264ddf9690414a377816824a4b5b238263b0fd65592911237b25d8fddb1c1d32c968c3516ca3672b0454cd6d0b HEAD_REF main ) @@ -12,6 +12,7 @@ vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES dxtk DIRECTXTK_INTEGRATION + spectre ENABLE_SPECTRE_MITIGATION ) vcpkg_cmake_configure( diff --git a/ports/dxut/vcpkg.json b/ports/dxut/vcpkg.json index 8c2a85aa10..2904717741 100644 --- a/ports/dxut/vcpkg.json +++ b/ports/dxut/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dxut", "version": "11.30", + "port-version": 1, "description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications", "homepage": "https://github.com/Microsoft/DXUT", "documentation": "https://github.com/microsoft/DXUT/wiki", @@ -23,6 +24,9 @@ "dependencies": [ "directxtk" ] + }, + "spectre": { + "description": "Build Spectre-mitigated library" } } } diff --git a/ports/effects11/portfile.cmake b/ports/effects11/portfile.cmake index 081afe3fec..a05a35d35c 100644 --- a/ports/effects11/portfile.cmake +++ b/ports/effects11/portfile.cmake @@ -3,13 +3,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/FX11 - REF dec2022 - SHA512 4fcdf48117865837ef11e0ed338f329f71eb89d96f0b2ab0ecfcfe604e68ec58c9dcb3060029f000726ead3ed5fb752e4fdd63446b837aecf9fc8919222be48a + REF dec2022b + SHA512 5dc209c830d940aba9378d1442b0fb236d5e1f63bb4e073ce8db5a832da22cb2e575c171aff0b641201b34b4362b9274b106f93518b09d57d231386d0b4bdf58 HEAD_REF main ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + spectre ENABLE_SPECTRE_MITIGATION +) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/effects11/vcpkg.json b/ports/effects11/vcpkg.json index 6c0111f467..e78c8a1bc2 100644 --- a/ports/effects11/vcpkg.json +++ b/ports/effects11/vcpkg.json @@ -1,6 +1,7 @@ { "name": "effects11", "version": "11.29", + "port-version": 1, "description": "Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render state, and runtime variables together.", "homepage": "https://github.com/Microsoft/FX11", "documentation": "https://github.com/microsoft/FX11/wiki", @@ -15,5 +16,10 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "spectre": { + "description": "Build Spectre-mitigated library" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index af90f05fb4..b304455b01 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2078,7 +2078,7 @@ }, "dxut": { "baseline": "11.30", - "port-version": 0 + "port-version": 1 }, "eabase": { "baseline": "2.09.12", @@ -2138,7 +2138,7 @@ }, "effects11": { "baseline": "11.29", - "port-version": 0 + "port-version": 1 }, "effolkronium-random": { "baseline": "1.4.1", diff --git a/versions/d-/dxut.json b/versions/d-/dxut.json index eaf3df6b78..f9d783d5ac 100644 --- a/versions/d-/dxut.json +++ b/versions/d-/dxut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a390de74f3bb95746d9e2fb6756209ed2a2248a", + "version": "11.30", + "port-version": 1 + }, { "git-tree": "b9e805917dad391fd3f6255215800fa2a6230b00", "version": "11.30", diff --git a/versions/e-/effects11.json b/versions/e-/effects11.json index 8875844f12..4383a4df03 100644 --- a/versions/e-/effects11.json +++ b/versions/e-/effects11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "542cec9c6fdc2ace4d1d4a6ec4dfe4e70c1f6dcc", + "version": "11.29", + "port-version": 1 + }, { "git-tree": "8a8575ff2ed44f491a5a557a775b750db3df63e5", "version": "11.29",