From 28bc58a3e87bcd00e8148be3f3b9711651e288c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
Date: Sun, 6 Oct 2024 18:09:40 +0200
Subject: [PATCH] Revert "ci/msys2: disable some features for 32-bit build"

No longer needed after 232919336d567b70330c43a41920238a56e100da.

This reverts commit 883a45fa3eb7347431c246d831cf8ece12da8676.
---
 .github/workflows/build.yml | 6 ++++--
 ci/build-msys2.sh           | 7 +++----
 2 files changed, 7 insertions(+), 6 deletions(-)

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