From 48eedc467fff0cfccc93101e4164441840fdaa51 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 4 Apr 2026 00:27:55 +0300 Subject: [PATCH 11/11] CI: Update setup-msys2 to version 2.31.0 See RM #1982 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- windows/installer_msys2/Makefile.meson | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3b992db9e..fa4722abc0 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.30.0 provides msys2 snapshot 20251213 - uses: msys2/setup-msys2@v2.30.0 + # 2.31.0 provides msys2 snapshot 20260322 + uses: msys2/setup-msys2@v2.31.0 with: msystem: UCRT64 install: > diff --git a/windows/installer_msys2/Makefile.meson b/windows/installer_msys2/Makefile.meson index 50db84c80c..5f477d925d 100644 --- a/windows/installer_msys2/Makefile.meson +++ b/windows/installer_msys2/Makefile.meson @@ -74,12 +74,12 @@ DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) ICUVER=78 RAV1E=librav1e.dll -SVTAV1ENV=libSvtAv1Enc-3.dll +SVTAV1ENC=libSvtAv1Enc-4.dll XML2=libxml2-16.dll else ICUVER=75 RAV1E=rav1e.dll -SVTAV1ENV=libSvtAv1Enc-2.dll +SVTAV1ENC=libSvtAv1Enc-2.dll XML2=libxml2-2.dll endif @@ -353,8 +353,8 @@ SDL2_DLLS := \ libjxl_cms.dll \ libaom.dll \ libdav1d-7.dll \ - $(RAV1E) \ - ${SVTAV1ENV} \ + $(RAV1E) \ + ${SVTAV1ENC} \ libyuv.dll install-env-sdl2: install-env-gtk4-fcmp -- 2.53.0