mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-11-15 06:07:33 +03:00
Merge pull request #8502 from radarhere/libdeflate
This commit is contained in:
commit
bdd0b8630c
3
.github/workflows/wheels-dependencies.sh
vendored
3
.github/workflows/wheels-dependencies.sh
vendored
|
@ -121,6 +121,7 @@ curl -fsSL -o pillow-depends-main.zip https://github.com/python-pillow/pillow-de
|
||||||
untar pillow-depends-main.zip
|
untar pillow-depends-main.zip
|
||||||
|
|
||||||
if [[ -n "$IS_MACOS" ]]; then
|
if [[ -n "$IS_MACOS" ]]; then
|
||||||
|
# libdeflate may cause a minimum target error when repairing the wheel
|
||||||
# libtiff and libxcb cause a conflict with building libtiff and libxcb
|
# libtiff and libxcb cause a conflict with building libtiff and libxcb
|
||||||
# libxau and libxdmcp cause an issue on macOS < 11
|
# libxau and libxdmcp cause an issue on macOS < 11
|
||||||
# remove cairo to fix building harfbuzz on arm64
|
# remove cairo to fix building harfbuzz on arm64
|
||||||
|
@ -132,7 +133,7 @@ if [[ -n "$IS_MACOS" ]]; then
|
||||||
if [[ "$CIBW_ARCHS" == "arm64" ]]; then
|
if [[ "$CIBW_ARCHS" == "arm64" ]]; then
|
||||||
brew remove --ignore-dependencies jpeg-turbo
|
brew remove --ignore-dependencies jpeg-turbo
|
||||||
else
|
else
|
||||||
brew remove --ignore-dependencies webp
|
brew remove --ignore-dependencies libdeflate webp
|
||||||
fi
|
fi
|
||||||
|
|
||||||
brew install pkg-config
|
brew install pkg-config
|
||||||
|
|
Loading…
Reference in New Issue
Block a user