python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-13 02:36:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3982 from radarhere/openjpeg

Browse Source 
Use OpenJPEG package
This commit is contained in:
Hugo van Kemenade 2019-07-22 11:43:17 +03:00 committed by GitHub
commit db319727b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis/install.sh
View File

@ -3,9 +3,9 @@
set -e set -e
sudo apt-get update sudo apt-get update
sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-tk\ sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-tk python-qt4\
python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick\ ghostscript libffi-dev libjpeg-turbo-progs libopenjp2-7-dev\
libharfbuzz-dev libfribidi-dev cmake imagemagick libharfbuzz-dev libfribidi-dev
PYTHONOPTIMIZE=0 pip install cffi PYTHONOPTIMIZE=0 pip install cffi
pip install coverage pip install coverage
@ -22,9 +22,6 @@ if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then pip install -r requirements.txt ;
# webp # webp
pushd depends && ./install_webp.sh && popd pushd depends && ./install_webp.sh && popd
# openjpeg
pushd depends && ./install_openjpeg.sh && popd
# libimagequant # libimagequant
pushd depends && ./install_imagequant.sh && popd pushd depends && ./install_imagequant.sh && popd

14
docs/installation.rst
View File

@ -332,19 +332,19 @@ Or for Python 3::
.. Note:: ``redhat-rpm-config`` is required on Fedora 23, but not earlier versions. .. 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 \ $ sudo apt-get install libtiff5-dev libjpeg8-dev libopenjp2-7-dev zlib1g-dev \
libfreetype6-dev liblcms2-dev libwebp-dev libharfbuzz-dev libfribidi-dev \ libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python-tk \
tcl8.6-dev tk8.6-dev python-tk libharfbuzz-dev libfribidi-dev
Then see ``depends/install_raqm.sh`` to install libraqm. Then see ``depends/install_raqm.sh`` to install libraqm.
Prerequisites are installed on recent **RedHat** **Centos** or **Fedora** with:: Prerequisites are installed on recent **RedHat** **Centos** or **Fedora** with::
$ sudo dnf install libtiff-devel libjpeg-devel zlib-devel freetype-devel \ $ sudo dnf install libtiff-devel libjpeg-devel openjpeg2-devel zlib-devel \
lcms2-devel libwebp-devel tcl-devel tk-devel libraqm-devel \ freetype-devel lcms2-devel libwebp-devel tcl-devel tk-devel \
libimagequant-devel harfbuzz-devel fribidi-devel libraqm-devel libimagequant-devel
Note that the package manager may be yum or dnf, depending on the Note that the package manager may be yum or dnf, depending on the
exact distribution. exact distribution.