python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-27 10:26:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5151 from radarhere/openjpeg

Browse Source 
Updated openjpeg to 2.4.0
This commit is contained in:
Hugo van Kemenade 2020-12-29 07:16:25 +02:00 committed by GitHub
commit 18ee51a5a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 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.1 archive=openjpeg-2.4.0
./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

@ -171,7 +171,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**, **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 * Pillow does **not** support the earlier **1.5** series which ships
with Debian Jessie. with Debian Jessie.

10
winbuild/build_prepare.py
View File

@ -242,15 +242,15 @@ deps = {
"libs": [r"Lib\MS\*.lib"], "libs": [r"Lib\MS\*.lib"],
}, },
"openjpeg": { "openjpeg": {
"url": "https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz", "url": "https://github.com/uclouvain/openjpeg/archive/v2.4.0.tar.gz",
"filename": "openjpeg-2.3.1.tar.gz", "filename": "openjpeg-2.4.0.tar.gz",
"dir": "openjpeg-2.3.1", "dir": "openjpeg-2.4.0",
"build": [ "build": [
cmd_cmake(("-DBUILD_THIRDPARTY:BOOL=OFF", "-DBUILD_SHARED_LIBS:BOOL=OFF")), cmd_cmake(("-DBUILD_THIRDPARTY:BOOL=OFF", "-DBUILD_SHARED_LIBS:BOOL=OFF")),
cmd_nmake(target="clean"), cmd_nmake(target="clean"),
cmd_nmake(target="openjp2"), cmd_nmake(target="openjp2"),
cmd_mkdir(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.3.1"), cmd_copy(r"src\lib\openjp2\*.h", r"{inc_dir}\openjpeg-2.4.0"),
], ],
"libs": [r"bin\*.lib"], "libs": [r"bin\*.lib"],
}, },