python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-13 05:06:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3794 from radarhere/openjpeg

Browse Source 
Updated openjpeg to 2.3.1
This commit is contained in:
Hugo 2019-04-20 11:06:22 +03:00 committed by GitHub
commit c98cf32269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
depends/install_openjpeg.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# install openjpeg # install openjpeg
archive=openjpeg-2.3.0 archive=openjpeg-2.3.1
./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/master/$archive.tar.gz ./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/master/$archive.tar.gz

2
docs/installation.rst
View File

@ -163,7 +163,7 @@ Many of Pillow's features require external libraries:
* **openjpeg** provides JPEG 2000 functionality. * **openjpeg** provides JPEG 2000 functionality.
* Pillow has been tested with openjpeg **2.0.0** and **2.1.0**. * Pillow has been tested with openjpeg **2.0.0**, **2.1.0** and **2.3.1**.
* Pillow does **not** support the earlier **1.5** series which ships * Pillow does **not** support the earlier **1.5** series which ships
with Debian Jessie. with Debian Jessie.

14
winbuild/build_dep.py
View File

@ -113,23 +113,27 @@ endlocal
""" """
def nmake_openjpeg(compiler): def nmake_openjpeg(compiler, bit):
atts = {'op_ver': '2.1'} if compiler['env_version'] == 'v7.0':
return ""
atts = {'op_ver': '2.3.1'}
atts.update(compiler) atts.update(compiler)
return r""" return r"""
rem build openjpeg rem build openjpeg
setlocal setlocal
""" + vc_setup(compiler, bit) + r"""
@echo on @echo on
cd /D %%OPENJPEG%%%(inc_dir)s cd /D %%OPENJPEG%%%(inc_dir)s
%%CMAKE%% -DBUILD_THIRDPARTY:BOOL=OFF -G "NMake Makefiles" . %%CMAKE%% -DBUILD_THIRDPARTY:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -G "NMake Makefiles" .
nmake -f Makefile clean nmake -f Makefile clean
nmake -f Makefile nmake -f Makefile
copy /Y /B bin\* %%INCLIB%% copy /Y /B bin\* %%INCLIB%%
mkdir %%INCLIB%%\openjpeg-%(op_ver)s mkdir %%INCLIB%%\openjpeg-%(op_ver)s
copy /Y /B src\lib\openjp2\*.h %%INCLIB%%\openjpeg-%(op_ver)s copy /Y /B src\lib\openjp2\*.h %%INCLIB%%\openjpeg-%(op_ver)s
endlocal endlocal
""" % atts """ % atts # noqa: E501
def nmake_libs(compiler, bit): def nmake_libs(compiler, bit):
@ -284,7 +288,7 @@ def add_compiler(compiler, bit):
script.append(msbuild_freetype(compiler, bit)) script.append(msbuild_freetype(compiler, bit))
script.append(build_lcms2(compiler)) script.append(build_lcms2(compiler))
# script.append(nmake_openjpeg(compiler)) script.append(nmake_openjpeg(compiler, bit))
script.append(build_ghostscript(compiler, bit)) script.append(build_ghostscript(compiler, bit))
script.append(end_compiler()) script.append(end_compiler())

6
winbuild/config.py
View File

@ -75,9 +75,9 @@ libs = {
'dir': 'libwebp-1.0.2', 'dir': 'libwebp-1.0.2',
}, },
'openjpeg': { 'openjpeg': {
'url': SF_MIRROR+'/project/openjpeg/openjpeg/2.3.0/openjpeg-2.3.0.tar.gz', 'url': 'https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz',
'filename': PILLOW_DEPENDS_DIR + 'openjpeg-2.3.0.tar.gz', 'filename': PILLOW_DEPENDS_DIR + 'openjpeg-2.3.1.tar.gz',
'dir': 'openjpeg-2.3.0', 'dir': 'openjpeg-2.3.1',
}, },
} }