1.6.0

3 files changed, 21 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e3650558b4a..71a8ad696dc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-libgeotiff
 	pkgdesc = A TIFF based interchange format for georeferenced raster imagery (mingw-w64)
-	pkgver = 1.5.1
+	pkgver = 1.6.0
 	pkgrel = 1
 	url = https://trac.osgeo.org/geotiff/
 	arch = any
@@ -12,10 +12,10 @@ pkgbase = mingw-w64-libgeotiff
 	options = !buildflags
 	options = staticlibs
 	options = !strip
-	source = http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.5.1.tar.gz
+	source = http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.6.0.tar.gz
 	source = libgeotiff_buildsys.patch
-	sha256sums = f9e99733c170d11052f562bcd2c7cb4de53ed405f7acdde4f16195cd3ead612c
-	sha256sums = 0639212e7dee968ec303c70e98eb074e0ac31596388d3a62c10f3ab76c072ed5
+	sha256sums = 9311017e5284cffb86f2c7b7a9df1fb5ebcdc61c30468fb2e6bca36e4272ebca
+	sha256sums = fb7e213559f779905c913389ad715e3aaf849c0e8c8ef72df86d1ca313d9393b
 
 pkgname = mingw-w64-libgeotiff
 
diff --git a/PKGBUILD b/PKGBUILD
index ade0bc1584af..b298d05680fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Andrew Sun <adsun701@gmail.com>
+# Maintainer: Andrew Sun <adsun701 at gmail dot com>
 
 pkgname=mingw-w64-libgeotiff
-pkgver=1.5.1
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="A TIFF based interchange format for georeferenced raster imagery (mingw-w64)"
 arch=('any')
@@ -12,8 +12,8 @@ makedepends=('mingw-w64-configure')
 options=('!buildflags' 'staticlibs' '!strip')
 source=("http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-${pkgver}.tar.gz"
         "libgeotiff_buildsys.patch")
-sha256sums=('f9e99733c170d11052f562bcd2c7cb4de53ed405f7acdde4f16195cd3ead612c'
-            '0639212e7dee968ec303c70e98eb074e0ac31596388d3a62c10f3ab76c072ed5')
+sha256sums=('9311017e5284cffb86f2c7b7a9df1fb5ebcdc61c30468fb2e6bca36e4272ebca'
+            'fb7e213559f779905c913389ad715e3aaf849c0e8c8ef72df86d1ca313d9393b')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
diff --git a/libgeotiff_buildsys.patch b/libgeotiff_buildsys.patch
index deb0b535186b..37a7f7cbcb3b 100644
--- a/libgeotiff_buildsys.patch
+++ b/libgeotiff_buildsys.patch
@@ -1,48 +1,39 @@
-diff -Naur libgeotiff-1.5.1.orig/bin/Makefile.am libgeotiff-1.5.1/bin/Makefile.am
---- libgeotiff-1.5.1.orig/bin/Makefile.am	2019-04-02 16:00:18.771074061 -0400
-+++ libgeotiff-1.5.1/bin/Makefile.am	2019-04-02 16:01:42.484867414 -0400
+diff -Naur libgeotiff-1.6.0.orig/bin/Makefile.am libgeotiff-1.6.0/bin/Makefile.am
+--- libgeotiff-1.6.0.orig/bin/Makefile.am	2020-05-18 13:01:27.078949115 -0400
++++ libgeotiff-1.6.0/bin/Makefile.am	2020-05-18 13:03:10.903759320 -0400
 @@ -12,9 +12,9 @@
  TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
  endif
  
--AM_CFLAGS = -I../ -I../libxtiff $(TIFF_CFLAGS) @PROJ_INCLUDE@
-+AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libxtiff $(TIFF_CFLAGS) @PROJ_INCLUDE@
+-AM_CFLAGS = -I../  -I$(srcdir)/.. -I$(srcdir)/../libxtiff $(TIFF_CFLAGS) @PROJ_INCLUDE@
++AM_CFLAGS = -I$(top_srcdir)  -I$(top_srcdir)/libxtiff $(TIFF_CFLAGS) @PROJ_INCLUDE@
  
 -LDADD = ../libgeotiff.la
 +LDADD = $(top_builddir)/libgeotiff.la
  
  EXTRA_DIST =    getopt.c
  
-diff -Naur libgeotiff-1.5.1.orig/libxtiff/Makefile.am libgeotiff-1.5.1/libxtiff/Makefile.am
---- libgeotiff-1.5.1.orig/libxtiff/Makefile.am	2019-04-02 16:00:18.771074061 -0400
-+++ libgeotiff-1.5.1/libxtiff/Makefile.am	2019-04-02 16:04:25.129084271 -0400
+diff -Naur libgeotiff-1.6.0.orig/libxtiff/Makefile.am libgeotiff-1.6.0/libxtiff/Makefile.am
+--- libgeotiff-1.6.0.orig/libxtiff/Makefile.am	2020-05-18 13:01:27.072282278 -0400
++++ libgeotiff-1.6.0/libxtiff/Makefile.am	2020-05-18 13:03:33.455220288 -0400
 @@ -4,7 +4,7 @@
  TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
  endif
  
--AM_CFLAGS = -I../ $(TIFF_CFLAGS) 
+-AM_CFLAGS = -I../ -I$(srcdir)/.. $(TIFF_CFLAGS) 
 +AM_CFLAGS = -I$(top_srcdir) $(TIFF_CFLAGS) 
  
  libxtiff_la_SOURCES = xtiff.c
  
-diff -Naur libgeotiff-1.5.1.orig/Makefile.am libgeotiff-1.5.1/Makefile.am
---- libgeotiff-1.5.1.orig/Makefile.am	2019-04-02 16:00:18.771074061 -0400
-+++ libgeotiff-1.5.1/Makefile.am	2019-04-02 16:05:07.432645580 -0400
+diff -Naur libgeotiff-1.6.0.orig/Makefile.am libgeotiff-1.6.0/Makefile.am
+--- libgeotiff-1.6.0.orig/Makefile.am	2020-05-18 13:01:27.082282534 -0400
++++ libgeotiff-1.6.0/Makefile.am	2020-05-18 13:05:11.805886400 -0400
 @@ -11,7 +11,7 @@
  TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
  endif
  
--AM_CFLAGS = -I./libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS)
+-AM_CFLAGS = -I$(srcdir)/libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS)
 +AM_CFLAGS = -I$(top_srcdir)/libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS)
  
  include_HEADERS =   geotiff.h \
                      geotiffio.h \
-@@ -52,7 +52,7 @@
-                         geo_strtod.c \
-                         geotiff_proj4.c
- 
--libgeotiff_la_LDFLAGS = -version-info 5:1:0
-+libgeotiff_la_LDFLAGS = -version-info 5:1:0 -no-undefined
- 
- libgeotiff_la_LIBADD = libxtiff/libxtiff.la
-