diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 07ea75a75..12b5ea6c7 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -103,11 +103,7 @@ XZ_VERSION=5.8.1 ZSTD_VERSION=1.5.7 TIFF_VERSION=4.7.1 LCMS2_VERSION=2.17 -if [[ "$MB_ML_VER" == 2014 ]] && [[ "$PLAT" == "aarch64" ]]; then - ZLIB_NG_VERSION=2.2.5 -else - ZLIB_NG_VERSION=2.3.1 -fi +ZLIB_NG_VERSION=2.3.2 LIBWEBP_VERSION=1.6.0 BZIP2_VERSION=1.0.8 LIBXCB_VERSION=1.17.0 @@ -150,11 +146,7 @@ function build_zlib_ng { ORIGINAL_HOST_CONFIGURE_FLAGS=$HOST_CONFIGURE_FLAGS unset HOST_CONFIGURE_FLAGS - if [[ "$ZLIB_NG_VERSION" == 2.2.5 ]]; then - build_github zlib-ng/zlib-ng $ZLIB_NG_VERSION --zlib-compat - else - build_github zlib-ng/zlib-ng $ZLIB_NG_VERSION --installnamedir=$BUILD_PREFIX/lib --zlib-compat - fi + build_github zlib-ng/zlib-ng $ZLIB_NG_VERSION --installnamedir=$BUILD_PREFIX/lib --zlib-compat HOST_CONFIGURE_FLAGS=$ORIGINAL_HOST_CONFIGURE_FLAGS touch zlib-stamp diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index cd2ef13c1..4fbb7e820 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -126,7 +126,7 @@ V = { "OPENJPEG": "2.5.4", "TIFF": "4.7.1", "XZ": "5.8.1", - "ZLIBNG": "2.3.1", + "ZLIBNG": "2.3.2", } V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2])