From 4a0014ccee15e513318dd3746c96407968aea74c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 31 Dec 2019 08:43:20 +1100 Subject: [PATCH] Updated libimagequant to 2.12.6 --- .github/workflows/test-windows.yml | 4 ++-- depends/install_imagequant.sh | 2 +- docs/installation.rst | 2 +- winbuild/config.py | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 4acf55052..e257a9502 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -246,8 +246,8 @@ jobs: set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32 set BUILD=%GITHUB_WORKSPACE%\winbuild\build - rem ba653c8: Merge tag '2.12.5' into msvc - cd /D %BUILD%\libimagequant-ba653c8ccb34dde4e21c6076d85a72d21ed9d971 + rem e5d454b: Merge tag '2.12.6' into msvc + cd /D %BUILD%\libimagequant-e5d454bc7f5eb63ee50c84a83a7fa5ac94f68ec4 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.platform-vcvars }} echo on echo (gc CMakeLists.txt) -replace 'add_library', "add_compile_options(-openmp-)`r`nadd_library" ^| Out-File -encoding ASCII CMakeLists.txt > patch.ps1 diff --git a/depends/install_imagequant.sh b/depends/install_imagequant.sh index 0120dbc0b..1f2b677fd 100755 --- a/depends/install_imagequant.sh +++ b/depends/install_imagequant.sh @@ -1,7 +1,7 @@ #!/bin/bash # install libimagequant -archive=libimagequant-2.12.5 +archive=libimagequant-2.12.6 ./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 index 57c4f8344..dba4d5ec0 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -174,7 +174,7 @@ Many of Pillow's features require external libraries: * **libimagequant** provides improved color quantization - * Pillow has been tested with libimagequant **2.6-2.12.5** + * Pillow has been tested with libimagequant **2.6-2.12.6** * Libimagequant is licensed GPLv3, which is more restrictive than the Pillow license, therefore we will not be distributing binaries with libimagequant support enabled. diff --git a/winbuild/config.py b/winbuild/config.py index b68fb6936..1bbc07e3a 100644 --- a/winbuild/config.py +++ b/winbuild/config.py @@ -91,11 +91,11 @@ libs = { "filename": "libjpeg-turbo-2.0.3.tar.gz", "dir": "libjpeg-turbo-2.0.3", }, - # ba653c8: Merge tag '2.12.5' into msvc + # e5d454b: Merge tag '2.12.6' into msvc "imagequant": { - "url": "https://github.com/ImageOptim/libimagequant/archive/ba653c8ccb34dde4e21c6076d85a72d21ed9d971.zip", # noqa: E501 - "filename": "libimagequant-ba653c8ccb34dde4e21c6076d85a72d21ed9d971.zip", - "dir": "libimagequant-ba653c8ccb34dde4e21c6076d85a72d21ed9d971", + "url": "https://github.com/ImageOptim/libimagequant/archive/e5d454bc7f5eb63ee50c84a83a7fa5ac94f68ec4.zip", # noqa: E501 + "filename": "libimagequant-e5d454bc7f5eb63ee50c84a83a7fa5ac94f68ec4.zip", + "dir": "libimagequant-e5d454bc7f5eb63ee50c84a83a7fa5ac94f68ec4", }, "harfbuzz": { "url": "https://github.com/harfbuzz/harfbuzz/archive/2.6.1.zip",