Bump IrrlichtMt

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1717a282d4bd6c3475cbdfbd24714bbfc2c2159b..c457432844b1df9dff7bd80c3bd498e2ecf3fbfd 100644 (file)
--- 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 7c0c01c25b8c6d4e5fb18467e8ba7ac63abd28c3..7f0318c7650e7a3ecf7704fe4c6179c90670a6f8 100644 (file)
--- 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 7be2de29528f7017cb12fe75b54db995fd3e428d..a24ae45b0b867bdf5dc3d49718da2ed55470d16b 100644 (file)
--- 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 8d0e68e0cd7fa2fb297609db662dc98eaff9da7f..bbd02aa94b26254cb86ab47c75444a99d3ebf30d 100644 (file)
--- 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 89d97c54e160b16aa8485c88c1624910649ec125..e54c1af4d3a4d1ae876bec97abb3a36e33f166b9 100755 (executable)
--- 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 5648962edf5d2aff7eaf32695012643c84931bcf..af6b5b3501301630abd6c245b7adf0ad46ffb9c3 100755 (executable)
--- 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 27034b4fbcac196933305b5f6023aafcf169eb8c..db525a61c62aa209872ed3d027a8da7dd5545ccc 100644 (file)
--- 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