From 40623b9351c7a217f96ad229ec03cad5fe9c2a2f Mon Sep 17 00:00:00 2001 From: Ankith Date: Mon, 28 Oct 2024 19:48:40 +0530 Subject: [PATCH 1/2] Install SDL3 dependencies before building it --- .github/workflows/build-sdl3.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-sdl3.yml b/.github/workflows/build-sdl3.yml index cb2c555f04..c0ce2a8cde 100644 --- a/.github/workflows/build-sdl3.yml +++ b/.github/workflows/build-sdl3.yml @@ -54,14 +54,24 @@ jobs: steps: - uses: actions/checkout@v4.2.1 - - name: Install deps (linux) + - name: Install pygame deps (linux) if: matrix.os == 'ubuntu-24.04' run: sudo apt-get install libfreetype6-dev libportmidi-dev python3-dev - - name: Install deps (mac) + - name: Install pygame deps (mac) if: matrix.os == 'macos-14' run: brew install freetype portmidi + # taken from dependencies of the 'libsdl2-dev' package + - name: Install SDL deps (linux) + if: matrix.os == 'ubuntu-24.04' + run: > + sudo apt-get install libasound2-dev libdbus-1-dev libdecor-0-dev libdrm-dev + libegl-dev libgbm-dev libgl-dev libgles-dev libibus-1.0-dev libpulse-dev + libsamplerate0-dev libsndio-dev libudev-dev libwayland-dev libx11-dev + libxcursor-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev + libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev + # taken from https://wiki.libsdl.org/SDL3/Installation - name: Install SDL3 if: matrix.os != 'windows-latest' @@ -74,7 +84,7 @@ jobs: cmake --build . --config Release --parallel sudo cmake --install . --config Release - - name: Make sdist and install it + - name: Build with SDL3 run: > python3 -m pip install . -v -Csetup-args=-Dsdl_api=3 -Csetup-args=-Dimage=disabled From 44a33702dbd38c7b0984962bb8c1546da80c8ec6 Mon Sep 17 00:00:00 2001 From: Ankith Date: Tue, 29 Oct 2024 11:20:22 +0530 Subject: [PATCH 2/2] Drop mingw32 in msys2 CI --- .github/workflows/build-on-msys2.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-on-msys2.yml b/.github/workflows/build-on-msys2.yml index 315e7c41f1..ea3cc08df8 100644 --- a/.github/workflows/build-on-msys2.yml +++ b/.github/workflows/build-on-msys2.yml @@ -42,7 +42,6 @@ jobs: matrix: include: - { sys: mingw64, env: x86_64 } - - { sys: mingw32, env: i686 } - { sys: ucrt64, env: ucrt-x86_64 } - { sys: clang64, env: clang-x86_64 } # - { sys: clangarm64, env: clang-aarch64 }