m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3rdparty: use generic rules for tiff

Browse Source
This commit is contained in:
Thomas Bernard 2019-01-28 12:40:52 +01:00
parent 981bcd37b4
commit 83a85cb3fb
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
3rdparty/Makefile vendored
View File

@ -75,6 +75,12 @@ LIBTIFFARCH = $(LIBTIFF).tar.gz
LIBTIFFURL = https://download.osgeo.org/libtiff/$(LIBTIFFARCH) LIBTIFFURL = https://download.osgeo.org/libtiff/$(LIBTIFFARCH)
LIBTIFFURLALT = https://fossies.org/linux/misc/$(LIBTIFFARCH) LIBTIFFURLALT = https://fossies.org/linux/misc/$(LIBTIFFARCH)
LIBTIFFPATCHES = tiff-uint64_long_long.patch 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 ZLIBVER=1.2.11
ZLIB=zlib-$(ZLIBVER) ZLIB=zlib-$(ZLIBVER)
ZLIBARCH=$(ZLIB).tar.gz ZLIBARCH=$(ZLIB).tar.gz
@ -437,12 +443,6 @@ ifdef WIN32
cat $(LIBTIFF)/COPYRIGHT >> ../doc/README-tiff.txt cat $(LIBTIFF)/COPYRIGHT >> ../doc/README-tiff.txt
endif 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: $(PREFIX)/lib/libz.a
$(PREFIX)/lib/libpng.a: $(LIBPNG)/.ok $(PREFIX)/lib/libpng.a: $(LIBPNG)/.ok
@ -499,10 +499,6 @@ archives/$(JPEGARCH):
@$(MKDIR) $(@D) @$(MKDIR) $(@D)
cd $(@D) && $(GETURL) $(JPEGURL) cd $(@D) && $(GETURL) $(JPEGURL)
archives/$(LIBTIFFARCH):
@$(MKDIR) $(@D)
cd $(@D) && ( $(GETURL) $(LIBTIFFURL) || $(GETURL) $(LIBTIFFURLALT) )
# generic rule to download tarballs # generic rule to download tarballs
archives/%.tar.gz: archives/%.tar.gz:
@$(MKDIR) $(@D) @$(MKDIR) $(@D)

4
3rdparty/tiff-uint64_long_long.patch vendored
View File

@ -2,8 +2,8 @@ $NetBSD$
To avoid conflict with Security.framework on OS X, prefer unsigned long long as 64-bit type. 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 --- a/configure 2015-08-24 22:13:55.000000000 +0000
+++ configure +++ b/configure
@@ -17750,11 +17750,7 @@ _ACEOF @@ -17750,11 +17750,7 @@ _ACEOF
$as_echo_n "checking for unsigned 64-bit type... " >&6; } $as_echo_n "checking for unsigned 64-bit type... " >&6; }
UINT64_T='none' UINT64_T='none'