From 77e07999fb192608686e6acc029e832ec416627c Mon Sep 17 00:00:00 2001 From: "Stephen E. Baker" Date: Sun, 3 Nov 2024 21:06:21 -0500 Subject: [PATCH] Bump vcpkg packages and remove SDL version lock sdl2-mixer patch is fixed to closer match upstream which can fix compile failures in that port. Bump corsixth vcpkg repo again for sdl2-mixer fix --- .github/workflows/Windows.yml | 2 +- vcpkg-configuration.json | 4 ++-- vcpkg.json | 5 +---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml index 99dac7b5..0d462603 100644 --- a/.github/workflows/Windows.yml +++ b/.github/workflows/Windows.yml @@ -50,7 +50,7 @@ jobs: - name: Setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 'a1212c93cabaa9c5c36c1ffdb4bddd59fdf31e43' + vcpkgGitCommitId: '5f4628b89f3f98cd9a0b43c27ded2aa53da1f790' - name: Run CMake dev configure if: inputs.PRESET == 'win-dev' diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index ce9c5a16..2885f197 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -1,7 +1,7 @@ { "default-registry": { "kind": "git", - "baseline": "a1212c93cabaa9c5c36c1ffdb4bddd59fdf31e43", + "baseline": "5f4628b89f3f98cd9a0b43c27ded2aa53da1f790", "repository": "https://github.com/microsoft/vcpkg" }, "registries": [ @@ -13,7 +13,7 @@ { "kind": "git", "repository": "https://github.com/CorsixTH/vcpkg-registry", - "baseline": "30e94d20cb95de2cc64941c0ba6bd901890ccec6", + "baseline": "f8112bf320835623dd837725c85e29a11087135d", "packages": [ "ffmpeg", "sdl2-mixer", "luafilesystem", "lpeg" ] } ] diff --git a/vcpkg.json b/vcpkg.json index 8a0041ba..767425a0 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -81,8 +81,5 @@ "catch2" ] } - }, - "overrides": [ - { "name": "sdl2", "version": "2.28.2" } - ] + } }