Merge pull request #3794 from radarhere/openjpeg

Updated openjpeg to 2.3.1
python-pillow · Apr 20, 2019 · c98cf32 · c98cf32
2 parents 3d2c52f + 47a0693
commit c98cf32
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/depends/install_openjpeg.sh b/depends/install_openjpeg.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # 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
 

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -163,7 +163,7 @@ Many of Pillow's features require external libraries:
 
 * **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
     with Debian Jessie.
 

diff --git a/winbuild/build_dep.py b/winbuild/build_dep.py
@@ -113,23 +113,27 @@ def end_compiler():
 """
 
 
-def nmake_openjpeg(compiler):
-    atts = {'op_ver': '2.1'}
+def nmake_openjpeg(compiler, bit):
+    if compiler['env_version'] == 'v7.0':
+        return ""
+
+    atts = {'op_ver': '2.3.1'}
     atts.update(compiler)
     return r"""
 rem build openjpeg
 setlocal
+""" + vc_setup(compiler, bit) + r"""
 @echo on
 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
 copy /Y /B bin\* %%INCLIB%%
 mkdir %%INCLIB%%\openjpeg-%(op_ver)s
 copy /Y /B src\lib\openjp2\*.h %%INCLIB%%\openjpeg-%(op_ver)s
 endlocal
-""" % atts
+""" % atts  # noqa: E501
 
 
 def nmake_libs(compiler, bit):
@@ -284,7 +288,7 @@ def add_compiler(compiler, bit):
 
     script.append(msbuild_freetype(compiler, bit))
     script.append(build_lcms2(compiler))
-    # script.append(nmake_openjpeg(compiler))
+    script.append(nmake_openjpeg(compiler, bit))
     script.append(build_ghostscript(compiler, bit))
     script.append(end_compiler())
 

diff --git a/winbuild/config.py b/winbuild/config.py
@@ -75,9 +75,9 @@
         'dir': 'libwebp-1.0.2',
     },
     'openjpeg': {
-        'url': SF_MIRROR+'/project/openjpeg/openjpeg/2.3.0/openjpeg-2.3.0.tar.gz',
-        'filename': PILLOW_DEPENDS_DIR + 'openjpeg-2.3.0.tar.gz',
-        'dir': 'openjpeg-2.3.0',
+        'url': 'https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz',
+        'filename': PILLOW_DEPENDS_DIR + 'openjpeg-2.3.1.tar.gz',
+        'dir': 'openjpeg-2.3.1',
     },
 }