From cd0e54bef2e3006bd4ea6840dbd9286892fe8d2e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 20 Jul 2019 18:33:08 +1000 Subject: [PATCH 1/2] Use openjpeg package --- .travis/install.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index e8bf10c4d..725880934 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -3,9 +3,9 @@ set -e sudo apt-get update -sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-tk\ - python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick\ - libharfbuzz-dev libfribidi-dev +sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-tk python-qt4\ + ghostscript libffi-dev libjpeg-turbo-progs libopenjp2-7-dev\ + cmake imagemagick libharfbuzz-dev libfribidi-dev PYTHONOPTIMIZE=0 pip install cffi pip install coverage @@ -22,9 +22,6 @@ if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then pip install -r requirements.txt ; # webp pushd depends && ./install_webp.sh && popd -# openjpeg -pushd depends && ./install_openjpeg.sh && popd - # libimagequant pushd depends && ./install_imagequant.sh && popd From d87593633a551240c30fa0ccdb3b178d15263f09 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 20 Jul 2019 19:30:28 +1000 Subject: [PATCH 2/2] Update Linux prerequisite packages --- docs/installation.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 216af5b4a..5f0156b63 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -332,19 +332,19 @@ Or for Python 3:: .. Note:: ``redhat-rpm-config`` is required on Fedora 23, but not earlier versions. -Prerequisites are installed on **Ubuntu 14.04 LTS** with:: +Prerequisites are installed on **Ubuntu 16.04 LTS** with:: - $ sudo apt-get install libtiff5-dev libjpeg8-dev zlib1g-dev \ - libfreetype6-dev liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev \ - tcl8.6-dev tk8.6-dev python-tk + $ sudo apt-get install libtiff5-dev libjpeg8-dev libopenjp2-7-dev zlib1g-dev \ + libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python-tk \ + libharfbuzz-dev libfribidi-dev Then see ``depends/install_raqm.sh`` to install libraqm. Prerequisites are installed on recent **RedHat** **Centos** or **Fedora** with:: - $ sudo dnf install libtiff-devel libjpeg-devel zlib-devel freetype-devel \ - lcms2-devel libwebp-devel tcl-devel tk-devel libraqm-devel \ - libimagequant-devel + $ sudo dnf install libtiff-devel libjpeg-devel openjpeg2-devel zlib-devel \ + freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel \ + harfbuzz-devel fribidi-devel libraqm-devel libimagequant-devel Note that the package manager may be yum or dnf, depending on the exact distribution.