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 27fc9bd52..b10f74f8a 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -19,6 +19,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 libx11-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 libjack-jackd2-dev libnatpmp-dev libv4l-dev portaudio19-dev diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index f01230dbb..166306d72 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -104,18 +104,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 --enable-plugins ${{ env.CUDA_FEATURES }} ${{ env.FEATURES }} --enable-alsa --enable-v4l2 || { RC=$?; cat config.log; exit $RC; }" - name: make