From 47524e4612018d35b55c06a44ec496e881d93fcd Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Wed, 5 Nov 2025 14:55:50 +0300
Subject: [PATCH] upgrade vendored libtiff to latest 4.7.1 release
---
.gitmodules | 2 +-
CMakeLists.txt | 6 ++++++
external/libtiff | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 1eb1421fa..3bf0d5379 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.6.0-SDL
+ branch = v4.7.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 5157470bb..a2f52d6fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -944,8 +944,12 @@ if(SDLIMAGE_TIF)
if(SDLIMAGE_TIF_VENDORED)
set(SDLIMAGE_TIF_ENABLED TRUE)
message(STATUS "${PROJECT_NAME}: Using vendored libtiff")
+ # tiff-cxx variable is used by vendored libtiff
+ set(tiff-cxx OFF CACHE BOOL "libtiff: C++ API" FORCE)
# tiff-tests variable is used by vendored libtiff
set(tiff-tests OFF CACHE BOOL "libtiff: tests" FORCE)
+ # tiff-opengl variable is used by vendored libtiff
+ set(tiff-opengl OFF CACHE BOOL "libtiff: OpenGL option" FORCE)
# jpeg variable is used by vendored libtiff
set(jpeg OFF CACHE BOOL "libtiff: jpeg option" FORCE)
# libdeflate variable is used by vendored libtiff
@@ -956,6 +960,8 @@ if(SDLIMAGE_TIF)
set(zlib OFF CACHE BOOL "libtiff: find zlib using find_package" FORCE)
# ZLIB_FOUND is used by vendored libtiff
set(ZLIB_FOUND "")
+ # lerc variable is used by vendored libtiff
+ set(lerc OFF CACHE BOOL "libtiff: lerc option" FORCE)
# lzma variable is used by vendored libtiff
set(lzma OFF CACHE BOOL "libtiff: lzma option" FORCE)
# webp variable is used by vendored libtiff
diff --git a/external/libtiff b/external/libtiff
index f0b67bbb5..605564a07 160000
--- a/external/libtiff
+++ b/external/libtiff
@@ -1 +1 @@
-Subproject commit f0b67bbb55584c7c48dd2e0a20823c3c3ed0dc75
+Subproject commit 605564a0706cc649503ff4abbeed215be916c920