Merge branch 'main' into harfbuzz
This commit is contained in:
commit
42a4af5c81
10
.github/workflows/wheels-dependencies.sh
vendored
10
.github/workflows/wheels-dependencies.sh
vendored
@ -90,11 +90,7 @@ fi
|
||||
ARCHIVE_SDIR=pillow-depends-main
|
||||
|
||||
# Package versions for fresh source builds.
|
||||
if [[ -n "$IOS_SDK" ]]; then
|
||||
FREETYPE_VERSION=2.13.3
|
||||
else
|
||||
FREETYPE_VERSION=2.14.1
|
||||
fi
|
||||
FREETYPE_VERSION=2.14.2
|
||||
HARFBUZZ_VERSION=13.0.1
|
||||
LIBPNG_VERSION=1.6.55
|
||||
JPEGTURBO_VERSION=3.1.3
|
||||
@ -310,10 +306,6 @@ function build {
|
||||
|
||||
if [[ -n "$IS_MACOS" ]]; then
|
||||
# Custom freetype build
|
||||
if [[ -z "$IOS_SDK" ]]; then
|
||||
build_simple sed 4.9 https://mirrors.middlendian.com/gnu/sed
|
||||
fi
|
||||
|
||||
build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --with-harfbuzz=no
|
||||
else
|
||||
build_freetype
|
||||
|
||||
@ -114,7 +114,7 @@ ARCHITECTURES = {
|
||||
|
||||
V = {
|
||||
"BROTLI": "1.2.0",
|
||||
"FREETYPE": "2.14.1",
|
||||
"FREETYPE": "2.14.2",
|
||||
"FRIBIDI": "1.0.16",
|
||||
"HARFBUZZ": "13.0.1",
|
||||
"JPEGTURBO": "3.1.3",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user