From f6e08f3cc2867abbbf28401e6874c977004007b8 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Fri, 12 Apr 2024 22:01:43 +1000 Subject: [PATCH] CI/Flatpak: Swap to CMake for building SDL2 Consistency. --- .../linux/flatpak/modules/20-sdl2.json | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/scripts/linux/flatpak/modules/20-sdl2.json b/.github/workflows/scripts/linux/flatpak/modules/20-sdl2.json index df0b53e298..6fc45065d8 100644 --- a/.github/workflows/scripts/linux/flatpak/modules/20-sdl2.json +++ b/.github/workflows/scripts/linux/flatpak/modules/20-sdl2.json @@ -1,26 +1,12 @@ { "name": "sdl2", - "buildsystem": "autotools", - "no-autogen": true, + "buildsystem": "cmake-ninja", + "builddir": true, "config-opts": [ - "--disable-dbus", - "--without-x", - "--disable-video-opengl", - "--disable-video-opengles", - "--disable-video-vulkan", - "--disable-wayland-shared", - "--disable-ime", - "--disable-oss", - "--disable-alsa", - "--disable-jack", - "--disable-esd", - "--disable-pipewire", - "--disable-pulseaudio", - "--disable-arts", - "--disable-nas", - "--disable-sndio", - "--disable-fusionsound", - "--disable-diskaudio" + "-DBUILD_SHARED_LIBS=ON", + "-DSDL_SHARED=ON", + "-DSDL_STATIC=OFF", + "-DSDL_TESTS=OFF" ], "build-options": { "strip": true @@ -42,4 +28,3 @@ "/share/aclocal" ] } -