python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-12-04 16:54:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update zlib-ng to 2.3.1, except on manylinux2014 aarch64

Browse Source
This commit is contained in:
Andrew Murray 2025-11-29 14:24:43 +11:00
parent ec40c546d7
commit 8814d42fd9
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.github/workflows/wheels-dependencies.sh vendored
View File

@ -106,7 +106,11 @@ XZ_VERSION=5.8.1
ZSTD_VERSION=1.5.7 ZSTD_VERSION=1.5.7
TIFF_VERSION=4.7.1 TIFF_VERSION=4.7.1
LCMS2_VERSION=2.17 LCMS2_VERSION=2.17
ZLIB_NG_VERSION=2.2.5 if [[ "$MB_ML_VER" == 2014 ]] && [[ "$PLAT" == "aarch64" ]]; then
ZLIB_NG_VERSION=2.2.5
else
ZLIB_NG_VERSION=2.3.1
fi
LIBWEBP_VERSION=1.6.0 LIBWEBP_VERSION=1.6.0
BZIP2_VERSION=1.0.8 BZIP2_VERSION=1.0.8
LIBXCB_VERSION=1.17.0 LIBXCB_VERSION=1.17.0
@ -149,18 +153,13 @@ function build_zlib_ng {
ORIGINAL_HOST_CONFIGURE_FLAGS=$HOST_CONFIGURE_FLAGS ORIGINAL_HOST_CONFIGURE_FLAGS=$HOST_CONFIGURE_FLAGS
unset HOST_CONFIGURE_FLAGS unset HOST_CONFIGURE_FLAGS
build_github zlib-ng/zlib-ng $ZLIB_NG_VERSION --zlib-compat 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
HOST_CONFIGURE_FLAGS=$ORIGINAL_HOST_CONFIGURE_FLAGS HOST_CONFIGURE_FLAGS=$ORIGINAL_HOST_CONFIGURE_FLAGS
if [[ -n "$IS_MACOS" ]] && [[ -z "$IOS_SDK" ]]; then
# Ensure that on macOS, the library name is an absolute path, not an
# @rpath, so that delocate picks up the right library (and doesn't need
# DYLD_LIBRARY_PATH to be set). The default Makefile doesn't have an
# option to control the install_name. This isn't needed on iOS, as iOS
# only builds the static library.
install_name_tool -id $BUILD_PREFIX/lib/libz.1.dylib $BUILD_PREFIX/lib/libz.1.dylib
fi
touch zlib-stamp touch zlib-stamp
} }

6
winbuild/build_prepare.py
View File

@ -126,7 +126,7 @@ V = {
"OPENJPEG": "2.5.4", "OPENJPEG": "2.5.4",
"TIFF": "4.7.1", "TIFF": "4.7.1",
"XZ": "5.8.1", "XZ": "5.8.1",
"ZLIBNG": "2.2.5", "ZLIBNG": "2.3.1",
} }
V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2]) V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2])
@ -167,12 +167,12 @@ DEPS: dict[str, dict[str, Any]] = {
"license": "LICENSE.md", "license": "LICENSE.md",
"patch": { "patch": {
r"CMakeLists.txt": { r"CMakeLists.txt": {
"set_target_properties(zlib PROPERTIES OUTPUT_NAME zlibstatic${{SUFFIX}})": "set_target_properties(zlib PROPERTIES OUTPUT_NAME zlib)", # noqa: E501 "set_target_properties(zlib-ng PROPERTIES OUTPUT_NAME zlibstatic${{SUFFIX}})": "set_target_properties(zlib-ng PROPERTIES OUTPUT_NAME zlib)", # noqa: E501
}, },
}, },
"build": [ "build": [
*cmds_cmake( *cmds_cmake(
"zlib", "-DBUILD_SHARED_LIBS:BOOL=OFF", "-DZLIB_COMPAT:BOOL=ON" "zlib-ng", "-DBUILD_SHARED_LIBS:BOOL=OFF", "-DZLIB_COMPAT:BOOL=ON"
), ),
], ],
"headers": [r"z*.h"], "headers": [r"z*.h"],