Explicitly disable SDL2 as it seems to have changed to default on

linuxserver · Jan 26, 2024 · 7ca2169 · 7ca2169
1 parent 0b74b74
commit 7ca2169
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -20,28 +20,22 @@ RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
-    bzip2-dev \
     cmake \
     curl-dev \
-    doxygen \
-    gettext-dev \
+    freetype-dev \
+    gettext \
     gmp-dev \
-    hiredis-dev \
-    icu-dev \
-    leveldb-dev \
-    libjpeg-turbo-dev \
+    jpeg-dev \
+    jsoncpp-dev \
     libogg-dev \
     libpng-dev \
-    openssl-dev \
-    libtool \
     libvorbis-dev \
     libxi-dev \
     luajit-dev \
     mesa-dev \
-    ncurses-dev \
     openal-soft-dev \
-    python3-dev \
     sqlite-dev \
+    zlib-dev \
     zstd-dev && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
@@ -79,7 +73,8 @@ RUN \
   tar xf /tmp/irrlicht.tar.gz -C \
     /tmp/irrlicht --strip-components=1 && \
   cd /tmp/irrlicht && \
-  cmake . && \
+  cmake . \
+    -DUSE_SDL2=0 && \
   make -j 4 && \
   make install && \
   echo "**** compile minetestserver ****" && \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -20,28 +20,22 @@ RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
-    bzip2-dev \
     cmake \
     curl-dev \
-    doxygen \
-    gettext-dev \
+    freetype-dev \
+    gettext \
     gmp-dev \
-    hiredis-dev \
-    icu-dev \
-    leveldb-dev \
-    libjpeg-turbo-dev \
+    jpeg-dev \
+    jsoncpp-dev \
     libogg-dev \
     libpng-dev \
-    openssl-dev \
-    libtool \
     libvorbis-dev \
     libxi-dev \
     luajit-dev \
     mesa-dev \
-    ncurses-dev \
     openal-soft-dev \
-    python3-dev \
     sqlite-dev \
+    zlib-dev \
     zstd-dev && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
@@ -79,7 +73,8 @@ RUN \
   tar xf /tmp/irrlicht.tar.gz -C \
     /tmp/irrlicht --strip-components=1 && \
   cd /tmp/irrlicht && \
-  cmake . && \
+  cmake . \
+    -DUSE_SDL2=0 && \
   make -j 4 && \
   make install && \
   echo "**** compile minetestserver ****" && \