Skip to content

Commit ebd4c2b

Browse files
committed
Update zlib-ng to 2.3.1, except on manylinux2014 aarch64
1 parent ec40c54 commit ebd4c2b

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/wheels-dependencies.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,11 @@ XZ_VERSION=5.8.1
106106
ZSTD_VERSION=1.5.7
107107
TIFF_VERSION=4.7.1
108108
LCMS2_VERSION=2.17
109-
ZLIB_NG_VERSION=2.2.5
109+
if [[ "$MB_ML_VER" == 2014 ]] && [[ "$PLAT" == "aarch64" ]]; then
110+
ZLIB_NG_VERSION=2.2.5
111+
else
112+
ZLIB_NG_VERSION=2.3.1
113+
fi
110114
LIBWEBP_VERSION=1.6.0
111115
BZIP2_VERSION=1.0.8
112116
LIBXCB_VERSION=1.17.0

winbuild/build_prepare.py

Lines changed: 3 additions & 3 deletions
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.2.5",
129+
"ZLIBNG": "2.3.1",
130130
}
131131
V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2])
132132

@@ -167,12 +167,12 @@ def cmd_msbuild(
167167
"license": "LICENSE.md",
168168
"patch": {
169169
r"CMakeLists.txt": {
170-
"set_target_properties(zlib PROPERTIES OUTPUT_NAME zlibstatic${{SUFFIX}})": "set_target_properties(zlib PROPERTIES OUTPUT_NAME zlib)", # noqa: E501
170+
"set_target_properties(zlib-ng PROPERTIES OUTPUT_NAME zlibstatic${{SUFFIX}})": "set_target_properties(zlib-ng PROPERTIES OUTPUT_NAME zlib)", # noqa: E501
171171
},
172172
},
173173
"build": [
174174
*cmds_cmake(
175-
"zlib", "-DBUILD_SHARED_LIBS:BOOL=OFF", "-DZLIB_COMPAT:BOOL=ON"
175+
"zlib-ng", "-DBUILD_SHARED_LIBS:BOOL=OFF", "-DZLIB_COMPAT:BOOL=ON"
176176
),
177177
],
178178
"headers": [r"z*.h"],

0 commit comments

Comments
 (0)