From 7f11d2f9507b7acd6c02c9a6209ee2db9f341e3b Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Tue, 30 Jan 2024 13:37:20 +0100
Subject: [PATCH] Switch to llvm-mingw

---
 .github/workflows/build.yml |  6 +++---
 scripts/ci-build-mingw.sh   | 13 +++++++------
 scripts/ci-get-mingw.sh     |  9 +++------
 scripts/sha256sums.txt      | 19 +++++++++----------
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8bd6a4e..86d7755 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -144,14 +144,14 @@ jobs:
       - name: Install compiler
         run: |
           sudo apt-get update && sudo apt-get install cmake -qyy
-          ./scripts/ci-get-mingw.sh ${{matrix.config.arch}}
+          ./scripts/ci-get-mingw.sh
 
       - name: Build
         run: |
           ./scripts/ci-build-mingw.sh package
         env:
-          CC: ${{matrix.config.arch}}-w64-mingw32-gcc
-          CXX: ${{matrix.config.arch}}-w64-mingw32-g++
+          CC: ${{matrix.config.arch}}-w64-mingw32-clang
+          CXX: ${{matrix.config.arch}}-w64-mingw32-clang++
           extras: ${{matrix.config.extras}}
 
       - uses: actions/upload-artifact@v3
diff --git a/scripts/ci-build-mingw.sh b/scripts/ci-build-mingw.sh
index 3be97ea..b1fdd7b 100755
--- a/scripts/ci-build-mingw.sh
+++ b/scripts/ci-build-mingw.sh
@@ -12,7 +12,7 @@ with_sdl=0
 libjpeg_version=3.0.1
 libpng_version=1.6.40
 sdl2_version=2.28.5
-zlib_version=1.3
+zlib_version=1.3.1
 
 download () {
 	local url=$1
@@ -25,13 +25,14 @@ download () {
 	unzip -o "$filename" -d "$foldername"
 }
 
+libs=$PWD/libs
 mkdir -p libs
 pushd libs
-libs=$PWD
-download "http://minetest.kitsunemimi.pw/libjpeg-$libjpeg_version-$variant.zip"
-download "http://minetest.kitsunemimi.pw/libpng-$libpng_version-$variant.zip"
-[ $with_sdl -eq 1 ] && download "http://minetest.kitsunemimi.pw/sdl2-$sdl2_version-$variant.zip"
-download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-$variant.zip"
+libhost="http://minetest.kitsunemimi.pw"
+download "$libhost/llvm/libjpeg-$libjpeg_version-$variant.zip"
+download "$libhost/llvm/libpng-$libpng_version-$variant.zip"
+[ $with_sdl -eq 1 ] && download "$libhost/llvm/sdl2-$sdl2_version-$variant.zip"
+download "$libhost/llvm/zlib-$zlib_version-$variant.zip"
 popd
 
 tmp=(
diff --git a/scripts/ci-get-mingw.sh b/scripts/ci-get-mingw.sh
index 843d2ee..9cf933f 100755
--- a/scripts/ci-get-mingw.sh
+++ b/scripts/ci-get-mingw.sh
@@ -1,12 +1,9 @@
 #!/bin/bash
 set -e
 topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-[ -z "$1" ] && exit 255
 
-ver=13.2.0
-os=ubuntu22.04
-name="mingw-w64-${1}_${ver}_${os}.tar.xz"
-wget "http://minetest.kitsunemimi.pw/$name" -O "$name"
+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"
 sha256sum -w -c <(grep -F "$name" "$topdir/sha256sums.txt")
-sudo tar -xaf "$name" -C /usr
+sudo tar -xaf "$name" -C /usr --strip-components=1
 rm -f "$name"
diff --git a/scripts/sha256sums.txt b/scripts/sha256sums.txt
index 638ec88..0c080de 100644
--- a/scripts/sha256sums.txt
+++ b/scripts/sha256sums.txt
@@ -1,10 +1,9 @@
-a7dc54d5fb9f841eae26ee17f6146c0b7a0e5d99a914866a394b723dffc83316  libjpeg-3.0.1-win32.zip
-cd1f667ed2d24d96e1d61fcf91ba6d7b11270a4903e36f08e640971884caaccd  libjpeg-3.0.1-win64.zip
-72a624fbaef15909f80976c9c569717e9438bd34c3209071378f05487e859f8a  libpng-1.6.40-win32.zip
-8e2552f6965c385f7e2467018d583fd206744db18e36656ddf1c07c8663ea23f  libpng-1.6.40-win64.zip
-9f0cfab8ca089d48be7a59f85d5fd5648f18f54c91d7ac6c31b281ba5e90852a  mingw-w64-i686_13.2.0_ubuntu22.04.tar.xz
-93bc9f04d43a023358d1ae2b76dec42d3d79baecd452402ee9fb3ee21945fdfe  mingw-w64-x86_64_13.2.0_ubuntu22.04.tar.xz
-2abdc82b4cac710bab0b3e9f9a9c38cc242abcca443c1e1f7af51d29a5eb5457  sdl2-2.28.5-win32.zip
-949a3de77d1c97240ee4b35e15495962b5effb816f7f03efe5c6edd8975a8b19  sdl2-2.28.5-win64.zip
-3c5abd40e9492c834651d995db6bbf0f57a7579d091d2d03110293b95e9b039a  zlib-1.3-win32.zip
-f63d9a38c2ee56fa1e95a486224c274412cb5b3275734c1da53b0a68a7e8c654  zlib-1.3-win64.zip
+0f21ff3be90311092fe32e0e30878ef3ae9d9437b8d9ac25ef279e0d84e9bb8e  llvm-mingw-20231128-ucrt-ubuntu-20.04-x86_64.tar.xz
+53dfd31285f470fcf0dca88217c5cf9c557729af6d103afae5936e72ddc38d3c  libjpeg-3.0.1-win32.zip
+3d44e0740914e6878300e30653aad39e974821b5d7f6c2567e246b4eb04a5324  libjpeg-3.0.1-win64.zip
+6baf4e819bfb3573760524b5dc9a04b5e479090d6d2046b86cf39a3107c0071f  libpng-1.6.40-win32.zip
+c02e029f01fce44baea7f4aecfd2564bd8a03507c0c6af8b03339ae0452c8b7d  libpng-1.6.40-win64.zip
+f9f890af960e92fd3f532f2e9ac00681c33bc67a722e000dfdaeb41b0064f1a0  sdl2-2.28.5-win32.zip
+8dde2c6963544b7d8a2e87c128ebbdf51ad0e70c7e2df986ff4e963ce9996d9b  sdl2-2.28.5-win64.zip
+8af10515d57dbfee5d2106cd66cafa2adeb4270d4c6047ccbf7e8b5d2d50681c  zlib-1.3.1-win32.zip
+ad43f5d23052590c65633530743e5d622cc76b33c109072e6fd7b487aff56bca  zlib-1.3.1-win64.zip