Drop SDL2

Ghabry · Ghabry · commit 7a3b8cf510f2 · 2026-05-26T21:22:26.000+02:00
diff --git a/LICENSE b/LICENSE
@@ -15,12 +15,12 @@ lhasa: ISC
 mpg123: LGPLv2.1+
 nlohmann-json: MIT
 ogg: BSD
-opus: BSD    
-opusfile: BSD   
+opus: BSD
+opusfile: BSD
 pixman: MIT
 png: zlib
 samplerate: BSD
-SDL2: zlib
+SDL3: zlib
 sndfile: LGPLv2.1+
 speexdsp: BSD
 vorbis: BSD
diff --git a/android/1_download_library.sh b/android/1_download_library.sh
@@ -162,14 +162,6 @@ download_and_extract $ICU_URL
 rm -f $ICUDATA_FILES
 download_and_extract $ICUDATA_URL
 
-# SDL2
-rm -rf $SDL2_DIR
-download_and_extract $SDL2_URL
-
-# SDL3
-rm -rf $SDL3_DIR
-download_and_extract $SDL3_URL
-
 # liblcf
 rm -rf liblcf
 download_liblcf
diff --git a/android/2_build_toolchain.sh b/android/2_build_toolchain.sh
@@ -31,30 +31,9 @@ if [ ! -f .patches-applied ]; then
 		patch -Np1 < ../pixman-cpufeatures.patch
 	)
 
-	# use android config
-	(cd $SDL2_DIR
-		mv include/SDL_config_android.h include/SDL_config.h
-		mkdir -p jni
-	)
-
 	touch .patches-applied
 fi
 
-# Install SDL2
-# FIXME: Remove this when SDL3 migration is done
-function install_lib_sdl {
-	# $1: platform (armeabi-v7a aarch64 x86 x86_x64)
-
-	pushd $SDL2_DIR
-	echo "APP_ABI := $1" >> "jni/Application.mk"
-	ndk-build NDK_PROJECT_PATH=. NDK_DEBUG=0 APP_BUILD_SCRIPT=./Android.mk APP_PLATFORM=android-$TARGET_API
-	mkdir -p $PLATFORM_PREFIX/lib
-	mkdir -p $PLATFORM_PREFIX/include/SDL2
-	cp libs/$1/* $PLATFORM_PREFIX/lib/
-	cp include/* $PLATFORM_PREFIX/include/SDL2/
-	cd ..
-}
-
 function build() {
 	# $1: Toolchain Name
 	# $2: Toolchain architecture
@@ -114,7 +93,6 @@ function build() {
 	install_lib $LHASA_DIR $LHASA_ARGS
 	install_lib_cmake $FMT_DIR $FMT_ARGS
 	install_lib_icu_cross
-	install_lib_sdl "$2"
 	install_lib_liblcf
 }
 
diff --git a/emscripten/1_download_library.sh b/emscripten/1_download_library.sh
@@ -142,10 +142,6 @@ download_and_extract $ICU_URL
 rm -f $ICUDATA_FILES
 download_and_extract $ICUDATA_URL
 
-# SDL2
-rm -rf $SDL2_DIR
-download_and_extract $SDL2_URL
-
 # SDL3
 rm -rf $SDL3_DIR
 download_and_extract $SDL3_URL
diff --git a/emscripten/2_build_toolchain.sh b/emscripten/2_build_toolchain.sh
@@ -121,14 +121,6 @@ install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS
 install_lib_meson $INIH_DIR $INIH_ARGS
 #install_lib $LHASA_DIR $LHASA_ARGS
 install_lib_cmake $FMT_DIR $FMT_ARGS
-
-# emscripten TARGET_HOST does not work for all libraries but SDL2 requires it
-export TARGET_HOST="asmjs-unknown-emscripten"
-rm -f config.cache
-install_lib $SDL2_DIR $SDL2_ARGS --disable-assembly --disable-threads --disable-cpuinfo
-rm -f config.cache
-unset TARGET_HOST
-
 install_lib_cmake $SDL3_DIR $SDL3_ARGS
 
 install_lib_icu_cross
diff --git a/emscripten/3_cleanup.sh b/emscripten/3_cleanup.sh
@@ -7,6 +7,4 @@ headermsg "Cleaning up library build folders and other stuff..."
 
 cleanup
 
-rm -rf SDL2/
-
 echo " -> done"
diff --git a/ios/1_download_library.sh b/ios/1_download_library.sh
@@ -100,10 +100,6 @@ download_and_extract $ICUDATA_URL
 
 msg " [3] Downloading platform libraries"
 
-# SDL2
-rm -rf $SDL2_DIR
-download_and_extract $SDL2_URL
-
 # SDL3
 rm -rf $SDL3_DIR
 download_and_extract $SDL3_URL
diff --git a/ios/2_build_toolchain.sh b/ios/2_build_toolchain.sh
@@ -89,7 +89,6 @@ function build() {
 	install_lib_icu_cross
 	icu_force_data_install
 	install_lib_liblcf
-	install_lib_cmake $SDL2_DIR $SDL2_ARGS
 	install_lib_cmake $SDL3_DIR $SDL3_ARGS
 }
 
diff --git a/linux-static/1_download_library.sh b/linux-static/1_download_library.sh
@@ -98,10 +98,6 @@ download_and_extract $ICU_URL
 rm -f $ICUDATA_FILES
 download_and_extract $ICUDATA_URL
 
-# SDL2
-rm -rf $SDL2_DIR
-download_and_extract $SDL2_URL
-
 # SDL3
 rm -rf $SDL3_DIR
 download_and_extract $SDL3_URL
diff --git a/linux-static/2_build_toolchain.sh b/linux-static/2_build_toolchain.sh
@@ -66,7 +66,6 @@ install_lib $LHASA_DIR $LHASA_ARGS
 install_lib_cmake $FMT_DIR $FMT_ARGS
 install_lib $ICU_DIR/source $ICU_ARGS
 install_lib_liblcf
-install_lib $SDL2_DIR $SDL2_ARGS PULSEAUDIO_CFLAGS=-Ixxxdir PULSEAUDIO_LIBS=-lxxxlib
 install_lib_cmake $FREEIMAGE_DIR $FREEIMAGE_ARGS
 
 # Ensure that SDL3 finds the system libraries
diff --git a/macos/1_download_library.sh b/macos/1_download_library.sh
@@ -100,10 +100,6 @@ download_and_extract $ICUDATA_URL
 
 msg " [3] Downloading platform libraries"
 
-# SDL2
-rm -rf $SDL2_DIR
-download_and_extract $SDL2_URL
-
 # SDL3
 rm -rf $SDL3_DIR
 download_and_extract $SDL3_URL
diff --git a/macos/2_build_toolchain.sh b/macos/2_build_toolchain.sh
@@ -88,7 +88,6 @@ function build() {
 	install_lib_cmake $FMT_DIR $FMT_ARGS
 	install_lib_icu_cross
 	icu_force_data_install
-	install_lib $SDL2_DIR $SDL2_ARGS --disable-assembly
 	install_lib_cmake $SDL3_DIR $SDL3_ARGS
 	install_lib_cmake $FREEIMAGE_DIR $FREEIMAGE_ARGS
 	install_lib_liblcf
diff --git a/shared/common.sh b/shared/common.sh
@@ -67,7 +67,7 @@ function download_liblcf {
 # color check
 HAVE_COLORS=0
 if [ -t 1 ] ; then
-	HAVE_COLORS=1	
+	HAVE_COLORS=1
 fi
 
 function colormsg {
@@ -404,7 +404,7 @@ function cleanup {
 	rm -rf zlib-*/ libpng-*/ freetype-*/ harfbuzz-*/ pixman-*/ expat-*/ libogg-*/ \
 	libvorbis-*/ tremor-*/ mpg123-*/ libsndfile-*/ libxmp-lite-*/ speexdsp-*/ \
 	libsamplerate-*/ wildmidi-*/ opus-*/ opusfile-*/ icu/ icu-native/ icu-cross/ \
-	SDL2-*/ SDL3-*/ fmt-*/ FluidLite-*/ fluidsynth-*/ json-*/ inih-*/ \
+	SDL3-*/ fmt-*/ FluidLite-*/ fluidsynth-*/ json-*/ inih-*/ \
 	lhasa-*/ freeimage-* liblcf/
 	rm -f *.zip *.bz2 *.gz *.xz *.tgz icudt* .patches-applied config.cache meson-cross.txt
 	rm -rf sbin/ share/
diff --git a/shared/packages.ini b/shared/packages.ini
@@ -165,12 +165,6 @@ url = https://ci.easyrpg.org/job/icudata/lastSuccessfulBuild/artifact/icudata${v
 files = "icudt*.dat"
 anitya_id = 379847
 
-[SDL2]
-comment = Remove when SDL3 migration is done
-version = 2.32.10
-url = "https://libsdl.org/release/SDL2-${version}.tar.gz"
-anitya_id = 4779
-
 [SDL3]
 version = 3.4.4
 url = "https://libsdl.org/release/SDL3-${version}.tar.gz"
diff --git a/shared/packages.sh b/shared/packages.sh
@@ -105,10 +105,6 @@ ICU_ARGS="--enable-strict=no --disable-tests --disable-samples \
 ICUDATA_URL=https://ci.easyrpg.org/job/icudata/lastSuccessfulBuild/artifact/icudata78_all.tar.gz
 ICUDATA_FILES="icudt*.dat"
 
-# Remove when SDL3 migration is done
-SDL2_URL="https://libsdl.org/release/SDL2-2.32.10.tar.gz"
-SDL2_DIR="SDL2-2.32.10"
-
 SDL3_URL="https://libsdl.org/release/SDL3-3.4.4.tar.gz"
 SDL3_ARGS="-DSDL_TEST_LIBRARY=OFF -DSDL_EXAMPLES=OFF"
 SDL3_DIR="SDL3-3.4.4"
diff --git a/tvos/1_download_library.sh b/tvos/1_download_library.sh
@@ -100,10 +100,6 @@ download_and_extract $ICUDATA_URL
 
 msg " [3] Downloading platform libraries"
 
-# SDL2
-rm -rf $SDL2_DIR
-download_and_extract $SDL2_URL
-
 # SDL3
 rm -rf $SDL3_DIR
 download_and_extract $SDL3_URL
diff --git a/tvos/2_build_toolchain.sh b/tvos/2_build_toolchain.sh
@@ -89,7 +89,6 @@ function build() {
 	install_lib_icu_cross
 	icu_force_data_install
 	install_lib_liblcf
-	install_lib_cmake $SDL2_DIR $SDL2_ARGS
 	install_lib_cmake $SDL3_DIR $SDL3_ARGS
 }
 
diff --git a/windows/build.cmd b/windows/build.cmd
@@ -10,12 +10,12 @@ vcpkg install --triplet x86-windows-static --recurse^
  libvorbis[core] libsndfile[core] wildmidi[core] libxmp[core]^
  speexdsp[core] mpg123[core] opusfile[core] fluidsynth[core]^
  inih[cpp] lhasa-easyrpg[core]^
- sdl2[core] sdl3[core] icu-easyrpg[core] nlohmann-json[core] fmt[core]
+ sdl3[core] icu-easyrpg[core] nlohmann-json[core] fmt[core]
 
 :: Build 64-bit libraries
 vcpkg install --triplet x64-windows-static --recurse^
  libpng[core] expat[core] pixman[core] freetype[core,zlib] harfbuzz[freetype]^
  libvorbis[core] libsndfile[core] wildmidi[core] libxmp[core]^
  speexdsp[core] mpg123[core] opusfile[core] fluidsynth[core]^
  inih[cpp] lhasa-easyrpg[core]^
- sdl2[core] sdl3[core] icu-easyrpg[core] nlohmann-json[core] fmt[core]
+ sdl3[core] icu-easyrpg[core] nlohmann-json[core] fmt[core]

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ function build() {`
`89`	`89`	`install_lib_icu_cross`
`90`	`90`	`icu_force_data_install`
`91`	`91`	`install_lib_liblcf`
`92`		`- install_lib_cmake $SDL2_DIR $SDL2_ARGS`
`93`	`92`	`install_lib_cmake $SDL3_DIR $SDL3_ARGS`
`94`	`93`	`}`
`95`	`94`