diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d82b9785d..495d481f4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -71,8 +71,8 @@ jobs: name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }} runs-on: windows-2019 env: - VCPKG_VERSION: 01f602195983451bc83e72f4214af2cbc495aa94 - # 2024.05.24 + VCPKG_VERSION: d5ec528843d29e3a52d745a64b469f810b2cedbf + # 2025.02.14 vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp sdl2 strategy: fail-fast: false diff --git a/util/buildbot/common.sh b/util/buildbot/common.sh index e92e08ab8..27815f349 100644 --- a/util/buildbot/common.sh +++ b/util/buildbot/common.sh @@ -3,19 +3,19 @@ CORE_BRANCH=master CORE_NAME=minetest ogg_version=1.3.5 -openal_version=1.23.1 +openal_version=1.24.2 vorbis_version=1.3.7 -curl_version=8.9.1 +curl_version=8.12.1 gettext_version=0.20.2 freetype_version=2.13.3 sqlite3_version=3.46.1 -luajit_version=20240905 +luajit_version=20250113 leveldb_version=1.23 zlib_version=1.3.1 -zstd_version=1.5.6 +zstd_version=1.5.7 libjpeg_version=3.0.1 -libpng_version=1.6.43 -sdl2_version=2.30.7 +libpng_version=1.6.47 +sdl2_version=2.32.2 download () { local url=$1 @@ -51,10 +51,10 @@ get_sources () { # sets $runtime_dlls find_runtime_dlls () { local triple=$1 - # Try to find runtime DLLs in various paths + # Try to find runtime DLLs in various paths (fun) local tmp=$(dirname "$(command -v $compiler)")/.. runtime_dlls= - for name in lib{clang_rt,c++,unwind,winpthread-}'*'.dll; do + for name in lib{c++,unwind,winpthread-}'*'.dll; do for dir in $tmp/$triple/{bin,lib}; do [ -d "$dir" ] || continue local file=$(echo $dir/$name) diff --git a/util/buildbot/download_toolchain.sh b/util/buildbot/download_toolchain.sh index d7d7afbe2..c3f3f043c 100755 --- a/util/buildbot/download_toolchain.sh +++ b/util/buildbot/download_toolchain.sh @@ -10,7 +10,7 @@ fi # * Clang + LLD + libc++ instead of GCC + binutils + stdc++ # * Mingw-w64 with UCRT enabled and winpthreads support # why are we avoiding GCC? -> Thread Local Storage (TLS) is totally broken -date=20240619 +date=20250305 name=llvm-mingw-${date}-ucrt-ubuntu-20.04-x86_64.tar.xz wget "https://github.com/mstorsjo/llvm-mingw/releases/download/$date/$name" -O "$name" sha256sum -w -c <(grep -F "$name" "$topdir/sha256sums.txt") diff --git a/util/buildbot/sha256sums.txt b/util/buildbot/sha256sums.txt index 310ab6a6e..21f30dddb 100644 --- a/util/buildbot/sha256sums.txt +++ b/util/buildbot/sha256sums.txt @@ -1,5 +1,5 @@ -627d4111ee655a68e806251974ba9d0337efac19cb07d499689c44c328a23775 curl-8.9.1-win32.zip -ed906726531388441d7f93fc0a1c9d567d476fbc8cfbae19dc5a0f7288949abe curl-8.9.1-win64.zip +b54e6252a822524a13f65bb9dcb8b8328242843f4a26e36b8273f32b78241bec curl-8.12.1-win32.zip +38501597e88a507e5e146aff2f76dfab012753d57064b98cdcaca5bac1ee9c42 curl-8.12.1-win64.zip 7a94b9e69d4872489228ad7cca6a16117a433f809d9b20fa3e44e1616a33c5d7 freetype-2.13.3-win32.zip f7d882319790f72ebc8eff00526388432bd26bff3a56c4ef5cce0a829bbbef0d freetype-2.13.3-win64.zip 41b10766de2773f0f0851fde16b363024685e0397f4bb2e5cd2a7be196960a01 gettext-0.20.2-win32.zip @@ -10,20 +10,20 @@ f54e9a577e2db47ed28f4a01e74181d2c607627c551d30f48263e01b59e84f67 libleveldb-1.2 2f039848a4e6c05a2347fe5a7fa63c430dd08d1bc88235645a863c859e14f5f8 libleveldb-1.23-win64.zip 0df94afb8efa361cceb132ecf9491720afbc45ba844a7b1c94607295829b53ca libogg-1.3.5-win32.zip 5c4acb4c99429a04b5e69650719b2eb17616bf52837d2372a0f859952eebce48 libogg-1.3.5-win64.zip -fb61536bfce414fdecb30dfbdc8b26e87969ee30b420f5fb8542f7573a1c1d12 libpng-1.6.43-win32.zip -ccd0b8ecbaa07028067a99dd4314ec7799445f80a28ddc86fa3f6bf25700177b libpng-1.6.43-win64.zip +af26fc9c5db2f448ab0e2e6f5a64c21a0ede3ff6939f88d6f3080d92c9b294fc libpng-1.6.47-win32.zip +dd92e80e505671f18a7a32151301ac429bf4f36d3a42478138b35a2a37e15cec libpng-1.6.47-win64.zip 456ece10a2be4247b27fbe88f88ddd54aae604736a6b76ba9a922b602fe40f40 libvorbis-1.3.7-win32.zip 57f4db02da00556895bb63fafa6e46b5f7dac87c25fde27af4315f56a1aa7a86 libvorbis-1.3.7-win64.zip -27d33157cc252c29ad6f777a96a0d94176fea1b534ff09b5071485def143b90e llvm-mingw-20240619-ucrt-ubuntu-20.04-x86_64.tar.xz -5380bbb0bfd4482b5774e4f7c0ff58cc0857477b88a88a178316a464d3459cf1 luajit-20240905-win32.zip -5805c75c61bf948f790e6f845adc94a4946e43ab8a78c5b5b441550f8a665d2c luajit-20240905-win64.zip -e2443451fe5c2066eb564c64b8a1762738a88b7fd749c8b5907fed45c785497b openal-soft-1.23.1-win32.zip -cb041445a118469caefbad2647470cb8571c8337bce2adc07634011ab5625417 openal-soft-1.23.1-win64.zip -af09a54f1f5d75ef6e1bf63662489ca57d44b6b522446638afe35e59b8456a3c sdl2-2.30.7-win32.zip -613abc34a84ed2c3b050314b340ba7e675879e8ed7848e6a28cd9c50262a33b0 sdl2-2.30.7-win64.zip +b2557a7089d006711247c66aa9c402165e89646eaadf01715d36157db0b66b01 llvm-mingw-20250305-ucrt-ubuntu-20.04-x86_64.tar.xz +ffec9687b581c9be380bb910249540deb2c027528cf489f0962e67116e078dee luajit-20250113-win32.zip +68d694631289416ae493253ed5d20e0ea2cd8ba1ca12153e2fd458dcd3dc0724 luajit-20250113-win64.zip +8365b9632219e8d6c624bde3001010c1a9e283f9b4c9090bd79ab00a46110d6f openal-soft-1.24.2-win32.zip +00309f225c697e9e1fe93aa1b5051b144c851c33edc70d534f7d4c401fda60d1 openal-soft-1.24.2-win64.zip +88205a0e2950e519ff0a4ef0a4e91c17a6089acbf317648b32154b7f76022547 sdl2-2.32.2-win32.zip +1a52ef059fc541c2ff3be5bd19b4cfaa0a8bb3e2549ebdb7ef48f5bdab19a6b6 sdl2-2.32.2-win64.zip 9685857ae0b418068ad4324e3711121bda97488d19235a0e68a6060162e014d7 sqlite3-3.46.1-win32.zip 7e2990619b1fd1d5ed654d1df77ea809d4332c2e914ea8bba53b2cf5acdf10ff sqlite3-3.46.1-win64.zip 8af10515d57dbfee5d2106cd66cafa2adeb4270d4c6047ccbf7e8b5d2d50681c zlib-1.3.1-win32.zip ad43f5d23052590c65633530743e5d622cc76b33c109072e6fd7b487aff56bca zlib-1.3.1-win64.zip -e1bd36f6da039ee8c1694509f379a5023c05d6c90905a2cbb424f0395167570a zstd-1.5.6-win32.zip -f65b75b04b00f6bda859a7c60667f735c664a893bf7796b38393c16cc40a1a82 zstd-1.5.6-win64.zip +07d295a4f2d727e9d2c406023e17238919b0c42b8442cfb11fe259ac5778e263 zstd-1.5.7-win32.zip +73886e5307ab236628a712abed5357649a92e895caacde8601cf51323e61fc5b zstd-1.5.7-win64.zip