BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

master #6

Merged
BRNSystems merged 85 commits from Mirrorlandia_minetest/minetest:master into master 2024-01-09 17:53:52 +01:00
Conversation 0 Commits 85 Files Changed 187 +54 -50
6 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5d3e830176 - Show all commits

4
.github/workflows/build.yml vendored
View File

@ -164,7 +164,7 @@ jobs:
win32: win32:
name: "MinGW cross-compiler (32-bit)" name: "MinGW cross-compiler (32-bit)"
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install compiler - name: Install compiler
@ -184,7 +184,7 @@ jobs:
win64: win64:
name: "MinGW cross-compiler (64-bit)" name: "MinGW cross-compiler (64-bit)"
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Install compiler - name: Install compiler

15
util/buildbot/buildwin32.sh
View File

@ -33,22 +33,21 @@ irrlicht_version=$(cat $topdir/../../misc/irrlichtmt_tag.txt)
mkdir -p $libdir mkdir -p $libdir
# 'dw2' just points to rebuilt versions after a toolchain change # 'ucrt' just points to rebuilt versions after a toolchain change
# this distinction should be gotten rid of next time
cd $libdir cd $libdir
libhost="http://minetest.kitsunemimi.pw" libhost="http://minetest.kitsunemimi.pw"
download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32.zip" irrlicht-$irrlicht_version-win32.zip download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win32-ucrt.zip" irrlicht-$irrlicht_version-win32.zip
download "$libhost/zlib-$zlib_version-win32.zip" download "$libhost/zlib-$zlib_version-win32.zip"
download "$libhost/zstd-$zstd_version-win32.zip" download "$libhost/ucrt/zstd-$zstd_version-win32.zip"
download "$libhost/libogg-$ogg_version-win32.zip" download "$libhost/ucrt/libogg-$ogg_version-win32.zip"
download "$libhost/dw2/libvorbis-$vorbis_version-win32.zip" download "$libhost/ucrt/libvorbis-$vorbis_version-win32.zip"
download "$libhost/curl-$curl_version-win32.zip" download "$libhost/curl-$curl_version-win32.zip"
download "$libhost/gettext-$gettext_version-win32.zip" download "$libhost/ucrt/gettext-$gettext_version-win32.zip"
download "$libhost/freetype-$freetype_version-win32.zip" download "$libhost/freetype-$freetype_version-win32.zip"
download "$libhost/sqlite3-$sqlite3_version-win32.zip" download "$libhost/sqlite3-$sqlite3_version-win32.zip"
download "$libhost/luajit-$luajit_version-win32.zip" download "$libhost/luajit-$luajit_version-win32.zip"
download "$libhost/dw2/libleveldb-$leveldb_version-win32.zip" leveldb-$leveldb_version-win32.zip download "$libhost/ucrt/libleveldb-$leveldb_version-win32.zip" leveldb-$leveldb_version-win32.zip
download "$libhost/openal-soft-$openal_version-win32.zip" download "$libhost/openal-soft-$openal_version-win32.zip"
# Set source dir, downloading Minetest as needed # Set source dir, downloading Minetest as needed

14
util/buildbot/buildwin64.sh
View File

@ -33,19 +33,21 @@ irrlicht_version=$(cat $topdir/../../misc/irrlichtmt_tag.txt)
mkdir -p $libdir mkdir -p $libdir
# 'ucrt' just points to rebuilt versions after a toolchain change
cd $libdir cd $libdir
libhost="http://minetest.kitsunemimi.pw" libhost="http://minetest.kitsunemimi.pw"
download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win64.zip" irrlicht-$irrlicht_version-win64.zip download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win64-ucrt.zip" irrlicht-$irrlicht_version-win64.zip
download "$libhost/zlib-$zlib_version-win64.zip" download "$libhost/zlib-$zlib_version-win64.zip"
download "$libhost/zstd-$zstd_version-win64.zip" download "$libhost/ucrt/zstd-$zstd_version-win64.zip"
download "$libhost/libogg-$ogg_version-win64.zip" download "$libhost/ucrt/libogg-$ogg_version-win64.zip"
download "$libhost/libvorbis-$vorbis_version-win64.zip" download "$libhost/ucrt/libvorbis-$vorbis_version-win64.zip"
download "$libhost/curl-$curl_version-win64.zip" download "$libhost/curl-$curl_version-win64.zip"
download "$libhost/gettext-$gettext_version-win64.zip" download "$libhost/ucrt/gettext-$gettext_version-win64.zip"
download "$libhost/freetype-$freetype_version-win64.zip" download "$libhost/freetype-$freetype_version-win64.zip"
download "$libhost/sqlite3-$sqlite3_version-win64.zip" download "$libhost/sqlite3-$sqlite3_version-win64.zip"
download "$libhost/luajit-$luajit_version-win64.zip" download "$libhost/luajit-$luajit_version-win64.zip"
download "$libhost/libleveldb-$leveldb_version-win64.zip" leveldb-$leveldb_version-win64.zip download "$libhost/ucrt/libleveldb-$leveldb_version-win64.zip" leveldb-$leveldb_version-win64.zip
download "$libhost/openal-soft-$openal_version-win64.zip" download "$libhost/openal-soft-$openal_version-win64.zip"
# Set source dir, downloading Minetest as needed # Set source dir, downloading Minetest as needed

12
util/buildbot/common.sh
View File

@ -3,15 +3,15 @@ CORE_BRANCH=master
CORE_NAME=minetest CORE_NAME=minetest
ogg_version=1.3.5 ogg_version=1.3.5
openal_version=1.23.0 openal_version=1.23.1
vorbis_version=1.3.7 vorbis_version=1.3.7
curl_version=8.0.1 curl_version=8.5.0
gettext_version=0.20.2 gettext_version=0.20.2
freetype_version=2.12.1 freetype_version=2.13.2
sqlite3_version=3.41.2 sqlite3_version=3.44.2
luajit_version=20230221 luajit_version=20231211
leveldb_version=1.23 leveldb_version=1.23
zlib_version=1.2.13 zlib_version=1.3
zstd_version=1.5.5 zstd_version=1.5.5
download () { download () {

7
util/buildbot/download_toolchain.sh
View File

@ -6,8 +6,11 @@ if [[ -z "$1" || -z "$2" ]]; then
exit 1 exit 1
fi fi
ver=11.2.0 # our current toolchain:
os=ubuntu20.04 # binutils 2.41 + GCC 13.2.0 + Mingw-w64 11.0.1 with UCRT enabled and winpthreads support
# built from source on Ubuntu 22.04, so should work on any similarily up-to-date distro
ver=13.2.0
os=ubuntu22.04
name="mingw-w64-${1}_${ver}_${os}.tar.xz" name="mingw-w64-${1}_${ver}_${os}.tar.xz"
wget "http://minetest.kitsunemimi.pw/$name" -O "$name" wget "http://minetest.kitsunemimi.pw/$name" -O "$name"
sha256sum -w -c <(grep -F "$name" "$topdir/sha256sums.txt") sha256sum -w -c <(grep -F "$name" "$topdir/sha256sums.txt")

52
util/buildbot/sha256sums.txt
View File

@ -1,26 +1,26 @@
e85ac83dd884a6716fdf048af1d8a4978ff4aa925471148f88c7c3430a9e2b05 curl-8.0.1-win32.zip c6759580175dee6c3673bb0544f0aca855f76b415b441db2b949fe9e2af4e6ee curl-8.5.0-win32.zip
babed7c963bba7867412d9a905d5732a9cefefed401e05194903be08801c2182 curl-8.0.1-win64.zip a99ebdccad524f3738fa3a6a9d1dcabc39cb668f97790638d77b4bb96ea3edca curl-8.5.0-win64.zip
d6d7b0cf4d547f38ed54b0ff60a4b302b4184bd69fb580fc998410d87244939e freetype-2.12.1-win32.zip d70c9886526513a2c8a7962815fb425f296ab934239470a03ea350944169a7ac freetype-2.13.2-win32.zip
dc6ecbb67b59a0662f21ca49a84fbf4bb0af9fedbc621983c4c0832fbddcc845 freetype-2.12.1-win64.zip 06aa20c71724e832874baa296d047aa866db2c336e26aa49e4faa72e559414a6 freetype-2.13.2-win64.zip
59236564f072baddac3e123927c50856d3147698cdd07fd08308a0eceb6f8679 gettext-0.20.2-win32.zip 41b10766de2773f0f0851fde16b363024685e0397f4bb2e5cd2a7be196960a01 gettext-0.20.2-win32.zip
4b11cc8211a6408b41d2342f927200f8f01b305cbcf9fb2398b5e7d204c42918 gettext-0.20.2-win64.zip 1ceed167ff16fea944f76ab6ea2969160c71a67419259b17c9c523e7a01eb883 gettext-0.20.2-win64.zip
be02f4c0afc9e713d23182ec7782102a2d6c62fb4c2566832cdba0541437efc4 irrlicht-1.9.0mt13-win32.zip 15d09d259b62ce0b5d7582a26360f60bb99784c5b223364b6f21dc9d99844d15 irrlicht-1.9.0mt13-win32.zip
6dca6dc23f6511da585874f3ec7bbda06e75d9de96c5a272e23a11a46b143262 irrlicht-1.9.0mt13-win64.zip ddfa8d61ac5404202588c0793842f49b0198d8e87b963fe196cca0781a3099ca irrlicht-1.9.0mt13-win64.zip
429e23c9a4a425c04db5b17e1361d4ce9ddd588e8fda062f5c485db1657e1b53 leveldb-1.23-win32.zip 6d49348215916ff355187fec808d0847450f70e45fe2719f45af9eb61c047358 leveldb-1.23-win32.zip
82121b595d39b8e63c524e04c6ff247a904a76c278c0f42936e2bca63ff910a0 leveldb-1.23-win64.zip 30c680277320bdda130b238d0adc30c3c59e7522dc008d677893ebfaea22f28b leveldb-1.23-win64.zip
23b467388aaa6e1a437b189dd54ecc7de7e47a734972d69abad874c558caa33c libogg-1.3.5-win32.zip d58b67954f3f552fba5e315ed476c38b230d0cf53445fe07dc733e72f8ba7dc2 libogg-1.3.5-win32.zip
55f11b1fb26be5bc31e16fb282b0481938f306d0d4351048d82121cae1f0a254 libogg-1.3.5-win64.zip 2083cceb79b648cd500afe8b71c56170481f309cb6abd950195cdd13570e03dd libogg-1.3.5-win64.zip
d3f2de1d6f14c937bbcccf82f09ba583b3ad6925d30f6cddc096fcaa80ab3c03 libvorbis-1.3.7-win32.zip 1ce1c71e1dfdd99f47c93614a521ec0797d8fb55fb3fc07b67937ea7c6f76cca libvorbis-1.3.7-win32.zip
b7722da388b17fdc216c00c97d9306b71c06dc49b173d43ef783fe0511739f2c libvorbis-1.3.7-win64.zip 1c6fe4aa1c38079f2917e17e6b5acd7505331236c426e3b86054efccec6cee1c libvorbis-1.3.7-win64.zip
79b9c3a9fc83a006721f1c78482729578d87f72b15c5440d28ba8f054655466b luajit-20230221-win32.zip 1c9b9580d869ee57b8c30a083d0e9a737310c1bb5e376b05fba483bac99eb2e1 luajit-20231211-win32.zip
22f0f0ca95ff142fcd57237fa3e34797bb0f0d6789bf078b9c50941a9e4b739a luajit-20230221-win64.zip 3b42a31887ad7901f83a9f5b5faa4745ce95c7e95a7d8fd569d603fc95573ea5 luajit-20231211-win64.zip
704817351dc54a5a4bb3b35db9316f4ff1b073b231b5f8dbbc3b4ff2f3e30fbe mingw-w64-i686_11.2.0_ubuntu20.04.tar.xz 9f0cfab8ca089d48be7a59f85d5fd5648f18f54c91d7ac6c31b281ba5e90852a mingw-w64-i686_13.2.0_ubuntu22.04.tar.xz
d85ec9a7debe470ebeaa002af0a2843b83d40405d2a45fcc586c19f179362aab mingw-w64-x86_64_11.2.0_ubuntu20.04.tar.xz 93bc9f04d43a023358d1ae2b76dec42d3d79baecd452402ee9fb3ee21945fdfe mingw-w64-x86_64_13.2.0_ubuntu22.04.tar.xz
e4385c73c497ae90f28199002035fb369c7fa94ac93676949f92a1539a607941 openal-soft-1.23.0-win32.zip 34c4e6826a8e0dc4f7a49f7e4e4d54676f89a20fe781bad876795b857f7c5395 openal-soft-1.23.1-win32.zip
643cdac87f0f1b7a06266df233e8d21119839b8fa3b9d6b4274b51e075a3ac11 openal-soft-1.23.0-win64.zip 4b9c9a7f42aa8f7e6d26347ad61c55a32a2b11e4f02b8562542bcd132b0c7115 openal-soft-1.23.1-win64.zip
d595396b60f31fe53d2b598c1677d633e407c175585a676bfc0d13d6cc239336 sqlite3-3.41.2-win32.zip 082dfee313c7e29e48ff798503acb286a4542c315618d5d3b33fc2bbed4170a5 sqlite3-3.44.2-win32.zip
9aabc9545c1a7d39956c51e84239adbd05283218f451a3a846b080b713ad7661 sqlite3-3.41.2-win64.zip e8fda50178f1371c52f85ac19a0998d797ad6b2439f1da87c49a1f44ba33649c sqlite3-3.44.2-win64.zip
e9bab0a6fe07bcf6c5a8ff171dd63983e67f3aefd9b8f38e88bf20a3dc44678f zlib-1.2.13-win32.zip 3c5abd40e9492c834651d995db6bbf0f57a7579d091d2d03110293b95e9b039a zlib-1.3-win32.zip
9f3d4fd89958081917d2fdcaab1bbc947e3fb070d8b39a48d9cf11269dd52c24 zlib-1.2.13-win64.zip f63d9a38c2ee56fa1e95a486224c274412cb5b3275734c1da53b0a68a7e8c654 zlib-1.3-win64.zip
4ccbc8ac5830b06362d495ca65cd4687a76514bd103b5506b54a4b62ce0402f7 zstd-1.5.5-win32.zip 7508d714dbed4e1b1340cfb13ea77ef631746dad99ac97434171f2f4dd64d94b zstd-1.5.5-win32.zip
20dac9cedbaba40de5a5c0608a62d1885cbf63d055cca619289081e14d32290d zstd-1.5.5-win64.zip 30353afddb459974c4e90c4eb3fbf975951247cf310fa5f40208806e275776fa zstd-1.5.5-win64.zip