From 83a85cb3fb677a1a750d5f192aef3e0936548668 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Mon, 28 Jan 2019 12:40:52 +0100
Subject: [PATCH] 3rdparty: use generic rules for tiff

---
 3rdparty/Makefile                    | 16 ++++++----------
 3rdparty/tiff-uint64_long_long.patch |  4 ++--
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/3rdparty/Makefile b/3rdparty/Makefile
index fec4a8f6..eac0581d 100644
--- a/3rdparty/Makefile
+++ b/3rdparty/Makefile
@@ -75,6 +75,12 @@ LIBTIFFARCH = $(LIBTIFF).tar.gz
 LIBTIFFURL = https://download.osgeo.org/libtiff/$(LIBTIFFARCH)
 LIBTIFFURLALT = https://fossies.org/linux/misc/$(LIBTIFFARCH)
 LIBTIFFPATCHES = tiff-uint64_long_long.patch
+# additionnal variables for the generic rules to work :
+TIFFARCH = $(LIBTIFFARCH)
+TIFFURL = $(LIBTIFFURL)
+TIFFURLALT = $(LIBTIFFURLALT)
+TIFFPATCHES = $(LIBTIFFPATCHES)
+TIFFSHA256 = 2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4
 ZLIBVER=1.2.11
 ZLIB=zlib-$(ZLIBVER)
 ZLIBARCH=$(ZLIB).tar.gz
@@ -437,12 +443,6 @@ ifdef WIN32
 	cat $(LIBTIFF)/COPYRIGHT >> ../doc/README-tiff.txt
 endif
 
-# variable names doesn't match directory name, so the generic rule won't work
-$(LIBTIFF)/.ok:	archives/$(LIBTIFFARCH)
-	$(TAR) xzf $<
-	cd $(LIBTIFF) ; for p in $(LIBTIFFPATCHES) ; do echo "applying $$p" ; patch -p0 < ../$$p ; done
-	touch $@
-
 $(PREFIX)/lib/libpng.a:	$(PREFIX)/lib/libz.a
 
 $(PREFIX)/lib/libpng.a:	$(LIBPNG)/.ok
@@ -499,10 +499,6 @@ archives/$(JPEGARCH):
 	@$(MKDIR) $(@D)
 	cd $(@D) && $(GETURL) $(JPEGURL)
 
-archives/$(LIBTIFFARCH):
-	@$(MKDIR) $(@D)
-	cd $(@D) && ( $(GETURL) $(LIBTIFFURL) || $(GETURL) $(LIBTIFFURLALT) )
-
 # generic rule to download tarballs
 archives/%.tar.gz:
 	@$(MKDIR) $(@D)
diff --git a/3rdparty/tiff-uint64_long_long.patch b/3rdparty/tiff-uint64_long_long.patch
index c2ae56e2..548f97e2 100644
--- a/3rdparty/tiff-uint64_long_long.patch
+++ b/3rdparty/tiff-uint64_long_long.patch
@@ -2,8 +2,8 @@ $NetBSD$
 
 To avoid conflict with Security.framework on OS X, prefer unsigned long long as 64-bit type.
 
---- configure.orig	2015-08-24 22:13:55.000000000 +0000
-+++ configure
+--- a/configure	2015-08-24 22:13:55.000000000 +0000
++++ b/configure
 @@ -17750,11 +17750,7 @@ _ACEOF
  $as_echo_n "checking for unsigned 64-bit type... " >&6; }
  UINT64_T='none'