Update config for FriBiDi dynamic linking #181
Conversation
| gz|tgz) tar -zxf $in_fname ;; | ||
| bz2) tar -jxf $in_fname ;; | ||
| zip) unzip -qq $in_fname ;; | ||
| xz) unxz -c $in_fname | tar -xf - ;; |
There was a problem hiding this comment.
This line is wrong in the multibuild version causing an error in tar; https://github.com/matthew-brett/multibuild/pull/380.
config.sh
Outdated
| if [ -z "$IS_OSX" ]; then | ||
| export FREETYPE_LIBS=-lfreetype | ||
| export FREETYPE_CFLAGS=-I/usr/local/include/freetype2/ | ||
| fi |
There was a problem hiding this comment.
HarfBuzz fails to find FreeType on linux without this, specify the path manually.
| export FREETYPE_LIBS=-lfreetype | ||
| export FREETYPE_CFLAGS=-I/usr/local/include/freetype2/ | ||
| fi | ||
| build_simple harfbuzz $HARFBUZZ_VERSION https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION tar.xz --with-freetype=yes --with-glib=no |
There was a problem hiding this comment.
--with-glib=no to avoid pulling in unrelated libraries on macos.
| fi | ||
| pip wheel $(pip_opts) \ | ||
| --global-option build_ext --global-option --enable-raqm \ | ||
| --global-option --vendor-raqm --global-option --vendor-fribidi \ |
There was a problem hiding this comment.
Overriding pip_wheel_cmd to add the needed global options, as defined in python-pillow/Pillow#5062.
config.sh
Outdated
| EXP_FEATURES="fribidi harfbuzz raqm transp_webp webp_anim webp_mux xcb" | ||
| else | ||
| # can't find FriBiDi | ||
| EXP_FEATURES="transp_webp webp_anim webp_mux xcb" |
There was a problem hiding this comment.
macOS and PyPy on Ubuntu don't find FriBiDi preinstalled. Adding brew install fribidi only finds it on Python 3.6. I'm not sure why this is, but it should be irrelevant given the build_ext flags defined above.
| function pip_wheel_cmd { | ||
| local abs_wheelhouse=$1 | ||
| if [ -z "$IS_OSX" ]; then | ||
| CFLAGS="$CFLAGS --std=c99" # for Raqm |
There was a problem hiding this comment.
I think it is better to compile with C99 than to merge in the (poorly tested) C89 patch from python-pillow/Pillow@b3cfe73, especially when this file is not compiled by default.
|
python-pillow/Pillow#2753 (comment)
@wiredfool do you recall which libraries you were discussing here? |
FriBiDi is under LGPL 2.1 or later: https://github.com/fribidi/fribidi#license HarfBuzz is under "Old MIT": https://github.com/harfbuzz/harfbuzz/blob/master/COPYING |
|
I've rerun the build in my branch of the latest version of python-pillow/Pillow#5062 and updated the link in the top comment: https://github.com/nulano/pillow-wheels/actions/runs/684862775 Trying the 3.6 and 3.8 wheels in a fresh LinuxMint 19.1 (based on Ubuntu 18.04) VM, I get a crash after one iteration with the latest 8.1.2 wheels from PyPI, while these wheels work for at least 1000 iterations. I also had to install from PIL import ImageFont
for i in range(1000):
print(i)
ImageFont.truetype("DejaVuSans", layout_engine=ImageFont.LAYOUT_RAQM).getsize("hello") |
|
Getting failures now of |
python-pillow/Pillow#5062 adds new options which are required to enable the new code. These fail on the 8.1.2 tag, but are fine on the master branch (see "latest" jobs). |
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
For python-pillow/Pillow#5062.
See passing run in my branch: https://github.com/nulano/pillow-wheels/actions/runs/684862775More comments inline below.