From de1c0b5464dcfad47a826e976a6693b7b24013da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
Date: Thu, 6 Jun 2024 23:32:46 +0200
Subject: [PATCH] ci/msys2: re-enable 32-bit builds

The 32-bit builds were disabled, because some packages started
disappearing. MSYS2 is slowly phasing out 32-bit support, but since we
still support it we have to test it somehow. Recent brakage with calling
convention mismatch would be spotted a lot quicker. So enable it, but
with some, not available, packages disabled.

This reverts a56d5c7fa1f20d917a179be894580a4c66c374dc
---
 .github/workflows/build.yml | 13 +++++++++----
 ci/build-msys2.sh           |  9 +++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7cd1a947bc..fab203ce82 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -505,7 +505,9 @@ jobs:
       fail-fast: false
       matrix:
         sys:
+          - clang32
           - clang64
+          - mingw32
           - mingw64
           - ucrt64
     defaults:
@@ -524,10 +526,8 @@ jobs:
           update: true
           install: git
           pacboy: >-
-            angleproject:p
             ca-certificates:p
             cc:p
-            diffutils:p
             ffmpeg:p
             lcms2:p
             libarchive:p
@@ -541,18 +541,23 @@ jobs:
             ninja:p
             pkgconf:p
             python:p
-            rst2pdf:p
-            rubberband: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,rst2pdf,rubberband}:p
+
       - name: Build with meson
         id: build
         run: |
           ./ci/build-msys2.sh meson
+        env:
+          SYS: ${{ matrix.sys }}
 
       - name: Print meson log
         if: ${{ failure() && steps.build.outcome == 'failure' }}
diff --git a/ci/build-msys2.sh b/ci/build-msys2.sh
index 1a0e0226aa..9e9af53ddc 100755
--- a/ci/build-msys2.sh
+++ b/ci/build-msys2.sh
@@ -7,20 +7,21 @@ meson setup build            \
   -D d3d-hwaccel=enabled     \
   -D d3d11=enabled           \
   -D dvdnav=enabled          \
-  -D egl-angle-lib=enabled   \
-  -D egl-angle-win32=enabled \
   -D jpeg=enabled            \
   -D lcms2=enabled           \
   -D libarchive=enabled      \
   -D libbluray=enabled       \
   -D libmpv=true             \
   -D lua=enabled             \
-  -D pdf-build=enabled       \
-  -D rubberband=enabled      \
   -D shaderc=enabled         \
   -D spirv-cross=enabled     \
   -D tests=true              \
   -D uchardet=enabled        \
   -D vapoursynth=enabled
+
+if [[ "$SYS" != "clang32" && "$SYS" != "mingw32" ]]; then
+   meson configure build -D{egl-angle-lib,egl-angle-win32,pdf-build,rubberband}=enabled
+fi
+
 meson compile -C build
 ./build/mpv.com -v --no-config