Skip to content

Commit c6c2c4f

Browse files
authored
Revert "Disable SDL2 for 5.9.0 (luanti-org#14944)" (luanti-org#14959)
This reverts commit ebaf3c8.
1 parent 1222750 commit c6c2c4f

File tree

11 files changed

+20
-13
lines changed

11 files changed

+20
-13
lines changed

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
env:
7272
VCPKG_VERSION: 01f602195983451bc83e72f4214af2cbc495aa94
7373
# 2024.05.24
74-
vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry
74+
vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp sdl2
7575
strategy:
7676
fail-fast: false
7777
matrix:

android/native/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
compileSdk 34
99
targetSdkVersion 34
1010
externalNativeBuild {
11-
cmake {
11+
cmake {
1212
arguments "-DANDROID_STL=c++_shared",
1313
"-DENABLE_CURL=1", "-DENABLE_SOUND=1",
1414
"-DENABLE_GETTEXT=1",

doc/compiling/linux.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,27 @@
2121

2222
For Debian/Ubuntu users:
2323

24-
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
24+
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
2525

2626
For Fedora users:
2727

28-
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
28+
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
2929

3030
For openSUSE users:
3131

32-
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
32+
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
3333

3434
For Arch users:
3535

36-
sudo pacman -S --needed base-devel libcurl-gnutls cmake libxi libpng sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses zstd gettext
36+
sudo pacman -S --needed base-devel libcurl-gnutls cmake libpng sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses zstd gettext sdl2
3737

3838
For Alpine users:
3939

40-
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
40+
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
4141

4242
For Void users:
4343

44-
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
44+
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
4545

4646
## Download
4747

doc/compiling/windows.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
It is highly recommended to use vcpkg as package manager.
1414

1515
After you successfully built vcpkg you can easily install the required libraries:
16-
1716
```powershell
18-
vcpkg install zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp gettext opengl-registry --triplet x64-windows
17+
vcpkg install zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp gettext sdl2 --triplet x64-windows
1918
```
2019

2120
- `curl` is optional, but required to read the serverlist, `curl[winssl]` is required to use the content store.

irr/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Aside from standard search options (`ZLIB_INCLUDE_DIR`, `ZLIB_LIBRARY`, ...) the
2222
* `ENABLE_OPENGL3` (default: `OFF`) - Enable OpenGL 3+ driver
2323
* `ENABLE_GLES1` - Enable OpenGL ES driver, legacy
2424
* `ENABLE_GLES2` - Enable OpenGL ES 2+ driver
25-
* `USE_SDL2` (default: ON for Android, OFF for other platforms) - Use SDL2 instead of older native device code
25+
* `USE_SDL2` (default: platform-dependent, usually `ON`) - Use SDL2 instead of older native device code
2626

2727
However, IrrlichtMt cannot be built or installed separately.
2828

irr/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# When enabling SDL2 by default on macOS, don't forget to change
22
# "NSHighResolutionCapable" to true in "Info.plist".
3-
if(ANDROID)
3+
if(NOT APPLE)
44
set(DEFAULT_SDL2 ON)
55
endif()
66

util/buildbot/buildwin32.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ download "$libhost/llvm/libleveldb-$leveldb_version-win32.zip"
4242
download "$libhost/llvm/openal-soft-$openal_version-win32.zip"
4343
download "$libhost/llvm/libjpeg-$libjpeg_version-win32.zip"
4444
download "$libhost/llvm/libpng-$libpng_version-win32.zip"
45+
download "$libhost/llvm/sdl2-$sdl2_version-win32.zip"
4546

4647
# Set source dir, downloading Minetest as needed
4748
get_sources

util/buildbot/buildwin64.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ download "$libhost/llvm/libleveldb-$leveldb_version-win64.zip"
4242
download "$libhost/llvm/openal-soft-$openal_version-win64.zip"
4343
download "$libhost/llvm/libjpeg-$libjpeg_version-win64.zip"
4444
download "$libhost/llvm/libpng-$libpng_version-win64.zip"
45+
download "$libhost/llvm/sdl2-$sdl2_version-win64.zip"
4546

4647
# Set source dir, downloading Minetest as needed
4748
get_sources

util/buildbot/common.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ zlib_version=1.3.1
1515
zstd_version=1.5.5
1616
libjpeg_version=3.0.1
1717
libpng_version=1.6.40
18+
sdl2_version=2.30.3
1819

1920
download () {
2021
local url=$1
@@ -87,6 +88,9 @@ add_cmake_libs () {
8788
-DJPEG_INCLUDE_DIR=$libdir/libjpeg/include
8889
-DJPEG_DLL="$(_dlls $libdir/libjpeg/bin/libjpeg*)"
8990

91+
-DCMAKE_PREFIX_PATH=$libdir/sdl2/lib/cmake
92+
-DSDL2_DLL="$(_dlls $libdir/sdl2/bin/*)"
93+
9094
-DZLIB_INCLUDE_DIR=$libdir/zlib/include
9195
-DZLIB_LIBRARY=$libdir/zlib/lib/libz.dll.a
9296
-DZLIB_DLL=$libdir/zlib/bin/zlib1.dll

util/buildbot/sha256sums.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ da6ad10632cf172992158e9ea0977a87914b5d5de93a972c3430b6a412237556 luajit-2024012
1919
2b1dabe83d478b398cf9226d96de7fa62c973365c4aea70d27ba5782fb49d2d0 luajit-20240125-win64.zip
2020
e2443451fe5c2066eb564c64b8a1762738a88b7fd749c8b5907fed45c785497b openal-soft-1.23.1-win32.zip
2121
cb041445a118469caefbad2647470cb8571c8337bce2adc07634011ab5625417 openal-soft-1.23.1-win64.zip
22+
574e0847e622ff09ab23e2b22b77685a2ab6ee43de3e2932f3e8a14a4d7b9338 sdl2-2.30.3-win32.zip
23+
6127afdfc7b6a4ade8caf9a7267748ffea974f729866dd5be96c7a69d2f0fee7 sdl2-2.30.3-win64.zip
2224
326701086a0ed66e09a9f3ec4d971654c13b6bd79cfdd079c947ecdcd6409525 sqlite3-3.44.2-win32.zip
2325
b2d474e3625f8f426b6cc5c0ecac831a1de46f7d1027bf4a9f6267b0b0411d42 sqlite3-3.44.2-win64.zip
2426
8af10515d57dbfee5d2106cd66cafa2adeb4270d4c6047ccbf7e8b5d2d50681c zlib-1.3.1-win32.zip

util/ci/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
install_linux_deps() {
55
local pkgs=(
66
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
88
libsqlite3-dev libhiredis-dev libogg-dev libgmp-dev libvorbis-dev
99
libopenal-dev libpq-dev libleveldb-dev libcurl4-openssl-dev libzstd-dev
1010
)

0 commit comments

Comments
 (0)