luanti-org · sfan5 · Jan 26, 2025 · Oct 14, 2024
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -73,7 +73,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 sdl2
+      vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry
     strategy:
       fail-fast: false
       matrix:

diff --git a/doc/compiling/linux.md b/doc/compiling/linux.md
@@ -22,27 +22,27 @@
 
 For Debian/Ubuntu users:
 
-    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
+    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
 
 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 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
+    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
 
 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 libvorbis-devel freetype2-devel SDL2-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 libXi-devel libvorbis-devel freetype2-devel
 
 For Arch users:
 
-    sudo pacman -S --needed base-devel libcurl-gnutls cmake libpng libjpeg-turbo sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses zstd gettext sdl2
+    sudo pacman -S --needed base-devel libcurl-gnutls cmake libxi libpng libjpeg-turbo sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses zstd gettext
 
 For Alpine users:
 
-    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
+    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
 
 For Void users:
 
-    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
+    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
 
 ## Download
 

diff --git a/doc/compiling/windows.md b/doc/compiling/windows.md
@@ -13,8 +13,9 @@
 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[tools] sdl2 --triplet x64-windows
+vcpkg install zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp gettext[tools] opengl-registry --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
@@ -21,7 +21,7 @@ Aside from standard search options (`ZLIB_INCLUDE_DIR`, `ZLIB_LIBRARY`, ...) the
 * `ENABLE_OPENGL` - Enable OpenGL driver
 * `ENABLE_OPENGL3` (default: `OFF`) - Enable OpenGL 3+ driver
 * `ENABLE_GLES2` - Enable OpenGL ES 2+ driver
-* `USE_SDL2` (default: platform-dependent, usually `ON`) - Use SDL2 instead of older native device code
+* `USE_SDL2` (default: ON for Android, OFF for other platforms) - 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(NOT APPLE)
+if(ANDROID)
 	set(DEFAULT_SDL2 ON)
 endif()
 

diff --git a/irr/src/COpenGLCoreTexture.h b/irr/src/COpenGLCoreTexture.h
@@ -232,7 +232,7 @@ class COpenGLCoreTexture : public ITexture
 #endif
 			GLint max_samples = 0;
 			GL.GetIntegerv(GL_MAX_SAMPLES, &max_samples);
-			MSAA = std::min(MSAA, (u8)max_samples);
+			MSAA = core::min_(MSAA, (u8)max_samples);
 
 			if (use_gl_impl)
 				GL.TexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, MSAA, InternalFormat, Size.Width, Size.Height, GL_TRUE);

diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
@@ -42,7 +42,6 @@ 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,7 +42,6 @@ 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
@@ -88,9 +88,6 @@ 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/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 libsdl2-dev libfreetype-dev
+		libpng-dev libjpeg-dev libgl1-mesa-dev libxi-dev libfreetype-dev
 		libsqlite3-dev libhiredis-dev libogg-dev libgmp-dev libvorbis-dev
 		libopenal-dev libpq-dev libleveldb-dev libcurl4-openssl-dev libzstd-dev
 		libssl-dev