From 51cd79266dac9917c7a2442849041aae5368a820 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 27 Jun 2023 13:51:17 +1000 Subject: [PATCH 1/2] Updated libtiff to 4.5.1 --- docs/installation.rst | 2 +- winbuild/build_prepare.py | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index e29709bff0d..6262548d83e 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -155,7 +155,7 @@ Many of Pillow's features require external libraries: * **libtiff** provides compressed TIFF functionality - * Pillow has been tested with libtiff versions **3.x** and **4.0-4.5** + * Pillow has been tested with libtiff versions **3.x** and **4.0-4.5.1** * **libfreetype** provides type related services diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 9984eb1bccc..a9b6450d884 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -186,9 +186,9 @@ def cmd_msbuild( "libs": [r"output\release-static\{architecture}\lib\*.lib"], }, "libtiff": { - "url": "https://download.osgeo.org/libtiff/tiff-4.5.0.tar.gz", - "filename": "tiff-4.5.0.tar.gz", - "dir": "tiff-4.5.0", + "url": "https://download.osgeo.org/libtiff/tiff-4.5.1.tar.gz", + "filename": "tiff-4.5.1.tar.gz", + "dir": "tiff-4.5.1", "license": "LICENSE.md", "patch": { r"libtiff\tif_lzma.c": { @@ -199,6 +199,12 @@ def cmd_msbuild( # link against webp.lib "#ifdef WEBP_SUPPORT": '#ifdef WEBP_SUPPORT\n#pragma comment(lib, "webp.lib")', # noqa: E501 }, + r"test/CMakeLists.txt": { + "add_executable(test_write_read_tags ../placeholder.h)": "", + "target_sources(test_write_read_tags PRIVATE test_write_read_tags.c)": "", # noqa: E501 + "target_link_libraries(test_write_read_tags PRIVATE tiff)": "", + "list(APPEND simple_tests test_write_read_tags)": "", + }, }, "build": [ *cmds_cmake( From 1756f04acdd803a83b825cfa585527f0d78eab93 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Tue, 27 Jun 2023 21:19:32 +1000 Subject: [PATCH 2/2] Updated patch path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ondrej Baranovič --- winbuild/build_prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index a9b6450d884..dd20f351c04 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -199,7 +199,7 @@ def cmd_msbuild( # link against webp.lib "#ifdef WEBP_SUPPORT": '#ifdef WEBP_SUPPORT\n#pragma comment(lib, "webp.lib")', # noqa: E501 }, - r"test/CMakeLists.txt": { + r"test\CMakeLists.txt": { "add_executable(test_write_read_tags ../placeholder.h)": "", "target_sources(test_write_read_tags PRIVATE test_write_read_tags.c)": "", # noqa: E501 "target_link_libraries(test_write_read_tags PRIVATE tiff)": "",