python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-29 11:26:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #192 from radarhere/openjpeg

Browse Source 
Removed existing libpng to fix arm64 OpenJPEG
This commit is contained in:
Hugo van Kemenade 2021-02-13 12:52:41 +02:00 committed by GitHub
commit 1dc894dc93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config.sh
View File

@ -56,11 +56,13 @@ function pre_build {
CFLAGS=$ORIGINAL_CFLAGS CFLAGS=$ORIGINAL_CFLAGS
build_tiff build_tiff
if [ -n "$IS_MACOS" ]; then
# Remove existing libpng
rm /usr/local/lib/libpng*
fi
build_libpng build_libpng
build_lcms2 build_lcms2
if [[ $MACOSX_DEPLOYMENT_TARGET != "11.0" ]]; then build_openjpeg
build_openjpeg
fi
CFLAGS="$CFLAGS -O3 -DNDEBUG" CFLAGS="$CFLAGS -O3 -DNDEBUG"
build_libwebp build_libwebp
@ -86,10 +88,7 @@ function run_tests_in_repo {
pytest pytest
} }
EXP_CODECS="jpg" EXP_CODECS="jpg jpg_2000"
if [[ $MACOSX_DEPLOYMENT_TARGET != "11.0" ]]; then
EXP_CODECS="$EXP_CODECS jpg_2000"
fi
EXP_CODECS="$EXP_CODECS libtiff zlib" EXP_CODECS="$EXP_CODECS libtiff zlib"
EXP_MODULES="freetype2 littlecms2 pil tkinter webp" EXP_MODULES="freetype2 littlecms2 pil tkinter webp"
EXP_FEATURES="transp_webp webp_anim webp_mux" EXP_FEATURES="transp_webp webp_anim webp_mux"