From bad3d353a0a4c08fac151fde152796f8d1dc86d5 Mon Sep 17 00:00:00 2001
From: Andrew Tribick <ajtribick@googlemail.com>
Date: Thu, 6 Jun 2024 20:17:12 +0200
Subject: [PATCH 1/2] Update vcpkg

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 78b6d19c23..a7e743f6fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Update vcpkg
       shell: pwsh
       run: |
-        $vcpkgCommit = '326d8b43e365352ba3ccadf388d989082fe0f2a6'
+        $vcpkgCommit = '6e31ee33cc9fc93599c4ceb38e229098cf339bb7'
         pushd "$env:VCPKG_INSTALLATION_ROOT"
         git cat-file -e "${vcpkgCommit}^{commit}" 2> $null
         if (!$?) {

From a09a222eba048c95034ef8306522d69e8fca287c Mon Sep 17 00:00:00 2001
From: Andrew Tribick <ajtribick@googlemail.com>
Date: Thu, 6 Jun 2024 23:34:13 +0200
Subject: [PATCH 2/2] Switch Windows build to ENABLE_WIN_ICU, remove icu from
 qtbase features

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a7e743f6fe..d6f84da006 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,7 +66,7 @@ jobs:
           'boost-smart-ptr',
           'cspice',
           'eigen3',
-          'ffmpeg[x264]',
+          'ffmpeg[core,avcodec,avformat,gpl,swscale,x264]',
           'fmt',
           'freetype',
           'gettext[tools]',
@@ -75,7 +75,7 @@ jobs:
           'libjpeg-turbo',
           'libpng',
           'luajit',
-          'qtbase[core,opengl,widgets,freetype,harfbuzz,icu,jpeg,png]'
+          'qtbase[core,opengl,widgets,freetype,harfbuzz,jpeg,png]'
         )
 
         # We treat x86 builds as native, other builds keep host as x64-windows.
@@ -120,7 +120,7 @@ jobs:
             -DENABLE_MINIAUDIO=ON `
             -DENABLE_LTO=ON       `
             -DUSE_ICU=ON          `
-            -DUSE_WIN_ICU=OFF
+            -DUSE_WIN_ICU=ON
 
     - name: Build
       shell: pwsh