Merge pull request #7746 from radarhere/zlib

This commit is contained in:
Hugo van Kemenade 2024-03-09 11:14:58 +02:00 committed by GitHub
commit 62f426c149
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -29,7 +29,7 @@ else
GIFLIB_VERSION=5.2.1 GIFLIB_VERSION=5.2.1
fi fi
if [[ -n "$IS_MACOS" ]] || [[ "$MB_ML_VER" != 2014 ]]; then if [[ -n "$IS_MACOS" ]] || [[ "$MB_ML_VER" != 2014 ]]; then
ZLIB_VERSION=1.3 ZLIB_VERSION=1.3.1
else else
ZLIB_VERSION=1.2.8 ZLIB_VERSION=1.2.8
fi fi

View File

@ -121,7 +121,7 @@ V = {
"OPENJPEG": "2.5.2", "OPENJPEG": "2.5.2",
"TIFF": "4.6.0", "TIFF": "4.6.0",
"XZ": "5.4.5", "XZ": "5.4.5",
"ZLIB": "1.3", "ZLIB": "1.3.1",
} }
V["LIBPNG_DOTLESS"] = V["LIBPNG"].replace(".", "") V["LIBPNG_DOTLESS"] = V["LIBPNG"].replace(".", "")
V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2]) V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2])