From 23805b0705f38a3dbac7127ed4ead5bec163d2e9 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 26 Jun 2025 04:30:57 +0300 Subject: [PATCH 32/32] CI: Update setup-msys2 to version 2.28.0 See RM #1539 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- windows/installer_msys2/Makefile.meson | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c989bc6a57..bbeb51ee27 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/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index 7c0e2744c6..ed53cc2b12 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -72,11 +72,13 @@ CRYPTOVERSUF=3${CRYPTOLIB_SUFFIX} DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) -ICUVER=76 +ICUVER=77 RAV1E=librav1e.dll +SVTAV1ENV=libSvtAv1Enc-3.dll else ICUVER=75 RAV1E=rav1e.dll +SVTAV1ENV=libSvtAv1Enc-2.dll endif # @@ -348,7 +350,7 @@ SDL2_DLLS := \ libaom.dll \ libdav1d-7.dll \ $(RAV1E) \ - libSvtAv1Enc-2.dll \ + ${SVTAV1ENV} \ libyuv.dll install-env-sdl2: install-env-gtk4-fcmp -- 2.47.2