From ea21628045860c6f4b39b411d0a43ae32f51ccc7 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Tue, 22 Nov 2022 06:36:19 +0100
Subject: [PATCH] ci: replace references to SDL2 with SDL3
---
.github/workflows/android.yml | 14 +++++++-------
.github/workflows/emscripten.yml | 4 ++--
.github/workflows/main.yml | 30 +++++++++++++++---------------
.github/workflows/msvc.yml | 6 +++---
.github/workflows/n3ds.yml | 4 ++--
.github/workflows/ps2.yaml | 12 ++++++------
.github/workflows/psp.yaml | 12 ++++++------
.github/workflows/riscos.yml | 6 +++---
.github/workflows/vita.yaml | 12 ++++++------
.github/workflows/watcom.yml | 2 +-
10 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index ccc02666f132..0cfda01d11f8 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -50,7 +50,7 @@ jobs:
if: ${{ matrix.platform.name == 'CMake' }}
run: |
cmake --install build --config Release
- echo "SDL2_DIR=$(pwd)/prefix" >> $GITHUB_ENV
+ echo "SDL3_DIR=$(pwd)/prefix" >> $GITHUB_ENV
( cd prefix; find ) | LC_ALL=C sort -u
- name: Verify CMake configuration files
if: ${{ matrix.platform.name == 'CMake' }}
@@ -60,22 +60,22 @@ jobs:
-DANDROID_PLATFORM=${{ matrix.platform.android_platform }} \
-DANDROID_ABI=${{ matrix.platform.android_abi }} \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }}
+ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }}
cmake --build cmake_config_build --verbose
- - name: Verify sdl2-config
+ - name: Verify sdl3-config
if: ${{ matrix.platform.name == 'CMake' }}
run: |
export CC="${{ steps.setup_ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=${{ matrix.platform.arch }}-none-linux-androideabi${{ matrix.platform.android_platform }}"
- export PATH=${{ env.SDL2_DIR }}/bin:$PATH
+ export PATH=${{ env.SDL3_DIR }}/bin:$PATH
cmake/test/test_sdlconfig.sh
- - name: Verify sdl2.pc
+ - name: Verify sdl3.pc
if: ${{ matrix.platform.name == 'CMake' }}
run: |
export CC="${{ steps.setup_ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=${{ matrix.platform.arch }}-none-linux-androideabi${{ matrix.platform.android_platform }}"
- export PKG_CONFIG_PATH=${{ env.SDL2_DIR }}/lib/pkgconfig
+ export PKG_CONFIG_PATH=${{ env.SDL3_DIR }}/lib/pkgconfig
cmake/test/test_pkgconfig.sh
- name: Verify Android.mk
if: ${{ matrix.platform.name == 'CMake' }}
run: |
- export NDK_MODULE_PATH=${{ env.SDL2_DIR }}/share/ndk-modules
+ export NDK_MODULE_PATH=${{ env.SDL3_DIR }}/share/ndk-modules
ndk-build -C ${{ github.workspace }}/cmake/test APP_PLATFORM=android-${{ matrix.platform.android_platform }} APP_ABI=${{ matrix.platform.android_abi }} NDK_OUT=$PWD NDK_LIBS_OUT=$PWD V=1
diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
index 56f77b6ce0b4..0a5cd7bc1797 100644
--- a/.github/workflows/emscripten.yml
+++ b/.github/workflows/emscripten.yml
@@ -33,7 +33,7 @@ jobs:
# ctest -VV --test-dir build/
- name: Install
run: |
- echo "SDL2_DIR=$(pwd)/prefix" >> $GITHUB_ENV
+ echo "SDL3_DIR=$(pwd)/prefix" >> $GITHUB_ENV
cmake --install build/
- name: Verify CMake configuration files
run: |
@@ -41,5 +41,5 @@ jobs:
-DCMAKE_BUILD_TYPE=Release \
-DSDL_VENDOR_INFO="Github Workflow" \
-DTEST_SHARED=FALSE \
- -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }}
+ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }}
cmake --build cmake_config_build --verbose
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b09ae9447a8e..250f8905ce53 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -88,14 +88,14 @@ jobs:
ctest -VV --test-dir build/
if test "${{ runner.os }}" = "Linux"; then
# This should show us the SDL_REVISION
- strings build/libSDL2-2.0.so.0 | grep SDL-
+ strings build/libSDL3-3.0.so.0 | grep SDL-
fi
- name: Install (CMake)
if: "! matrix.platform.autotools"
run: |
set -eu
cmake --install build/ --config Release
- echo "SDL2_DIR=$(pwd)/cmake_prefix" >> $GITHUB_ENV
+ echo "SDL3_DIR=$(pwd)/cmake_prefix" >> $GITHUB_ENV
( cd cmake_prefix; find ) | LC_ALL=C sort -u
- name: Configure (Autotools)
if: matrix.platform.autotools
@@ -123,8 +123,8 @@ jobs:
--x-libraries="/usr/lib/${multiarch}" \
--prefix=${{ github.workspace }}/autotools_prefix \
SDL_CFLAGS="-I${curdir}/include" \
- SDL_LIBS="-L${curdir}/build-autotools/build/.libs -lSDL2" \
- ac_cv_lib_SDL2_ttf_TTF_Init=no \
+ SDL_LIBS="-L${curdir}/build-autotools/build/.libs -lSDL3" \
+ ac_cv_lib_SDL3_ttf_TTF_Init=no \
${NULL+}
)
fi
@@ -147,7 +147,7 @@ jobs:
make -j"${parallel}" -C build-autotools/test check LD_LIBRARY_PATH="${curdir}/build-autotools/build/.libs"
if test "${{ runner.os }}" = "Linux"; then
# This should show us the SDL_REVISION
- strings "${curdir}/build-autotools/build/.libs/libSDL2-2.0.so.0" | grep SDL-
+ strings "${curdir}/build-autotools/build/.libs/libSDL3-3.0.so.0" | grep SDL-
fi
- name: Install (Autotools)
if: matrix.platform.autotools
@@ -160,20 +160,20 @@ jobs:
make -j"${parallel}" -C build-autotools/test install V=1
fi
( cd autotools_prefix; find . ) | LC_ALL=C sort -u
- echo "SDL2_DIR=$(pwd)/autotools_prefix" >> $GITHUB_ENV
+ echo "SDL3_DIR=$(pwd)/autotools_prefix" >> $GITHUB_ENV
- name: Verify CMake configuration files
run: |
cmake -S cmake/test -B cmake_config_build -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }}
+ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }}
cmake --build cmake_config_build --verbose
- - name: Verify sdl2-config
+ - name: Verify sdl3-config
run: |
- export PATH=${{ env.SDL2_DIR }}/bin:$PATH
+ export PATH=${{ env.SDL3_DIR }}/bin:$PATH
cmake/test/test_sdlconfig.sh
- - name: Verify sdl2.pc
+ - name: Verify sdl3.pc
run: |
- export PKG_CONFIG_PATH=${{ env.SDL2_DIR }}/lib/pkgconfig
+ export PKG_CONFIG_PATH=${{ env.SDL3_DIR }}/lib/pkgconfig
cmake/test/test_pkgconfig.sh
- name: Distcheck (Autotools)
if: matrix.platform.autotools
@@ -184,9 +184,9 @@ jobs:
# Similar to Automake `make distcheck`: check that the tarball
# release is sufficient to do a new build
mkdir distcheck
- tar -C distcheck -zxf build-autotools/SDL2-*.tar.gz
- ( cd distcheck/SDL2-* && ./configure )
- make -j"${parallel}" -C distcheck/SDL2-*
+ tar -C distcheck -zxf build-autotools/SDL3-*.tar.gz
+ ( cd distcheck/SDL3-* && ./configure )
+ make -j"${parallel}" -C distcheck/SDL3-*
- name: Run installed-tests (Autotools)
if: "runner.os == 'Linux' && matrix.platform.autotools"
run: |
@@ -203,4 +203,4 @@ jobs:
LD_LIBRARY_PATH=/usr/local/lib \
SDL_AUDIODRIVER=dummy \
SDL_VIDEODRIVER=dummy \
- ginsttest-runner --tap SDL2
+ ginsttest-runner --tap SDL3
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
index 78fb73a7c681..01d95485da10 100644
--- a/.github/workflows/msvc.yml
+++ b/.github/workflows/msvc.yml
@@ -44,7 +44,7 @@ jobs:
-DSDL_TESTS=ON `
-DSDL_INSTALL_TESTS=ON `
-DSDL_VENDOR_INFO="Github Workflow" `
- -DSDL2_DISABLE_INSTALL=OFF `
+ -DSDL3_DISABLE_INSTALL=OFF `
${{ matrix.platform.flags }} `
-DCMAKE_INSTALL_PREFIX=prefix
- name: Build (CMake)
@@ -56,13 +56,13 @@ jobs:
ctest -VV --test-dir build/ -C Release
- name: Install (CMake)
run: |
- echo "SDL2_DIR=$Env:GITHUB_WORKSPACE/prefix" >> $Env:GITHUB_ENV
+ echo "SDL3_DIR=$Env:GITHUB_WORKSPACE/prefix" >> $Env:GITHUB_ENV
cmake --install build/
- name: Verify CMake configuration files
if: ${{ !contains(matrix.platform.name, 'UWP') }} # FIXME: cmake/test/CMakeLists.txt should support UWP
run: |
cmake -S cmake/test -B cmake_config_build `
- -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} `
+ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }} `
${{ matrix.platform.flags }}
cmake --build cmake_config_build --config Release
diff --git a/.github/workflows/n3ds.yml b/.github/workflows/n3ds.yml
index f35577e669db..b7d7d9d11c24 100644
--- a/.github/workflows/n3ds.yml
+++ b/.github/workflows/n3ds.yml
@@ -27,7 +27,7 @@ jobs:
run: cmake --build build --verbose
- name: Install CMake
run: |
- echo "SDL2_DIR=$(pwd)/prefix" >> $GITHUB_ENV
+ echo "SDL3_DIR=$(pwd)/prefix" >> $GITHUB_ENV
cmake --install build/
( cd prefix; find ) | LC_ALL=C sort -u
- name: Verify CMake configuration files
@@ -35,7 +35,7 @@ jobs:
cmake -S cmake/test -B cmake_config_build -G Ninja \
-DCMAKE_TOOLCHAIN_FILE=${DEVKITPRO}/cmake/3DS.cmake \
-DTEST_SHARED=FALSE \
- -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \
+ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }} \
-DCMAKE_BUILD_TYPE=Release
cmake --build cmake_config_build --verbose
# Not running test_pkgconfig.sh and test_sdlconfig.sh
diff --git a/.github/workflows/ps2.yaml b/.github/workflows/ps2.yaml
index bfb0b1ceb38f..e36905aa89b7 100644
--- a/.github/workflows/ps2.yaml
+++ b/.github/workflows/ps2.yaml
@@ -36,7 +36,7 @@ jobs:
run: |
set -eu
cmake --install build/ --config Release
- echo "SDL2_DIR=$(pwd)/cmake_prefix" >> $GITHUB_ENV
+ echo "SDL3_DIR=$(pwd)/cmake_prefix" >> $GITHUB_ENV
( cd cmake_prefix; find ) | LC_ALL=C sort -u
- name: Verify CMake configuration files
@@ -44,20 +44,20 @@ jobs:
cmake -S cmake/test -B cmake_config_build -G Ninja \
-DCMAKE_TOOLCHAIN_FILE=$PS2DEV/ps2sdk/ps2dev.cmake \
-DTEST_SHARED=FALSE \
- -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \
+ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }} \
-DCMAKE_BUILD_TYPE=Release
cmake --build cmake_config_build --verbose
- - name: Verify sdl2-config
+ - name: Verify sdl3-config
run: |
export CC=mips64r5900el-ps2-elf-gcc
- export PATH=${{ env.SDL2_DIR }}/bin:$PATH
+ export PATH=${{ env.SDL3_DIR }}/bin:$PATH
export EXTRA_LDFLAGS="-L$PS2DEV/ps2sdk/ee/lib -L$PS2DEV/gsKit/lib -L$PS2DEV/ps2sdk/ports/lib"
cmake/test/test_sdlconfig.sh
- - name: Verify sdl2.pc
+ - name: Verify sdl3.pc
run: |
export CC=mips64r5900el-ps2-elf-gcc
export EXTRA_LDFLAGS="-L$PS2DEV/ps2sdk/ee/lib -L$PS2DEV/gsKit/lib -L$PS2DEV/ps2sdk/ports/lib"
- export PKG_CONFIG_PATH=${{ env.SDL2_DIR }}/lib/pkgconfig
+ export PKG_CONFIG_PATH=${{ env.SDL3_DIR }}/lib/pkgconfig
cmake/test/test_pkgconfig.sh
- name: Get short SHA
diff --git a/.github/workflows/psp.yaml b/.github/workflows/psp.yaml
index addc7b11fc26..80c42c92a70c 100644
--- a/.github/workflows/psp.yaml
+++ b/.github/workflows/psp.yaml
@@ -25,26 +25,26 @@ jobs:
run: cmake --build build --config Release
- name: Install
run: |
- echo "SDL2_DIR=$(pwd)/prefix" >> $GITHUB_ENV
+ echo "SDL3_DIR=$(pwd)/prefix" >> $GITHUB_ENV
cmake --install build --config Release
( cd prefix; find ) | LC_ALL=C sort -u
- name: Verify CMake configuration files
run: |
cmake -S cmake/test -B cmake_config_build \
-DCMAKE_TOOLCHAIN_FILE=$PSPDEV/psp/share/pspdev.cmake \
- -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \
+ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }} \
-DTEST_SHARED=FALSE \
-DCMAKE_BUILD_TYPE=Release
cmake --build cmake_config_build --verbose
- - name: Verify sdl2-config
+ - name: Verify sdl3-config
run: |
export CC=psp-gcc
- export PATH=${{ env.SDL2_DIR }}/bin:$PATH
+ export PATH=${{ env.SDL3_DIR }}/bin:$PATH
export EXTRA_LDFLAGS="-L$PSPDEV/lib -L$PSPDEV/psp/lib -L$PSPDEV/psp/sdk/lib"
cmake/test/test_sdlconfig.sh
- - name: Verify sdl2.pc
+ - name: Verify sdl3.pc
run: |
export CC=psp-gcc
- export PKG_CONFIG_PATH=${{ env.SDL2_DIR }}/lib/pkgconfig
+ export PKG_CONFIG_PATH=${{ env.SDL3_DIR }}/lib/pkgconfig
export EXTRA_LDFLAGS="-L$PSPDEV/lib -L$PSPDEV/psp/lib -L$PSPDEV/psp/sdk/lib"
cmake/test/test_pkgconfig.sh
diff --git a/.github/workflows/riscos.yml b/.github/workflows/riscos.yml
index 1fec840664fb..2f4aca27d7c9 100644
--- a/.github/workflows/riscos.yml
+++ b/.github/workflows/riscos.yml
@@ -34,7 +34,7 @@ jobs:
- name: Install (autotools)
if: ${{ contains(matrix.platform.name, 'autotools') }}
run: |
- echo "SDL2_DIR=${{ github.workspace }}/prefix_autotools" >> $GITHUB_ENV
+ echo "SDL3_DIR=${{ github.workspace }}/prefix_autotools" >> $GITHUB_ENV
make -C build_autotools install
( cd ${{ github.workspace }}/prefix_autotools; find ) | LC_ALL=C sort -u
- name: Configure (CMake)
@@ -55,14 +55,14 @@ jobs:
- name: Install (CMake)
if: ${{ contains(matrix.platform.name, 'CMake') }}
run: |
- echo "SDL2_DIR=${{ github.workspace }}/prefix_cmake" >> $GITHUB_ENV
+ echo "SDL3_DIR=${{ github.workspace }}/prefix_cmake" >> $GITHUB_ENV
cmake --install build/
( cd ${{ github.workspace }}/prefix_cmake; find ) | LC_ALL=C sort -u
- name: Verify CMake configuration files
run: |
cmake -S cmake/test -B cmake_config_build -G Ninja \
-DCMAKE_TOOLCHAIN_FILE=/home/riscos/env/toolchain-riscos.cmake \
- -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \
+ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }} \
-DCMAKE_BUILD_TYPE=Release \
${{ matrix.platform.test_args }}
cmake --build cmake_config_build --verbose
diff --git a/.github/workflows/vita.yaml b/.github/workflows/vita.yaml
index ac3b17c43515..a73114d04699 100644
--- a/.github/workflows/vita.yaml
+++ b/.github/workflows/vita.yaml
@@ -30,7 +30,7 @@ jobs:
run: cmake --build build --verbose
- name: Install CMake
run: |
- echo "SDL2_DIR=$(pwd)/prefix" >> $GITHUB_ENV
+ echo "SDL3_DIR=$(pwd)/prefix" >> $GITHUB_ENV
cmake --install build/
( cd prefix; find ) | LC_ALL=C sort -u
- name: Verify CMake configuration files
@@ -38,16 +38,16 @@ jobs:
cmake -S cmake/test -B cmake_config_build -G Ninja \
-DCMAKE_TOOLCHAIN_FILE=${VITASDK}/share/vita.toolchain.cmake \
-DTEST_SHARED=FALSE \
- -DCMAKE_PREFIX_PATH=${{ env.SDL2_DIR }} \
+ -DCMAKE_PREFIX_PATH=${{ env.SDL3_DIR }} \
-DCMAKE_BUILD_TYPE=Release
cmake --build cmake_config_build --verbose
- - name: Verify sdl2-config
+ - name: Verify sdl3-config
run: |
export CC=arm-vita-eabi-gcc
- export PATH=${{ env.SDL2_DIR }}/bin:$PATH
+ export PATH=${{ env.SDL3_DIR }}/bin:$PATH
cmake/test/test_sdlconfig.sh
- - name: Verify sdl2.pc
+ - name: Verify sdl3.pc
run: |
export CC=arm-vita-eabi-gcc
- export PKG_CONFIG_PATH=${{ env.SDL2_DIR }}/lib/pkgconfig
+ export PKG_CONFIG_PATH=${{ env.SDL3_DIR }}/lib/pkgconfig
cmake/test/test_pkgconfig.sh
diff --git a/.github/workflows/watcom.yml b/.github/workflows/watcom.yml
index bef3cf957239..13f1505ffff2 100644
--- a/.github/workflows/watcom.yml
+++ b/.github/workflows/watcom.yml
@@ -16,7 +16,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: open-watcom/setup-watcom@v0
- - name: Build SDL2
+ - name: Build
run: |
wmake -f ${{ matrix.platform.makefile }} ENABLE_WERROR=1
- name: Build tests