From 44996f45f8cbe7fa6530c5c19b65263d923dc0bb Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Fri, 20 Oct 2023 11:55:50 +0300
Subject: [PATCH] vendored libtiff: go back to v4.2.0 for SDL2 branch
---
.gitmodules | 2 +-
CMakeLists.txt | 2 --
external/libtiff | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index a2bb48a9..33c54371 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.5.1-SDL
+ branch = v4.2.0-SDL
[submodule "external/zlib"]
path = external/zlib
url = https://github.com/libsdl-org/zlib.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcfdd437..705ab0ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -619,8 +619,6 @@ 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 be64b4f0..0f31f742 160000
--- a/external/libtiff
+++ b/external/libtiff
@@ -1 +1 @@
-Subproject commit be64b4f0784235ad164c23331a4e72e332488d50
+Subproject commit 0f31f742aaef929d61f6d5d2411df12c04be6a97