From bf633c59302cafcb556719ee0ddb008bb37590d0 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 3 Apr 2026 23:01:50 +0300 Subject: [PATCH 32/32] CI: Update setup-msys2 to version 2.31.0 See RM #1982 Signed-off-by: Marko Lindqvist --- .github/workflows/ci.yml | 4 ++-- platforms/windows/installer_msys2/Makefile.meson | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0af0149b71..e8320c5aae 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/platforms/windows/installer_msys2/Makefile.meson b/platforms/windows/installer_msys2/Makefile.meson index a8fd6a3578..fbebff899f 100644 --- a/platforms/windows/installer_msys2/Makefile.meson +++ b/platforms/windows/installer_msys2/Makefile.meson @@ -54,8 +54,11 @@ DLLPATH_PREFIX=/$(ARCHDIR)/bin/ ifeq ($(CI),yes) ICUVER=78 +SVTAV1ENC=libSvtAv1Enc-4.dll else ICUVER=78 +CRYPTO_OSSL=libngtcp2_crypto_ossl.dll +SVTAV1ENC=libSvtAv1Enc-3.dll endif # @@ -251,7 +254,7 @@ COMMON_DLLS := \ exchndl.dll \ mgwhelp.dll \ libngtcp2-16.dll \ - libngtcp2_crypto_ossl.dll \ + $(CRYPTO_OSSL) \ libngtcp2_crypto_ossl-0.dll install-env-common: @@ -370,7 +373,7 @@ SDL2_DLLS := \ libaom.dll \ libdav1d-7.dll \ librav1e.dll \ - libSvtAv1Enc-3.dll \ + $(SVTAV1ENC) \ libyuv.dll SDL3_DLLS := \ -- 2.53.0