Merge pull request #5151 from radarhere/openjpeg

Updated openjpeg to 2.4.0
python-pillow · Dec 29, 2020 · 18ee51a · 18ee51a
2 parents 416f12e + c68ddcf
commit 18ee51a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 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.1
+archive=openjpeg-2.4.0
 
 ./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
@@ -171,7 +171,7 @@ Many of Pillow's features require external libraries:
 
 * **openjpeg** provides JPEG 2000 functionality.
 
-  * Pillow has been tested with openjpeg **2.0.0**, **2.1.0** and **2.3.1**.
+  * Pillow has been tested with openjpeg **2.0.0**, **2.1.0**, **2.3.1** and **2.4.0**.
   * Pillow does **not** support the earlier **1.5** series which ships
     with Debian Jessie.
 

diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
@@ -242,15 +242,15 @@ def cmd_msbuild(
         "libs": [r"Lib\MS\*.lib"],
     },
     "openjpeg": {
-        "url": "https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz",
-        "filename": "openjpeg-2.3.1.tar.gz",
-        "dir": "openjpeg-2.3.1",
+        "url": "https://github.com/uclouvain/openjpeg/archive/v2.4.0.tar.gz",
+        "filename": "openjpeg-2.4.0.tar.gz",
+        "dir": "openjpeg-2.4.0",
         "build": [
             cmd_cmake(("-DBUILD_THIRDPARTY:BOOL=OFF", "-DBUILD_SHARED_LIBS:BOOL=OFF")),
             cmd_nmake(target="clean"),
             cmd_nmake(target="openjp2"),
-            cmd_mkdir(r"{inc_dir}\openjpeg-2.3.1"),
-            cmd_copy(r"src\lib\openjp2\*.h", r"{inc_dir}\openjpeg-2.3.1"),
+            cmd_mkdir(r"{inc_dir}\openjpeg-2.4.0"),
+            cmd_copy(r"src\lib\openjp2\*.h", r"{inc_dir}\openjpeg-2.4.0"),
         ],
         "libs": [r"bin\*.lib"],
     },