aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2022-07-21 20:35:33 +0200
committersfan5 <sfan5@live.de>2022-07-23 22:27:19 +0200
commit71f6a5f44e0cb0e4ef57e942987ec8e76139452c (patch)
treedccd95821aa784a4fe0c0665d878182d263996c1
parentd631f21024bac626babe2e8eac4505210d368ffa (diff)
downloadhax-minetest-server-71f6a5f44e0cb0e4ef57e942987ec8e76139452c.tar.gz
hax-minetest-server-71f6a5f44e0cb0e4ef57e942987ec8e76139452c.zip
Bump IrrlichtMt
-rw-r--r--.github/workflows/build.yml2
-rw-r--r--.github/workflows/macos.yml2
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--README.md8
-rwxr-xr-xutil/buildbot/buildwin32.sh2
-rwxr-xr-xutil/buildbot/buildwin64.sh2
-rw-r--r--util/ci/common.sh2
7 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1717a282d..c45743284 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -230,7 +230,7 @@ jobs:
with:
repository: minetest/irrlicht
path: lib/irrlichtmt/
- ref: "1.9.0mt6"
+ ref: "1.9.0mt7"
- name: Restore from cache and run vcpkg
uses: lukka/run-vcpkg@v7
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 7c0c01c25..7f0318c76 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -22,7 +22,7 @@ on:
- '.github/workflows/macos.yml'
env:
- IRRLICHT_TAG: 1.9.0mt6
+ IRRLICHT_TAG: 1.9.0mt7
MINETEST_GAME_REPO: https://github.com/minetest/minetest_game.git
MINETEST_GAME_BRANCH: master
MINETEST_GAME_NAME: minetest_game
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7be2de295..a24ae45b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ stages:
- deploy
variables:
- IRRLICHT_TAG: "1.9.0mt6"
+ IRRLICHT_TAG: "1.9.0mt7"
MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
diff --git a/README.md b/README.md
index 8d0e68e0c..bbd02aa94 100644
--- a/README.md
+++ b/README.md
@@ -144,19 +144,19 @@ Compiling
For Debian/Ubuntu users:
- sudo apt install g++ make libc6-dev cmake libpng-dev libjpeg-dev libxxf86vm-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
+ 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
For Fedora users:
- sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl-devel openal-soft-devel libvorbis-devel libXxf86vm-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
+ sudo dnf install make automake gcc gcc-c++ kernel-devel cmake libcurl-devel openal-soft-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
For Arch users:
- sudo pacman -S base-devel libcurl-gnutls cmake libxxf86vm libpng sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses zstd
+ sudo pacman -S base-devel libcurl-gnutls cmake libxi libpng sqlite libogg libvorbis openal freetype2 jsoncpp gmp luajit leveldb ncurses zstd
For Alpine users:
- sudo apk add build-base cmake libpng-dev jpeg-dev libxxf86vm-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
+ 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
#### Download
diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index 89d97c54e..e54c1af4d 100755
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -45,7 +45,7 @@ done
echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
# Get stuff
-irrlicht_version=1.9.0mt6
+irrlicht_version=1.9.0mt7
ogg_version=1.3.5
openal_version=1.21.1
vorbis_version=1.3.7
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index 5648962ed..af6b5b350 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -45,7 +45,7 @@ done
echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
# Get stuff
-irrlicht_version=1.9.0mt6
+irrlicht_version=1.9.0mt7
ogg_version=1.3.5
openal_version=1.21.1
vorbis_version=1.3.7
diff --git a/util/ci/common.sh b/util/ci/common.sh
index 27034b4fb..db525a61c 100644
--- a/util/ci/common.sh
+++ b/util/ci/common.sh
@@ -10,7 +10,7 @@ install_linux_deps() {
if [[ "$1" == "--no-irr" ]]; then
shift
else
- wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt6/ubuntu-bionic.tar.gz"
+ wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt7/ubuntu-bionic.tar.gz"
sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local
fi