From 2f4008d6fe2750076bd52658d58100474c9af8b9 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 26 Jun 2025 04:23:12 +0300 Subject: [PATCH 90/90] CI: Update setup-msys2 to version 2.28.0 See RM #1539 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- platforms/windows/installer_msys2/Makefile.meson | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26b72bf620..713bd1fbdb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,8 @@ jobs: # A mapping from msys2/setup-msys2 version to msys2 version can be # found at # https://github.com/msys2/setup-msys2/blob/main/CHANGELOG.md - # 2.27.0 provides msys2 snapshot 20250221 - uses: msys2/setup-msys2@v2.27.0 + # 2.28.0 provides msys2 snapshot 20250622 + uses: msys2/setup-msys2@v2.28.0 with: msystem: UCRT64 install: > diff --git a/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson index f5ee36021a..7203708e8a 100644 --- a/platforms/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -53,9 +53,13 @@ CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -ICUVER=76 +ICUVER=77 +SVTAV1ENV=libSvtAv1Enc-3.dll +SNDFILES=libwavpack-1.dll libxmp.dll else ICUVER=76 +SVTAV1ENV=libSvtAv1Enc-2.dll +SNDFILES=libmodplug-1.dll endif # @@ -181,7 +185,7 @@ SOUND_DLLS := \ libvorbisfile-3.dll \ libvorbis-0.dll \ libogg-0.dll \ - libmodplug-1.dll + ${SNDFILES} COMMON_DLLS := \ libcairo-2.dll \ @@ -341,7 +345,7 @@ SDL2_DLLS := \ libaom.dll \ libdav1d-7.dll \ librav1e.dll \ - libSvtAv1Enc-2.dll \ + ${SVTAV1ENV} \ libyuv.dll install-env-sdl2: install-env-gtk4-fcmp -- 2.47.2