From 6f23de41fb9566b00757c5f6fee6d3904a40a0d9 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Wed, 11 Sep 2024 16:40:58 +0200
Subject: [PATCH] Refresh windows toolchain and libs

---
 util/buildbot/common.sh             | 16 +++++++--------
 util/buildbot/download_toolchain.sh |  5 +++--
 util/buildbot/sha256sums.txt        | 30 ++++++++++++++---------------
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/util/buildbot/common.sh b/util/buildbot/common.sh
index a7fa3b5d3..ff3aef2e9 100644
--- a/util/buildbot/common.sh
+++ b/util/buildbot/common.sh
@@ -5,17 +5,17 @@ CORE_NAME=minetest
 ogg_version=1.3.5
 openal_version=1.23.1
 vorbis_version=1.3.7
-curl_version=8.5.0
+curl_version=8.9.1
 gettext_version=0.20.2
-freetype_version=2.13.2
-sqlite3_version=3.44.2
-luajit_version=20240125
+freetype_version=2.13.3
+sqlite3_version=3.46.1
+luajit_version=20240905
 leveldb_version=1.23
 zlib_version=1.3.1
-zstd_version=1.5.5
+zstd_version=1.5.6
 libjpeg_version=3.0.1
-libpng_version=1.6.40
-sdl2_version=2.30.3
+libpng_version=1.6.43
+sdl2_version=2.30.7
 
 download () {
 	local url=$1
@@ -80,7 +80,7 @@ _dlls () {
 
 add_cmake_libs () {
 	cmake_args+=(
-		-DPNG_LIBRARY=$libdir/libpng/lib/libpng.dll.a
+		-DPNG_LIBRARY=$libdir/libpng/lib/libpng16.dll.a
 		-DPNG_PNG_INCLUDE_DIR=$libdir/libpng/include
 		-DPNG_DLL="$(_dlls $libdir/libpng/bin/*)"
 
diff --git a/util/buildbot/download_toolchain.sh b/util/buildbot/download_toolchain.sh
index 3097f803b..d7d7afbe2 100755
--- a/util/buildbot/download_toolchain.sh
+++ b/util/buildbot/download_toolchain.sh
@@ -10,8 +10,9 @@ 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
-name=llvm-mingw-20231128-ucrt-ubuntu-20.04-x86_64.tar.xz
-wget "https://github.com/mstorsjo/llvm-mingw/releases/download/20231128/$name" -O "$name"
+date=20240619
+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")
 tar -xaf "$name" -C "$1" --strip-components=1
 rm -f "$name"
diff --git a/util/buildbot/sha256sums.txt b/util/buildbot/sha256sums.txt
index 0587e6ea1..310ab6a6e 100644
--- a/util/buildbot/sha256sums.txt
+++ b/util/buildbot/sha256sums.txt
@@ -1,7 +1,7 @@
-753dc38c591e078eae6a0a6b25f69826211256f444f3691a170670d8a12988f9  curl-8.5.0-win32.zip
-aa86abc3eb054d74d5fe15996f281cf84230a61b4ab7b3a702ab7dbb71e1203f  curl-8.5.0-win64.zip
-3e9d7bbca953b96dfd65acc28baaa87e8881aab29809ba03b9c9aefe3d071189  freetype-2.13.2-win32.zip
-acf901e93aedbcfa92eb3aab1def252676af845b1747ca5c3e7c5866576168cc  freetype-2.13.2-win64.zip
+627d4111ee655a68e806251974ba9d0337efac19cb07d499689c44c328a23775  curl-8.9.1-win32.zip
+ed906726531388441d7f93fc0a1c9d567d476fbc8cfbae19dc5a0f7288949abe  curl-8.9.1-win64.zip
+7a94b9e69d4872489228ad7cca6a16117a433f809d9b20fa3e44e1616a33c5d7  freetype-2.13.3-win32.zip
+f7d882319790f72ebc8eff00526388432bd26bff3a56c4ef5cce0a829bbbef0d  freetype-2.13.3-win64.zip
 41b10766de2773f0f0851fde16b363024685e0397f4bb2e5cd2a7be196960a01  gettext-0.20.2-win32.zip
 1ceed167ff16fea944f76ab6ea2969160c71a67419259b17c9c523e7a01eb883  gettext-0.20.2-win64.zip
 53dfd31285f470fcf0dca88217c5cf9c557729af6d103afae5936e72ddc38d3c  libjpeg-3.0.1-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
-6baf4e819bfb3573760524b5dc9a04b5e479090d6d2046b86cf39a3107c0071f  libpng-1.6.40-win32.zip
-c02e029f01fce44baea7f4aecfd2564bd8a03507c0c6af8b03339ae0452c8b7d  libpng-1.6.40-win64.zip
+fb61536bfce414fdecb30dfbdc8b26e87969ee30b420f5fb8542f7573a1c1d12  libpng-1.6.43-win32.zip
+ccd0b8ecbaa07028067a99dd4314ec7799445f80a28ddc86fa3f6bf25700177b  libpng-1.6.43-win64.zip
 456ece10a2be4247b27fbe88f88ddd54aae604736a6b76ba9a922b602fe40f40  libvorbis-1.3.7-win32.zip
 57f4db02da00556895bb63fafa6e46b5f7dac87c25fde27af4315f56a1aa7a86  libvorbis-1.3.7-win64.zip
-0f21ff3be90311092fe32e0e30878ef3ae9d9437b8d9ac25ef279e0d84e9bb8e  llvm-mingw-20231128-ucrt-ubuntu-20.04-x86_64.tar.xz
-da6ad10632cf172992158e9ea0977a87914b5d5de93a972c3430b6a412237556  luajit-20240125-win32.zip
-2b1dabe83d478b398cf9226d96de7fa62c973365c4aea70d27ba5782fb49d2d0  luajit-20240125-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
-574e0847e622ff09ab23e2b22b77685a2ab6ee43de3e2932f3e8a14a4d7b9338  sdl2-2.30.3-win32.zip
-6127afdfc7b6a4ade8caf9a7267748ffea974f729866dd5be96c7a69d2f0fee7  sdl2-2.30.3-win64.zip
-326701086a0ed66e09a9f3ec4d971654c13b6bd79cfdd079c947ecdcd6409525  sqlite3-3.44.2-win32.zip
-b2d474e3625f8f426b6cc5c0ecac831a1de46f7d1027bf4a9f6267b0b0411d42  sqlite3-3.44.2-win64.zip
+af09a54f1f5d75ef6e1bf63662489ca57d44b6b522446638afe35e59b8456a3c  sdl2-2.30.7-win32.zip
+613abc34a84ed2c3b050314b340ba7e675879e8ed7848e6a28cd9c50262a33b0  sdl2-2.30.7-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
-3564dabbe17ec4ecae1fb9a78fe48d9f7c71e2b1166456f6ee27e52fd9c84357  zstd-1.5.5-win32.zip
-e61b1f327ce2d836d1f8ca00c40ac77d3ab5309135851c98229bbdf82b060ae5  zstd-1.5.5-win64.zip
+e1bd36f6da039ee8c1694509f379a5023c05d6c90905a2cbb424f0395167570a  zstd-1.5.6-win32.zip
+f65b75b04b00f6bda859a7c60667f735c664a893bf7796b38393c16cc40a1a82  zstd-1.5.6-win64.zip