Revert "Disable SDL2 for 5.9.0 (luanti-org#14944)" (luanti-org#14959)

rubenwardy · web-flow · commit c6c2c4f60f69 · 2024-08-11T20:18:11.000+02:00
This reverts commit ebaf3c8.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -71,7 +71,7 @@ jobs:
     env:
       VCPKG_VERSION: 01f602195983451bc83e72f4214af2cbc495aa94
       # 2024.05.24
-      vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry
+      vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp sdl2
     strategy:
       fail-fast: false
       matrix:
diff --git a/android/native/build.gradle b/android/native/build.gradle
@@ -8,7 +8,7 @@ android {
 		compileSdk 34
 		targetSdkVersion 34
 		externalNativeBuild {
-			cmake {
+            cmake {
 				arguments "-DANDROID_STL=c++_shared",
 					"-DENABLE_CURL=1", "-DENABLE_SOUND=1",
 					"-DENABLE_GETTEXT=1",
diff --git a/doc/compiling/linux.md b/doc/compiling/linux.md
@@ -21,27 +21,27 @@
 
 For Debian/Ubuntu users:
 
-    sudo apt install g++ make libc6-dev cmake libpng-dev libjpeg-dev libxi-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev libluajit-5.1-dev gettext
+    sudo apt install g++ make libc6-dev cmake libpng-dev libjpeg-dev libgl1-mesa-dev libsqlite3-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev libluajit-5.1-dev gettext libsdl2-dev
 
 For Fedora users:
 
-    sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl-devel openal-soft-devel libpng-devel libjpeg-devel libvorbis-devel libXi-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel libzstd-devel gettext
+    sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl-devel openal-soft-devel libpng-devel libjpeg-devel libvorbis-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel libzstd-devel gettext SDL2-devel
 
 For openSUSE users:
 
-	sudo zypper install gcc gcc-c++ cmake libjpeg8-devel libpng16-devel openal-soft-devel libcurl-devel sqlite3-devel luajit-devel libzstd-devel Mesa-libGL-devel libXi-devel libvorbis-devel freetype2-devel
+	sudo zypper install gcc gcc-c++ cmake libjpeg8-devel libpng16-devel openal-soft-devel libcurl-devel sqlite3-devel luajit-devel libzstd-devel Mesa-libGL-devel libvorbis-devel freetype2-devel SDL2-devel
 
 For Arch users:
 
-    sudo pacman -S --needed base-devel libcurl-gnutls cmake libxi libpng sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses zstd gettext
+    sudo pacman -S --needed base-devel libcurl-gnutls cmake libpng sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses zstd gettext sdl2
 
 For Alpine users:
 
-    sudo apk add build-base cmake libpng-dev jpeg-dev libxi-dev mesa-dev sqlite-dev libogg-dev libvorbis-dev openal-soft-dev curl-dev freetype-dev zlib-dev gmp-dev jsoncpp-dev luajit-dev zstd-dev gettext
+    sudo apk add build-base cmake libpng-dev jpeg-dev mesa-dev sqlite-dev libogg-dev libvorbis-dev openal-soft-dev curl-dev freetype-dev zlib-dev gmp-dev jsoncpp-dev luajit-dev zstd-dev gettext sdl2-dev
 
 For Void users:
 
-    sudo xbps-install cmake libpng-devel jpeg-devel libXi-devel mesa sqlite-devel libogg-devel libvorbis-devel libopenal-devel libcurl-devel freetype-devel zlib-devel gmp-devel jsoncpp-devel LuaJIT-devel zstd libzstd-devel gettext
+    sudo xbps-install cmake libpng-devel jpeg-devel mesa sqlite-devel libogg-devel libvorbis-devel libopenal-devel libcurl-devel freetype-devel zlib-devel gmp-devel jsoncpp-devel LuaJIT-devel zstd libzstd-devel gettext SDL2-devel
 
 ## Download
 
diff --git a/doc/compiling/windows.md b/doc/compiling/windows.md
@@ -13,9 +13,8 @@
 It is highly recommended to use vcpkg as package manager.
 
 After you successfully built vcpkg you can easily install the required libraries:
-
 ```powershell
-vcpkg install zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp gettext opengl-registry --triplet x64-windows
+vcpkg install zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp gettext sdl2 --triplet x64-windows
 ```
 
 - `curl` is optional, but required to read the serverlist, `curl[winssl]` is required to use the content store.
diff --git a/irr/README.md b/irr/README.md
@@ -22,7 +22,7 @@ Aside from standard search options (`ZLIB_INCLUDE_DIR`, `ZLIB_LIBRARY`, ...) the
 * `ENABLE_OPENGL3` (default: `OFF`) - Enable OpenGL 3+ driver
 * `ENABLE_GLES1` - Enable OpenGL ES driver, legacy
 * `ENABLE_GLES2` - Enable OpenGL ES 2+ driver
-* `USE_SDL2` (default: ON for Android, OFF for other platforms) - Use SDL2 instead of older native device code
+* `USE_SDL2` (default: platform-dependent, usually `ON`) - Use SDL2 instead of older native device code
 
 However, IrrlichtMt cannot be built or installed separately.
 	
diff --git a/irr/src/CMakeLists.txt b/irr/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 # When enabling SDL2 by default on macOS, don't forget to change
 # "NSHighResolutionCapable" to true in "Info.plist".
-if(ANDROID)
+if(NOT APPLE)
 	set(DEFAULT_SDL2 ON)
 endif()
 
diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
@@ -42,6 +42,7 @@ download "$libhost/llvm/libleveldb-$leveldb_version-win32.zip"
 download "$libhost/llvm/openal-soft-$openal_version-win32.zip"
 download "$libhost/llvm/libjpeg-$libjpeg_version-win32.zip"
 download "$libhost/llvm/libpng-$libpng_version-win32.zip"
+download "$libhost/llvm/sdl2-$sdl2_version-win32.zip"
 
 # Set source dir, downloading Minetest as needed
 get_sources
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
@@ -42,6 +42,7 @@ download "$libhost/llvm/libleveldb-$leveldb_version-win64.zip"
 download "$libhost/llvm/openal-soft-$openal_version-win64.zip"
 download "$libhost/llvm/libjpeg-$libjpeg_version-win64.zip"
 download "$libhost/llvm/libpng-$libpng_version-win64.zip"
+download "$libhost/llvm/sdl2-$sdl2_version-win64.zip"
 
 # Set source dir, downloading Minetest as needed
 get_sources
diff --git a/util/buildbot/common.sh b/util/buildbot/common.sh
@@ -15,6 +15,7 @@ zlib_version=1.3.1
 zstd_version=1.5.5
 libjpeg_version=3.0.1
 libpng_version=1.6.40
+sdl2_version=2.30.3
 
 download () {
 	local url=$1
@@ -87,6 +88,9 @@ add_cmake_libs () {
 		-DJPEG_INCLUDE_DIR=$libdir/libjpeg/include
 		-DJPEG_DLL="$(_dlls $libdir/libjpeg/bin/libjpeg*)"
 
+		-DCMAKE_PREFIX_PATH=$libdir/sdl2/lib/cmake
+		-DSDL2_DLL="$(_dlls $libdir/sdl2/bin/*)"
+
 		-DZLIB_INCLUDE_DIR=$libdir/zlib/include
 		-DZLIB_LIBRARY=$libdir/zlib/lib/libz.dll.a
 		-DZLIB_DLL=$libdir/zlib/bin/zlib1.dll
diff --git a/util/buildbot/sha256sums.txt b/util/buildbot/sha256sums.txt
@@ -19,6 +19,8 @@ da6ad10632cf172992158e9ea0977a87914b5d5de93a972c3430b6a412237556  luajit-2024012
 2b1dabe83d478b398cf9226d96de7fa62c973365c4aea70d27ba5782fb49d2d0  luajit-20240125-win64.zip
 e2443451fe5c2066eb564c64b8a1762738a88b7fd749c8b5907fed45c785497b  openal-soft-1.23.1-win32.zip
 cb041445a118469caefbad2647470cb8571c8337bce2adc07634011ab5625417  openal-soft-1.23.1-win64.zip
+574e0847e622ff09ab23e2b22b77685a2ab6ee43de3e2932f3e8a14a4d7b9338  sdl2-2.30.3-win32.zip
+6127afdfc7b6a4ade8caf9a7267748ffea974f729866dd5be96c7a69d2f0fee7  sdl2-2.30.3-win64.zip
 326701086a0ed66e09a9f3ec4d971654c13b6bd79cfdd079c947ecdcd6409525  sqlite3-3.44.2-win32.zip
 b2d474e3625f8f426b6cc5c0ecac831a1de46f7d1027bf4a9f6267b0b0411d42  sqlite3-3.44.2-win64.zip
 8af10515d57dbfee5d2106cd66cafa2adeb4270d4c6047ccbf7e8b5d2d50681c  zlib-1.3.1-win32.zip
diff --git a/util/ci/common.sh b/util/ci/common.sh
@@ -4,7 +4,7 @@
 install_linux_deps() {
 	local pkgs=(
 		cmake gettext postgresql
-		libpng-dev libjpeg-dev libgl1-mesa-dev libxi-dev libfreetype-dev
+		libpng-dev libjpeg-dev libgl1-mesa-dev libsdl2-dev libfreetype-dev
 		libsqlite3-dev libhiredis-dev libogg-dev libgmp-dev libvorbis-dev
 		libopenal-dev libpq-dev libleveldb-dev libcurl4-openssl-dev libzstd-dev
 	)

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`install_linux_deps() {`
`5`	`5`	`local pkgs=(`
`6`	`6`	`cmake gettext postgresql`
`7`		`- libpng-dev libjpeg-dev libgl1-mesa-dev libxi-dev libfreetype-dev`
	`7`	`+ libpng-dev libjpeg-dev libgl1-mesa-dev libsdl2-dev libfreetype-dev`
`8`	`8`	`libsqlite3-dev libhiredis-dev libogg-dev libgmp-dev libvorbis-dev`
`9`	`9`	`libopenal-dev libpq-dev libleveldb-dev libcurl4-openssl-dev libzstd-dev`
`10`	`10`	`)`