From 2e1f89a0df8bf3211946fdbf07fcf50fd105691c Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Tue, 11 Feb 2025 22:43:55 -0600 Subject: [PATCH] github/workflows: drop mingw32 Upstream dropped libplacebo* so we're pretty much out of luck here. It's not worth it to bother building a subproject for just this one. *: https://github.com/msys2/MINGW-packages/commit/c3a79e8ae9a8e7f2215db210ba3f44d91d7e23b6 --- .github/workflows/build.yml | 10 ++++------ ci/build-msys2.sh | 3 --- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 468ccd9eaf..71bdb99b5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -505,7 +505,6 @@ jobs: matrix: sys: - clang64 - - mingw32 - mingw64 - ucrt64 defaults: @@ -524,8 +523,10 @@ jobs: update: true install: git pacboy: >- + angleproject:p ca-certificates:p cc:p + cppwinrt:p ffmpeg:p lcms2:p libarchive:p @@ -539,17 +540,14 @@ 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 != 'mingw32' }} - run: | - pacboy --noconfirm -S {angleproject,cppwinrt,rst2pdf,rubberband}:p - - name: Build with meson id: build run: | diff --git a/ci/build-msys2.sh b/ci/build-msys2.sh index 6e0cb3304c..0bd74678e6 100755 --- a/ci/build-msys2.sh +++ b/ci/build-msys2.sh @@ -5,9 +5,6 @@ args=( -D{cdda,d3d-hwaccel,d3d11,dvdnav,jpeg,lcms2,libarchive}=enabled -D{libbluray,lua,shaderc,spirv-cross,uchardet,vapoursynth}=enabled -) - -[[ "$SYS" != "mingw32" ]] && args+=( -D{egl-angle-lib,egl-angle-win32,pdf-build,rubberband,win32-smtc}=enabled )