From 9eb376ee388df0ab3dc97a3c0c6bf8d95cd1a590 Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Tue, 4 Apr 2023 09:43:04 +0200
Subject: [PATCH] CI Linux: do not build own SDL2 anymore

SDL2 now obviously works on U20.04, because we are building there. It
doesn't work on U22.04, but neither the build with SDL 2.0.20 nor 2.26.2
does.

The problem seems actually to be the inclusion of Wayland libraries in
AppImage.
---
 .github/scripts/Linux/download_build_sdl.sh | 30 ---------------------
 .github/scripts/Linux/install_sdl.sh        |  9 -------
 .github/scripts/Linux/prepare.sh            |  1 +
 .github/workflows/ccpp.yml                  | 12 ---------
 4 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100755 .github/scripts/Linux/download_build_sdl.sh
 delete mode 100755 .github/scripts/Linux/install_sdl.sh

diff --git a/.github/scripts/Linux/download_build_sdl.sh b/.github/scripts/Linux/download_build_sdl.sh
deleted file mode 100755
index 056043ba6..000000000
--- a/.github/scripts/Linux/download_build_sdl.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh -eu
-
-mkdir -p /var/tmp/sdl
-cd /var/tmp/sdl
-
-# v2.0.22 requires wayland-client version 1.18.0 but in U18.04 is only 1.16.0
-curl -sSLO https://github.com/libsdl-org/SDL/releases/download/release-2.0.20/SDL2-2.0.20.tar.gz
-tar xaf SDL2*tar*
-cd SDL2-2.0.20
-./configure
-make -j "$(nproc)"
-sudo make install # SDL needs to be installed here because it is a dependency for the below
-cd ..
-
-git clone -b SDL2 --depth 1 https://github.com/libsdl-org/SDL_mixer
-cd SDL_mixer
-./configure
-make -j "$(nproc)"
-sudo make install
-cd ..
-
-# v2.0.18 and further require automake 1.16 but U18.04 has only automake 1.15.1
-git clone -b release-2.0.15 --depth 1 https://github.com/libsdl-org/SDL_ttf
-cd SDL_ttf
-./autogen.sh # to allow automake 1.15.1
-./configure
-make -j "$(nproc)"
-sudo make install
-cd ..
-
diff --git a/.github/scripts/Linux/install_sdl.sh b/.github/scripts/Linux/install_sdl.sh
deleted file mode 100755
index b276e8f1e..000000000
--- a/.github/scripts/Linux/install_sdl.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -eu
-
-cd /var/tmp/sdl/SDL2-2.0.20
-sudo make install
-cd ../SDL_mixer
-sudo make install
-cd ../SDL_ttf
-sudo make install
-
diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh
index 707d6a422..b094dfee4 100755
--- a/.github/scripts/Linux/prepare.sh
+++ b/.github/scripts/Linux/prepare.sh
@@ -18,6 +18,7 @@ sudo apt --no-install-recommends install nvidia-cuda-toolkit
 sudo apt install libglew-dev libglfw3-dev
 sudo apt install libglm-dev
 sudo apt install libmagickwand-dev
+sudo apt install libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev
 sudo apt install libsoxr-dev libspeexdsp-dev
 sudo apt install libssl-dev
 sudo apt install libasound-dev libcaca-dev libjack-jackd2-dev libnatpmp-dev libv4l-dev portaudio19-dev
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 832a8b8ef..b539333d4 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -101,18 +101,6 @@ jobs:
     - name: Install Cached FFmpeg
       if: steps.cache-ffmpeg.outputs.cache-hit == 'true'
       run: .github/scripts/Linux/install_ffmpeg.sh
-    - name: Cache SDL
-      id: cache-sdl
-      uses: actions/cache@v3
-      with:
-        path: '/var/tmp/sdl'
-        key: cache-sdl-${{ runner.os }}-${{ hashFiles( '.github/scripts/Linux/prepare.sh', '.github/scripts/Linux/download_build_sdl.sh' ) }}
-    - name: Build SDL
-      if: steps.cache-sdl.outputs.cache-hit != 'true'
-      run: .github/scripts/Linux/download_build_sdl.sh
-    - name: Install Cached SDL
-      if: steps.cache-sdl.outputs.cache-hit == 'true'
-      run: .github/scripts/Linux/install_sdl.sh
     - name: configure
       run: "./autogen.sh $FEATURES || { RC=$?; cat config.log; exit $RC; }"
     - name: make