From 4e52d547b2a0ced6d01224678ad653121d4849fb Mon Sep 17 00:00:00 2001 From: sfan5 Date: Wed, 13 Dec 2023 12:37:40 +0100 Subject: [PATCH] MinGW toolchain refresh --- .github/workflows/build.yml | 2 +- scripts/ci-build-mingw.sh | 8 ++++---- scripts/ci-get-mingw.sh | 4 ++-- scripts/sha256sums.txt | 20 ++++++++++---------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bb78eb70..f821f5dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -143,7 +143,7 @@ jobs: mingw: name: "MinGW ${{matrix.config.variant}}${{matrix.config.extras}}" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: diff --git a/scripts/ci-build-mingw.sh b/scripts/ci-build-mingw.sh index 1bafaaa6..3be97ea6 100755 --- a/scripts/ci-build-mingw.sh +++ b/scripts/ci-build-mingw.sh @@ -9,10 +9,10 @@ with_sdl=0 #with_gl3=0 #[[ "$extras" == *"-gl3"* ]] && with_gl3=1 -libjpeg_version=2.1.5.1 -libpng_version=1.6.39 -sdl2_version=2.28.1 -zlib_version=1.2.13 +libjpeg_version=3.0.1 +libpng_version=1.6.40 +sdl2_version=2.28.5 +zlib_version=1.3 download () { local url=$1 diff --git a/scripts/ci-get-mingw.sh b/scripts/ci-get-mingw.sh index c06670c3..843d2eef 100755 --- a/scripts/ci-get-mingw.sh +++ b/scripts/ci-get-mingw.sh @@ -3,8 +3,8 @@ set -e topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" [ -z "$1" ] && exit 255 -ver=11.2.0 -os=ubuntu20.04 +ver=13.2.0 +os=ubuntu22.04 name="mingw-w64-${1}_${ver}_${os}.tar.xz" wget "http://minetest.kitsunemimi.pw/$name" -O "$name" sha256sum -w -c <(grep -F "$name" "$topdir/sha256sums.txt") diff --git a/scripts/sha256sums.txt b/scripts/sha256sums.txt index 4606d556..638ec88a 100644 --- a/scripts/sha256sums.txt +++ b/scripts/sha256sums.txt @@ -1,10 +1,10 @@ -934ef7f3897cebcbf39eed2fcb0be084c1ff1af4352ebc1f19cfb4a60020b1c7 libjpeg-2.1.5.1-win32.zip -2b3054ddfd66c2b3f97ac65fb2b80be05649eeab98a822b952cbe388038d4aa1 libjpeg-2.1.5.1-win64.zip -9d8d97c1af52d88d6fc44902375fb42225f0ee5cbf2199997d278579770f8850 libpng-1.6.39-win32.zip -a4209e4de00f1674ba4cedf2ddf23881d429f6d2b5f9a4a26945c7cfbf12c384 libpng-1.6.39-win64.zip -704817351dc54a5a4bb3b35db9316f4ff1b073b231b5f8dbbc3b4ff2f3e30fbe mingw-w64-i686_11.2.0_ubuntu20.04.tar.xz -d85ec9a7debe470ebeaa002af0a2843b83d40405d2a45fcc586c19f179362aab mingw-w64-x86_64_11.2.0_ubuntu20.04.tar.xz -192a14f42de64d65bbd3ba320330a51e8e05aa67afc4e300690cc9fc8b2d11b3 sdl2-2.28.1-win32.zip -247d5ab923449fea042a8c47318a77e75ef3c056283049ad550935dae29fc26b sdl2-2.28.1-win64.zip -e9bab0a6fe07bcf6c5a8ff171dd63983e67f3aefd9b8f38e88bf20a3dc44678f zlib-1.2.13-win32.zip -9f3d4fd89958081917d2fdcaab1bbc947e3fb070d8b39a48d9cf11269dd52c24 zlib-1.2.13-win64.zip +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