From 3200010e1ddaadde504a5f135264a0d4cc0c7d7a Mon Sep 17 00:00:00 2001
From: manongjohn <19245851+manongjohn@users.noreply.github.com>
Date: Fri, 26 Aug 2022 09:11:14 -0400
Subject: [PATCH] Fix tiff-4.2.0 build scripts

---
 ci-scripts/linux/tahoma-build.sh          | 2 +-
 ci-scripts/osx/tahoma-build.sh            | 4 ++--
 thirdparty/tiff-4.2.0/libtiff/Makefile.in | 1 +
 toonz/cmake/FindTIFF.cmake                | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ci-scripts/linux/tahoma-build.sh b/ci-scripts/linux/tahoma-build.sh
index f87b527b..1f1b5a5c 100755
--- a/ci-scripts/linux/tahoma-build.sh
+++ b/ci-scripts/linux/tahoma-build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-pushd thirdparty/tiff-4.0.3
+pushd thirdparty/tiff-4.2.0
 CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure --disable-jbig && make
 popd
 
diff --git a/ci-scripts/osx/tahoma-build.sh b/ci-scripts/osx/tahoma-build.sh
index 6f883f51..52040c5b 100755
--- a/ci-scripts/osx/tahoma-build.sh
+++ b/ci-scripts/osx/tahoma-build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-pushd thirdparty/tiff-4.0.3
+pushd thirdparty/tiff-4.2.0
 ./configure --disable-lzma --without-x && make
 popd
 
@@ -31,7 +31,7 @@ export MACOSX_DEPLOYMENT_TARGET=10.13
 export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/jpeg-turbo/lib/pkgconfig"
 cmake ../sources  $CANON_FLAG \
       -DQT_PATH=$USEQTLIB \
-      -DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.0.3/libtiff/ \
+      -DTIFF_INCLUDE_DIR=../../thirdparty/tiff-4.2.0/libtiff/ \
       -DSUPERLU_INCLUDE_DIR=../../thirdparty/superlu/SuperLU_4.1/include/
 
 make -j7 # runs 7 jobs in parallel
diff --git a/thirdparty/tiff-4.2.0/libtiff/Makefile.in b/thirdparty/tiff-4.2.0/libtiff/Makefile.in
index 14a101c4..a7b01182 100644
--- a/thirdparty/tiff-4.2.0/libtiff/Makefile.in
+++ b/thirdparty/tiff-4.2.0/libtiff/Makefile.in
@@ -237,6 +237,7 @@ am__depfiles_remade = ./$(DEPDIR)/mkg3states.Po \
 	./$(DEPDIR)/tif_error.Plo ./$(DEPDIR)/tif_extension.Plo \
 	./$(DEPDIR)/tif_fax3.Plo ./$(DEPDIR)/tif_fax3sm.Plo \
 	./$(DEPDIR)/tif_flush.Plo ./$(DEPDIR)/tif_getimage.Plo \
+	./$(DEPDIR)/tif_getimage_64.Plo \
 	./$(DEPDIR)/tif_jbig.Plo ./$(DEPDIR)/tif_jpeg.Plo \
 	./$(DEPDIR)/tif_jpeg_12.Plo ./$(DEPDIR)/tif_luv.Plo \
 	./$(DEPDIR)/tif_lzma.Plo ./$(DEPDIR)/tif_lzw.Plo \
diff --git a/toonz/cmake/FindTIFF.cmake b/toonz/cmake/FindTIFF.cmake
index b3db5fa0..169e17a2 100644
--- a/toonz/cmake/FindTIFF.cmake
+++ b/toonz/cmake/FindTIFF.cmake
@@ -1,4 +1,4 @@
-# looks for libtiff(4.0.3 modified)
+# looks for libtiff(4.2.0 modified)
 find_path(
     TIFF_INCLUDE_DIR
     NAMES
@@ -6,7 +6,7 @@ find_path(
     HINTS
         ${SDKROOT}
     PATH_SUFFIXES
-        tiff-4.0.3/libtiff/
+        tiff-4.2.0/libtiff/
 # if mono or another framework with a tif library
 # is installed, ignore it.
 if(BUILD_ENV_APPLE)
@@ -23,7 +23,7 @@ find_library(
     HINTS
         ${SDKROOT}
     PATH_SUFFIXES
-        tiff-4.0.3/libtiff/.libs
+        tiff-4.2.0/libtiff/.libs
     NO_DEFAULT_PATH
 )