Skip to content

Commit 1f424ef

Browse files
authored
Updated zlib-ng to 2.3.2 (python-pillow#9324)
2 parents 374957c + fd3d44d commit 1f424ef

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

.github/workflows/wheels-dependencies.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,7 @@ XZ_VERSION=5.8.1
103103
ZSTD_VERSION=1.5.7
104104
TIFF_VERSION=4.7.1
105105
LCMS2_VERSION=2.17
106-
if [[ "$MB_ML_VER" == 2014 ]] && [[ "$PLAT" == "aarch64" ]]; then
107-
ZLIB_NG_VERSION=2.2.5
108-
else
109-
ZLIB_NG_VERSION=2.3.1
110-
fi
106+
ZLIB_NG_VERSION=2.3.2
111107
LIBWEBP_VERSION=1.6.0
112108
BZIP2_VERSION=1.0.8
113109
LIBXCB_VERSION=1.17.0
@@ -150,11 +146,7 @@ function build_zlib_ng {
150146
ORIGINAL_HOST_CONFIGURE_FLAGS=$HOST_CONFIGURE_FLAGS
151147
unset HOST_CONFIGURE_FLAGS
152148

153-
if [[ "$ZLIB_NG_VERSION" == 2.2.5 ]]; then
154-
build_github zlib-ng/zlib-ng $ZLIB_NG_VERSION --zlib-compat
155-
else
156-
build_github zlib-ng/zlib-ng $ZLIB_NG_VERSION --installnamedir=$BUILD_PREFIX/lib --zlib-compat
157-
fi
149+
build_github zlib-ng/zlib-ng $ZLIB_NG_VERSION --installnamedir=$BUILD_PREFIX/lib --zlib-compat
158150

159151
HOST_CONFIGURE_FLAGS=$ORIGINAL_HOST_CONFIGURE_FLAGS
160152
touch zlib-stamp

winbuild/build_prepare.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def cmd_msbuild(
126126
"OPENJPEG": "2.5.4",
127127
"TIFF": "4.7.1",
128128
"XZ": "5.8.1",
129-
"ZLIBNG": "2.3.1",
129+
"ZLIBNG": "2.3.2",
130130
}
131131
V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2])
132132

0 commit comments

Comments
 (0)