From 883a45fa3eb7347431c246d831cf8ece12da8676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
Date: Mon, 23 Sep 2024 12:20:32 +0200
Subject: [PATCH] ci/msys2: disable some features for 32-bit build

See: https://github.com/msys2/MINGW-packages/commit/1e7737f090e651059d5127d92ab117aa7654fd3e
---
 .github/workflows/build.yml | 6 ++----
 ci/build-msys2.sh           | 7 ++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4b3c879e2f..93ab36d2ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -528,7 +528,6 @@ jobs:
             lcms2:p
             libarchive:p
             libass:p
-            libcdio-paranoia:p
             libdvdnav:p
             libjpeg-turbo:p
             libplacebo:p
@@ -539,14 +538,13 @@ jobs:
             python:p
             shaderc:p
             spirv-cross:p
-            uchardet:p
-            vapoursynth:p
             vulkan-devel:p
 
       - name: Install dependencies
         if: ${{ matrix.sys != 'clang32' && matrix.sys != 'mingw32' }}
         run: |
-          pacboy --noconfirm -S {angleproject,cppwinrt,rst2pdf,rubberband}:p
+          pacboy --noconfirm -S angleproject cppwinrt libcdio-paranoia rst2pdf \
+                                rubberband uchardet vapoursynth
 
       - name: Build with meson
         id: build
diff --git a/ci/build-msys2.sh b/ci/build-msys2.sh
index 8b8eadefd2..2d150913d6 100755
--- a/ci/build-msys2.sh
+++ b/ci/build-msys2.sh
@@ -3,13 +3,14 @@
 args=(
   --werror
   -Dc_args='-Wno-error=deprecated -Wno-error=deprecated-declarations'
-  -D{cdda,d3d-hwaccel,d3d11,dvdnav,jpeg,lcms2,libarchive}=enabled
-  -D{libbluray,lua,shaderc,spirv-cross,uchardet,vapoursynth}=enabled
+  -D{d3d-hwaccel,d3d11,dvdnav,jpeg,lcms2,libarchive}=enabled
+  -D{libbluray,lua,shaderc,spirv-cross}=enabled
   -D{libmpv,tests}=true
 )
 
 [[ "$SYS" != "clang32" && "$SYS" != "mingw32" ]] && args+=(
-  -D{egl-angle-lib,egl-angle-win32,pdf-build,rubberband,win32-smtc}=enabled
+  -D{cdda,egl-angle-lib,egl-angle-win32,pdf-build}=enabled
+  -D{rubberband,uchardet,vapoursynth,win32-smtc}=enabled
 )
 
 meson setup build "${args[@]}"