update to 1.5.1

3 files changed, 31 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 41a7b0fc3f59..3e3650558b4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-libgeotiff
 	pkgdesc = A TIFF based interchange format for georeferenced raster imagery (mingw-w64)
-	pkgver = 1.4.3
-	pkgrel = 2
+	pkgver = 1.5.1
+	pkgrel = 1
 	url = https://trac.osgeo.org/geotiff/
 	arch = any
 	license = custom
@@ -12,10 +12,10 @@ pkgbase = mingw-w64-libgeotiff
 	options = !buildflags
 	options = staticlibs
 	options = !strip
-	source = http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.3.tar.gz
+	source = http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.5.1.tar.gz
 	source = libgeotiff_buildsys.patch
-	sha256sums = b8510d9b968b5ee899282cdd5bef13fd02d5a4c19f664553f81e31127bc47265
-	sha256sums = b158fc586ea55e5c8a1c8137eaf9a1f95c2d28709f8b550739aad9f85235bfcf
+	sha256sums = f9e99733c170d11052f562bcd2c7cb4de53ed405f7acdde4f16195cd3ead612c
+	sha256sums = 0639212e7dee968ec303c70e98eb074e0ac31596388d3a62c10f3ab76c072ed5
 
 pkgname = mingw-w64-libgeotiff
 
diff --git a/PKGBUILD b/PKGBUILD
index eb817b9f5a30..ade0bc1584af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Andrew Sun <adsun701@gmail.com>
 
 pkgname=mingw-w64-libgeotiff
-pkgver=1.4.3
-pkgrel=2
+pkgver=1.5.1
+pkgrel=1
 pkgdesc="A TIFF based interchange format for georeferenced raster imagery (mingw-w64)"
 arch=('any')
 url="https://trac.osgeo.org/geotiff/"
@@ -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=('b8510d9b968b5ee899282cdd5bef13fd02d5a4c19f664553f81e31127bc47265'
-            'b158fc586ea55e5c8a1c8137eaf9a1f95c2d28709f8b550739aad9f85235bfcf')
+sha256sums=('f9e99733c170d11052f562bcd2c7cb4de53ed405f7acdde4f16195cd3ead612c'
+            '0639212e7dee968ec303c70e98eb074e0ac31596388d3a62c10f3ab76c072ed5')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -37,7 +37,6 @@ prepare() {
 
 build() {
   cd ${srcdir}/libgeotiff-${pkgver}
-  CPPFLAGS+=" -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-configure \
diff --git a/libgeotiff_buildsys.patch b/libgeotiff_buildsys.patch
index e89fb99133d0..deb0b535186b 100644
--- a/libgeotiff_buildsys.patch
+++ b/libgeotiff_buildsys.patch
@@ -1,62 +1,48 @@
-diff -Naur libgeotiff-1.4.3.orig/bin/Makefile.am libgeotiff-1.4.3/bin/Makefile.am
---- libgeotiff-1.4.3.orig/bin/Makefile.am	2018-12-18 17:07:14.192291200 -0500
-+++ libgeotiff-1.4.3/bin/Makefile.am	2018-12-18 17:08:47.527580400 -0500
+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
 @@ -12,9 +12,9 @@
  TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
  endif
  
--AM_CFLAGS = -I../ -I../libxtiff $(TIFF_CFLAGS) 
-+AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libxtiff $(TIFF_CFLAGS)
+-AM_CFLAGS = -I../ -I../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.4.3.orig/configure.ac libgeotiff-1.4.3/configure.ac
---- libgeotiff-1.4.3.orig/configure.ac	2018-12-18 17:07:14.176672800 -0500
-+++ libgeotiff-1.4.3/configure.ac	2018-12-18 17:09:41.171402100 -0500
-@@ -281,8 +281,8 @@
-   PROJ_INC=-I$PROJ_INC
- 
-   AC_SUBST(PROJ_INC,$PROJ_INC)
--  AC_DEFINE(HAVE_PROJECTS_H)
--  AC_DEFINE(HAVE_LIBPROJ)
-+  AC_DEFINE([HAVE_PROJECTS_H],[1],[have projects.h])
-+  AC_DEFINE(HAVE_LIBPROJ,[1],[have libproj])
-   AC_SUBST([HAVE_LIBPROJ])
-   PROJ_CONFIG="yes"
- 
-diff -Naur libgeotiff-1.4.3.orig/libxtiff/Makefile.am libgeotiff-1.4.3/libxtiff/Makefile.am
---- libgeotiff-1.4.3.orig/libxtiff/Makefile.am	2018-12-18 17:07:14.145435400 -0500
-+++ libgeotiff-1.4.3/libxtiff/Makefile.am	2018-12-18 17:10:10.334137900 -0500
+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
 @@ -4,7 +4,7 @@
  TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
  endif
  
 -AM_CFLAGS = -I../ $(TIFF_CFLAGS) 
-+AM_CFLAGS = -I$(top_srcdir) $(TIFF_CFLAGS)
++AM_CFLAGS = -I$(top_srcdir) $(TIFF_CFLAGS) 
  
  libxtiff_la_SOURCES = xtiff.c
  
-diff -Naur libgeotiff-1.4.3.orig/Makefile.am libgeotiff-1.4.3/Makefile.am
---- libgeotiff-1.4.3.orig/Makefile.am	2018-12-18 17:07:14.067289600 -0500
-+++ libgeotiff-1.4.3/Makefile.am	2018-12-18 17:11:10.478667900 -0500
-@@ -18,7 +18,7 @@
+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
+@@ -11,7 +11,7 @@
  TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
  endif
  
--AM_CFLAGS = -I./libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS) \
-+AM_CFLAGS = -I$(top_srcdir)/libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS) \
- 			-DCSV_DATA_DIR=\"$(datadir)/epsg_csv\"
+-AM_CFLAGS = -I./libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS)
++AM_CFLAGS = -I$(top_srcdir)/libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS)
  
- csvdir = $(datadir)/epsg_csv
-@@ -110,7 +110,7 @@
-                              csv/unit_of_measure.c
- endif
+ include_HEADERS =   geotiff.h \
+                     geotiffio.h \
+@@ -52,7 +52,7 @@
+                         geo_strtod.c \
+                         geotiff_proj4.c
  
--libgeotiff_la_LDFLAGS = -version-info 4:0:2
-+libgeotiff_la_LDFLAGS = -version-info 4:0:2 -no-undefined
+-libgeotiff_la_LDFLAGS = -version-info 5:1:0
++libgeotiff_la_LDFLAGS = -version-info 5:1:0 -no-undefined
  
  libgeotiff_la_LIBADD = libxtiff/libxtiff.la