From f3bb96ff719adc91cae2fd331bfbe3facfd665bf Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 26 Jan 2024 14:06:01 -0800 Subject: [PATCH] add sdl2 to image and pin irrlicht to specific bugfix --- Dockerfile | 4 +++- Dockerfile.aarch64 | 4 +++- README.md | 1 + readme-vars.yml | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 57da40d..a5ba9f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,6 +41,7 @@ RUN \ ncurses-dev \ openal-soft-dev \ python3-dev \ + sdl2-dev \ sqlite-dev \ zstd-dev && \ echo "**** install runtime packages ****" && \ @@ -53,6 +54,7 @@ RUN \ libstdc++ \ luajit \ lua-socket \ + sdl2 \ sqlite \ sqlite-libs \ zstd \ @@ -75,7 +77,7 @@ RUN \ IRRLICHT_VER=$(curl -sX GET "https://api.github.com/repos/minetest/irrlicht/releases/latest" \ | jq -r .tag_name) && \ curl -o /tmp/irrlicht.tar.gz \ - -L "https://github.com/minetest/irrlicht/archive/${IRRLICHT_VER}.tar.gz" && \ + -L "https://github.com/minetest/irrlicht/archive/9df2f0b9446799f9e6c67909f4bdda5cb8cd07ad.tar.gz" && \ tar xf /tmp/irrlicht.tar.gz -C \ /tmp/irrlicht --strip-components=1 && \ cd /tmp/irrlicht && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2f11a46..124e1f9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -41,6 +41,7 @@ RUN \ ncurses-dev \ openal-soft-dev \ python3-dev \ + sdl2-dev \ sqlite-dev \ zstd-dev && \ echo "**** install runtime packages ****" && \ @@ -53,6 +54,7 @@ RUN \ libstdc++ \ luajit \ lua-socket \ + sdl2 \ sqlite \ sqlite-libs \ zstd \ @@ -75,7 +77,7 @@ RUN \ IRRLICHT_VER=$(curl -sX GET "https://api.github.com/repos/minetest/irrlicht/releases/latest" \ | jq -r .tag_name) && \ curl -o /tmp/irrlicht.tar.gz \ - -L "https://github.com/minetest/irrlicht/archive/${IRRLICHT_VER}.tar.gz" && \ + -L "https://github.com/minetest/irrlicht/archive/9df2f0b9446799f9e6c67909f4bdda5cb8cd07ad.tar.gz" && \ tar xf /tmp/irrlicht.tar.gz -C \ /tmp/irrlicht --strip-components=1 && \ cd /tmp/irrlicht && \ diff --git a/README.md b/README.md index fcbad1a..c6a74bb 100644 --- a/README.md +++ b/README.md @@ -285,6 +285,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **26.01.24:** - Temporaroly pin irrlicht to continue building pending a bugfix release. * **23.12.23:** - Rebase to Alpine 3.19. * **12.07.23:** - Rebase to Alpine 3.18, remove minetest_game. * **06.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) diff --git a/readme-vars.yml b/readme-vars.yml index 6ec8483..6467e52 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,7 +49,8 @@ app_setup_block: | As per [upstream request](https://github.com/minetest/minetest/releases/tag/5.8.0) this image no longer includes [minetest_game](https://github.com/minetest/minetest_game), so if required you will need to either install via ContentDB or download it from their repo and copy to `/config/.minetest/games/minetest` # changelog changelogs: - - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} + - {date: "26.01.24:", desc: "Temporaroly pin irrlicht to continue building pending a bugfix release."} + - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - {date: "12.07.23:", desc: "Rebase to Alpine 3.18, remove minetest_game."} - {date: "06.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "09.04.23:", desc: "Build logic changes to copy devtest to default games."}