Add back openjpg for OSX

This commit is contained in:
Matthew Brett 2016-06-30 13:56:27 +01:00
parent 0a04054fa3
commit 6393558b83

View File

@ -29,13 +29,8 @@ standard_install libpng $PNG_VERSION
standard_install lcms2 $LCMS_VERSION standard_install lcms2 $LCMS_VERSION
WEBP_EXTRAS="--enable-libwebpmux --enable-libwebpdemux" WEBP_EXTRAS="--enable-libwebpmux --enable-libwebpdemux"
standard_install libwebp $WEBP_VERSION .tar.gz libwebp- "$WEBP_EXTRAS" standard_install libwebp $WEBP_VERSION .tar.gz libwebp- "$WEBP_EXTRAS"
# openjpg causes test to hang with message: standard_install openjpeg $OPENJPEG_VERSION .tar.gz openjpeg- cmake
# TestFileIcns.test_jp2_icon ...
# No output has been received in the last 10m0s
# e.g.
# https://s3.amazonaws.com/archive.travis-ci.org/jobs/139079205/log.txt
# standard_install openjpeg $OPENJPEG_VERSION .tar.gz openjpeg- cmake
# Fix openjpeg library install id # Fix openjpeg library install id
# https://code.google.com/p/openjpeg/issues/detail?id=367 # https://code.google.com/p/openjpeg/issues/detail?id=367
# install_name_tool -id $PWD/build/lib/libopenjp2.7.dylib build/lib/libopenjp2.2.1.0.dylib install_name_tool -id $PWD/build/lib/libopenjp2.7.dylib build/lib/libopenjp2.2.1.0.dylib
standard_install freetype $FT_VERSION .tar.gz freetype- "--with-harfbuzz=no" standard_install freetype $FT_VERSION .tar.gz freetype- "--with-harfbuzz=no"