From dd1bc0c775a9df877dfc36040d5f23a01d5835e4 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Tue, 1 Aug 2023 19:15:55 +0200
Subject: [PATCH] libtiff: bump vendored libtiff to 4.5.1
(cherry-picked from commit c94d6ef29f7725319c8246450f4f6bc5fc8d6272)
---
.gitmodules | 2 +-
CMakeLists.txt | 2 ++
external/libtiff | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 33c54371..a2bb48a9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,7 +13,7 @@
[submodule "external/libtiff"]
path = external/libtiff
url = https://github.com/libsdl-org/libtiff.git
- branch = v4.2.0-SDL
+ branch = v4.5.1-SDL
[submodule "external/zlib"]
path = external/zlib
url = https://github.com/libsdl-org/zlib.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 705ab0ad..fcfdd437 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -619,6 +619,8 @@ if(SDL2IMAGE_TIF)
target_compile_definitions(SDL2_image PRIVATE LOAD_TIF)
if(SDL2IMAGE_TIF_VENDORED)
message(STATUS "${PROJECT_NAME}: Using vendored libtiff")
+ # tiff-tests variable is used by vendored libtiff
+ set(tiff-tests OFF CACHE BOOL "libtiff: tests" FORCE)
# jpeg variable is used by vendored libtiff
set(jpeg OFF CACHE BOOL "libtiff: jpeg option" FORCE)
# libdeflate variable is used by vendored libtiff
diff --git a/external/libtiff b/external/libtiff
index 87b8acc8..be64b4f0 160000
--- a/external/libtiff
+++ b/external/libtiff
@@ -1 +1 @@
-Subproject commit 87b8acc80059672ca3cdd382cdfc567dd5ff59ba
+Subproject commit be64b4f0784235ad164c23331a4e72e332488d50