From bf7f20d45b00d020fe110a00a150062fa134cabb Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Tue, 20 Jun 2017 20:18:25 +0300
Subject: [PATCH] gdal: Update to 2.2.0

---
 .../0001-external-qhull-static.patch          | 22 +++++++++----------
 mingw-w64-gdal/PKGBUILD                       | 14 ++++++------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/mingw-w64-gdal/0001-external-qhull-static.patch b/mingw-w64-gdal/0001-external-qhull-static.patch
index 543edd7b30..a4c0e4ea4e 100644
--- a/mingw-w64-gdal/0001-external-qhull-static.patch
+++ b/mingw-w64-gdal/0001-external-qhull-static.patch
@@ -1,18 +1,18 @@
---- gdal-2.1.3/configure.in.orig	2017-01-31 15:53:29.143937100 +0300
-+++ gdal-2.1.3/configure.in	2017-01-31 15:53:45.180854300 +0300
-@@ -3639,7 +3639,7 @@
-         else
-             EXTRA_INCLUDES="-I/usr/local/include/qhull $EXTRA_INCLUDES"
-         fi
+--- gdal-2.2.0/configure.ac.orig	2017-01-31 15:53:29.143937100 +0300
++++ gdal-2.2.0/configure.ac	2017-01-31 15:53:45.180854300 +0300
+@@ -3976,7 +3976,7 @@
+     if test "$QHULL_SETTING" = "yes"; then
+         QHULL_SETTING=external
+         QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=0
 -        LIBS="-lqhull $LIBS"
 +        LIBS="-lqhullstatic $LIBS"
      fi
    fi
-   AC_CHECK_HEADERS([libqhull/libqhull.h])
-@@ -3652,7 +3652,7 @@
-         else
-             EXTRA_INCLUDES="-I/usr/local/include/libqhull $EXTRA_INCLUDES"
-         fi
+  AC_CHECK_HEADERS([libqhull/libqhull.h])
+@@ -3985,7 +3985,7 @@
+     if test "$QHULL_SETTING" = "yes"; then
+         QHULL_SETTING=external
+         QHULL_INCLUDE_SUBDIR_IS_LIBQHULL=1
 -        LIBS="-lqhull $LIBS"
 +        LIBS="-lqhullstatic $LIBS"
      fi
diff --git a/mingw-w64-gdal/PKGBUILD b/mingw-w64-gdal/PKGBUILD
index 17c197ec72..568cc4975f 100644
--- a/mingw-w64-gdal/PKGBUILD
+++ b/mingw-w64-gdal/PKGBUILD
@@ -7,8 +7,8 @@
 _realname=gdal
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.1.3
-pkgrel=3
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats (mingw-w64)"
 arch=('any')
 url="http://www.gdal.org/"
@@ -47,17 +47,17 @@ options=('strip' 'staticlibs')
 
 source=(http://download.osgeo.org/${_realname}/${pkgver}/${_realname}-${pkgver}.tar.gz
         0001-external-qhull-static.patch)
-sha256sums=('ae6a0a0dc6eb45a981a46db27e3dfe16c644fcf04732557e2cb315776974074a'
-            '624b81775e3395c32f3efd3dabb8539155569e871dde7f6a0cdc6e96bf519b05')
+sha256sums=('d06546a6e34b77566512a2559e9117402320dd9487de9aa95cb8a377815dc360'
+            '6952586cd4436003748e8d99f2e8e8a660ba59bdb3c0b294493695ef57f93077')
 
 prepare() {
   [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
   cp -rf ${_realname}-${pkgver} build-${MINGW_CHOST}
   cd "${srcdir}/build-${MINGW_CHOST}"
   
-  sed -i "s|/usr/local|${MINGW_PREFIX}|g" configure.in
-  sed -i "s|/usr|${MINGW_PREFIX}|g" configure.in
-  sed -i "s|mandir='\${prefix}/man'|mandir='\${prefix}/share/man'|g" configure.in
+  sed -i "s|/usr/local|${MINGW_PREFIX}|g" configure.ac
+  sed -i "s|/usr|${MINGW_PREFIX}|g" configure.ac
+  sed -i "s|mandir='\${prefix}/man'|mandir='\${prefix}/share/man'|g" configure.ac
   for p in m4/*.m4
   do
     sed -i "s|/usr|${MINGW_PREFIX}|g" $p