Merge pull request #8424 from radarhere/harfbuzz

This commit is contained in:
Hugo van Kemenade 2024-09-28 09:06:25 -07:00 committed by GitHub
commit a89b3d53ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -16,11 +16,7 @@ ARCHIVE_SDIR=pillow-depends-main
# Package versions for fresh source builds # Package versions for fresh source builds
FREETYPE_VERSION=2.13.2 FREETYPE_VERSION=2.13.2
if [[ -n "$IS_MACOS" ]] || ([[ "$MB_ML_VER" != 2014 ]] && [[ -z "$SANITIZER" ]]); then HARFBUZZ_VERSION=10.0.1
HARFBUZZ_VERSION=10.0.1
else
HARFBUZZ_VERSION=8.5.0
fi
LIBPNG_VERSION=1.6.44 LIBPNG_VERSION=1.6.44
JPEGTURBO_VERSION=3.0.4 JPEGTURBO_VERSION=3.0.4
OPENJPEG_VERSION=2.5.2 OPENJPEG_VERSION=2.5.2
@ -65,21 +61,15 @@ function build_brotli {
} }
function build_harfbuzz { function build_harfbuzz {
if [[ "$HARFBUZZ_VERSION" == 8.5.0 ]]; then python3 -m pip install meson ninja
export FREETYPE_LIBS=-lfreetype
export FREETYPE_CFLAGS=-I/usr/local/include/freetype2/ local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz)
build_simple harfbuzz $HARFBUZZ_VERSION https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION tar.xz --with-freetype=yes --with-glib=no (cd $out_dir \
export FREETYPE_LIBS="" && meson setup build --buildtype=release -Dfreetype=enabled -Dglib=disabled)
export FREETYPE_CFLAGS="" (cd $out_dir/build \
else && meson install)
local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz) if [[ "$MB_ML_LIBC" == "manylinux" ]]; then
(cd $out_dir \ cp /usr/local/lib64/libharfbuzz* /usr/local/lib
&& meson setup build --buildtype=release -Dfreetype=enabled -Dglib=disabled)
(cd $out_dir/build \
&& meson install)
if [[ "$MB_ML_LIBC" == "manylinux" ]]; then
cp /usr/local/lib64/libharfbuzz* /usr/local/lib
fi
fi fi
} }
@ -155,11 +145,7 @@ if [[ -n "$IS_MACOS" ]]; then
brew remove --ignore-dependencies webp brew remove --ignore-dependencies webp
fi fi
brew install meson pkg-config brew install pkg-config
elif [[ -n "$IS_ALPINE" ]]; then
apk add meson
elif [[ "$HARFBUZZ_VERSION" != 8.5.0 ]]; then
yum install -y meson
fi fi
wrap_wheel_builder build wrap_wheel_builder build