diff --git a/.github/scripts/build_libpng.sh b/.github/scripts/build_libpng.sh index e662f8a7..35d430ca 100755 --- a/.github/scripts/build_libpng.sh +++ b/.github/scripts/build_libpng.sh @@ -1,13 +1,13 @@ #!/bin/bash set -euo pipefail -pngver=1.6.45 +pngver=1.6.50 ## Grab sources and check them curl -LOJ "http://prdownloads.sourceforge.net/libpng/libpng-$pngver.tar.xz?download" # Brew doesn't provide any sha256sum, so we're making do with `sha2` instead. -if [ "$(sha2 -q -256 libpng-$pngver.tar.xz)" != 926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370 ]; then +if [ "$(sha2 -q -256 libpng-$pngver.tar.xz)" != 4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307 ]; then sha2 -256 libpng-$pngver.tar.xz echo Checksum mismatch! Aborting. >&2 exit 1 diff --git a/.github/scripts/get_win_deps.ps1 b/.github/scripts/get_win_deps.ps1 index 46ea7e78..209e0253 100644 --- a/.github/scripts/get_win_deps.ps1 +++ b/.github/scripts/get_win_deps.ps1 @@ -16,8 +16,8 @@ function getlibrary ([string] $URI, [string] $filename, [string] $hash, [string] } getlibrary 'https://www.zlib.net/zlib131.zip' 'zlib.zip' '72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17' . -getlibrary 'https://github.com/glennrp/libpng/archive/refs/tags/v1.6.45.zip' 'libpng.zip' '1b3d94b2f1d137db1bf1842cb9f03df179772a517f7b86e26351742190632785' . -getlibrary 'https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip' 'winflexbison.zip' '8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135' install_dir +getlibrary 'https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.50.zip' 'libpng.zip' 'f6bb2544d2cf5465af3a695dee0b7eacff82f11a50aa4672ef0e19df6e16d455' . +getlibrary 'https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip' 'winflexbison.zip' '8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135' install_dir Move-Item zlib-1.3.1 zlib -Move-Item libpng-1.6.45 libpng +Move-Item libpng-1.6.50 libpng diff --git a/.github/scripts/mingw-w64-libpng-dev.sh b/.github/scripts/mingw-w64-libpng-dev.sh index 30529d2f..dd900117 100755 --- a/.github/scripts/mingw-w64-libpng-dev.sh +++ b/.github/scripts/mingw-w64-libpng-dev.sh @@ -1,22 +1,17 @@ #!/bin/bash set -euo pipefail -pngver=1.6.45 +pngver=1.6.50 arch="$1" ## Grab sources and check them wget http://downloads.sourceforge.net/project/libpng/libpng16/$pngver/libpng-$pngver.tar.xz -wget http://downloads.sourceforge.net/project/apng/libpng/libpng16/libpng-$pngver-apng.patch.gz -sha256sum -c .github/scripts/mingw-w64-libpng-dev.sha256sums +echo 4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307 libpng-$pngver.tar.xz | sha256sum -c - ## Extract sources and patch them tar -xf libpng-$pngver.tar.xz -gunzip libpng-$pngver-apng.patch.gz - -# Patch in apng support -env -C libpng-$pngver patch -p0 ../libpng-$pngver-apng.patch ## Start building! diff --git a/.github/scripts/mingw-w64-libpng-dev.sha256sums b/.github/scripts/mingw-w64-libpng-dev.sha256sums deleted file mode 100644 index 247f0a07..00000000 --- a/.github/scripts/mingw-w64-libpng-dev.sha256sums +++ /dev/null @@ -1,2 +0,0 @@ -f7caa3b55f003ce23d6a087b1c2a643262647bfd1a1b31afdc9b18eabf1bbc7e libpng-1.6.45-apng.patch.gz -926485350139ffb51ef69760db35f78846c805fef3d59bfdcb2fba704663f370 libpng-1.6.45.tar.xz