-
Notifications
You must be signed in to change notification settings - Fork 19
Conversation
config.sh
Outdated
fi | ||
function build_brotli { | ||
local cmake=$(get_modern_cmake) | ||
local out_dir=$(fetch_unpack /~https://github.com/google/brotli/archive/v1.0.9.tar.gz) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we add this version as a constant above?
Do we still need OPENJPEG_VERSION
there?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I've added a BROTLI_VERSION
variable.
Yes, OPENJPEG_VERSION
is still used by multibuild in
Line 88 in 8c65e05
build_openjpeg |
Should the brotli license be added to |
Ok, I've copied /~https://github.com/google/brotli/blob/master/LICENSE @nulano any other feedback? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can confirm the Linux wheel (3.10 manylinux_2_28 x86_64 to be exact) pass the test I added in python-pillow/Pillow#6562.
However, while I see libbrotlidec.1.0.9.dylib
in Pillow-9.3.0.dev0-cp310-cp310-macosx_10_10_x86_64.whl
, I do not see it in the ARM wheel (despite it being detected in the build log). Do you have an M1 mac you could use to check the test test_imagefont.py:test_woff2
from /~https://github.com/nulano/Pillow/tree/winbuild-update passes?
(I'm looking at the wheels from the previous commit since the LICENSE file commit is still building.)
Oh, I didn't expect the automerge. There was indeed a problem with the ARM wheels. Thanks for catching @nulano. I've removed the |
Surprised me as well, the status page was showing a permission issue before. The macOS wheels do look good now, but instead some of the manylinux no longer include brotli now. Specifically, I can see |
I've created #322 to fix the Linux wheels. |
Helps python-pillow/Pillow#6554 by adding brotli.
After building brotli, delocate was unable to find the dependencies. I solved this by passing in
/usr/local/lib
throughDYLD_LIBRARY_PATH
, which allowed me to remove the custombuild_openjpeg
added in #294.