Removed existing libpng to fix arm64 OpenJPEG

This commit is contained in:
Andrew Murray 2021-02-09 12:23:09 +11:00
parent a90a2bf3bb
commit e962cd86df

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"