gdal 2.2.2

gdal/PKGBUILD

@@ -1,7 +1,7 @@
 # Contributions from Arch: https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/gdal
 
 pkgname=gdal
-pkgver=2.1.2
+pkgver=2.2.2
 pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('x86_64')
@@ -15,8 +15,10 @@ optdepends=('postgresql: postgresql database support'
             'perl:  perl binding support'
             'swig:  perl binding support')
 options=('!makeflags')
-source=("http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('b597f36bd29a2b4368998ddd32b28c8cdf3c8192237a81b99af83cc17d7fa374')
+source=("http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+              'gdal-perl-vendor.patch')
+sha256sums=('eb25d6ee85f4f5ac1d5581958f8c6eed9b1d50746f82866fe92e507541def35b'
+            '20989e5fa499206b42c92280ce084fdf7b2f661a4233fc349611cc57102fe114')
 
 prepare() {
   cd "${srcdir}"/$pkgname-$pkgver
@@ -28,6 +30,9 @@ prepare() {
 
 # Fix mandir
   sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
+
+# Fix Perl bindings installation path
+  patch -Np1 -i ../gdal-perl-vendor.patch
 }
 
 build() {
@@ -38,7 +43,7 @@ build() {
 
   ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 \
               --with-geotiff --with-mysql --with-python --with-curl \
-              --with-hdf5 --with-perl --with-geos --with-png --with-poppler --with-spatialite
+              --with-hdf5 --with-perl --with-geos --with-png --with-poppler --with-spatialite --with-openjpeg
 
   # workaround for bug #13646
   sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
@@ -63,8 +68,10 @@ package () {
   rm -f "${pkgdir}"/usr/share/man/man1/_build_gdal_src_gdal-${pkgver}_apps_.1
 
 # Remove RPATH
-  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OSR/OSR.so
-  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/OGR/OGR.so
-  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/GDAL.so
-  chrpath --delete "${pkgdir}"/usr/lib/perl5/${CARCH}-linux-thread-multi/auto/Geo/GDAL/Const/Const.so
+  eval local $(perl -V:vendorarch)
+  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/OSR/OSR.so
+  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/OGR/OGR.so
+  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/GDAL/GDAL.so
+  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/GDAL/Const/Const.so
+  chrpath --delete "${pkgdir}"${vendorarch}/auto/Geo/GNM/GNM.so
 }

gdal/gdal-1.5.1-python-install.patch

@@ -1,10 +0,0 @@
---- swig/python/GNUmakefile.orig	2010-04-24 01:22:07.000000000 +0200
-+++ swig/python/GNUmakefile	2010-05-05 19:14:58.000000000 +0200
-@@ -72,5 +72,5 @@
- ifeq ($(PY_HAVE_SETUPTOOLS),1)
--	$(PYTHON) setup.py install 
-+	$(PYTHON) setup.py install --root=$(DESTDIR) 
- else
--	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-+	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
- endif

gdal/gdal-perl-vendor.patch

@@ -0,0 +1,28 @@
+Description: pass INSTALLDIRS=vendor to Makefile.PL to get stuff into the right place
+Origin: vendor
+Forwarded: not-needed
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2014-07-08
+
+--- a/swig/perl/Makefile
++++ b/swig/perl/Makefile
+@@ -7,7 +7,7 @@ build: Makefile_Geo__GDAL
+ 	$(MAKE) -f Makefile_Geo__OSR
+ 
+ Makefile_Geo__GDAL:
+-	perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
++	perl Makefile.PL INSTALLDIRS=vendor
+ 
+ test: build
+ 	$(MAKE) -f Makefile_Geo__GDAL test
+--- a/swig/perl/GNUmakefile
++++ b/swig/perl/GNUmakefile
+@@ -30,7 +30,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
+ gdal_wrap.cc: generate
+ 
+ Makefile_Geo__GDAL:
+-	perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
++	perl Makefile.PL INSTALLDIRS=vendor
+ 
+ test: build
+ 	$(MAKE) -f Makefile_Geo__GDAL test

gdal/poppler-0.31.patch

@@ -1,12 +0,0 @@
-diff -Nur gdal-1.11.2/frmts/pdf/pdfdataset.cpp gdal-1.11.2a/frmts/pdf/pdfdataset.cpp
---- gdal-1.11.2/frmts/pdf/pdfdataset.cpp	2015-02-10 13:11:19.000000000 +0100
-+++ gdal-1.11.2a/frmts/pdf/pdfdataset.cpp	2015-03-02 18:38:25.170155277 +0100
-@@ -113,7 +113,7 @@
-                          GBool allowAntialiasA = gTrue) :
-                 SplashOutputDev(colorModeA, bitmapRowPadA,
-                                 reverseVideoA, paperColorA,
--                                bitmapTopDownA, allowAntialiasA),
-+                                bitmapTopDownA),
-                 bEnableVector(TRUE),
-                 bEnableText(TRUE),
-                 bEnableBitmap(TRUE) {}