[arch-commits] Commit in gdal1/repos (20 files)
Ray Rashif
schiv at archlinux.org
Wed Sep 23 21:07:25 UTC 2015
Date: Wednesday, September 23, 2015 @ 23:07:24
Author: schiv
Revision: 141549
archrelease: copy trunk to community-i686, community-x86_64
Added:
gdal1/repos/community-i686/PKGBUILD
(from rev 141548, gdal1/trunk/PKGBUILD)
gdal1/repos/community-i686/gdal-1.5.1-python-install.patch
(from rev 141548, gdal1/trunk/gdal-1.5.1-python-install.patch)
gdal1/repos/community-i686/gdal1.changelog
(from rev 141548, gdal1/trunk/gdal1.changelog)
gdal1/repos/community-i686/glibc.patch
(from rev 141548, gdal1/trunk/glibc.patch)
gdal1/repos/community-i686/poppler-0.31.patch
(from rev 141548, gdal1/trunk/poppler-0.31.patch)
gdal1/repos/community-x86_64/PKGBUILD
(from rev 141548, gdal1/trunk/PKGBUILD)
gdal1/repos/community-x86_64/gdal-1.5.1-python-install.patch
(from rev 141548, gdal1/trunk/gdal-1.5.1-python-install.patch)
gdal1/repos/community-x86_64/gdal1.changelog
(from rev 141548, gdal1/trunk/gdal1.changelog)
gdal1/repos/community-x86_64/glibc.patch
(from rev 141548, gdal1/trunk/glibc.patch)
gdal1/repos/community-x86_64/poppler-0.31.patch
(from rev 141548, gdal1/trunk/poppler-0.31.patch)
Deleted:
gdal1/repos/community-i686/PKGBUILD
gdal1/repos/community-i686/gdal-1.5.1-python-install.patch
gdal1/repos/community-i686/gdal1.changelog
gdal1/repos/community-i686/glibc.patch
gdal1/repos/community-i686/poppler-0.31.patch
gdal1/repos/community-x86_64/PKGBUILD
gdal1/repos/community-x86_64/gdal-1.5.1-python-install.patch
gdal1/repos/community-x86_64/gdal1.changelog
gdal1/repos/community-x86_64/glibc.patch
gdal1/repos/community-x86_64/poppler-0.31.patch
--------------------------------------------------+
/PKGBUILD | 166 +++++++++++++++++++++
/gdal-1.5.1-python-install.patch | 20 ++
/gdal1.changelog | 114 ++++++++++++++
/glibc.patch | 28 +++
/poppler-0.31.patch | 24 +++
community-i686/PKGBUILD | 84 ----------
community-i686/gdal-1.5.1-python-install.patch | 10 -
community-i686/gdal1.changelog | 50 ------
community-i686/glibc.patch | 14 -
community-i686/poppler-0.31.patch | 12 -
community-x86_64/PKGBUILD | 84 ----------
community-x86_64/gdal-1.5.1-python-install.patch | 10 -
community-x86_64/gdal1.changelog | 50 ------
community-x86_64/glibc.patch | 14 -
community-x86_64/poppler-0.31.patch | 12 -
15 files changed, 352 insertions(+), 340 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-09-23 21:07:02 UTC (rev 141548)
+++ community-i686/PKGBUILD 2015-09-23 21:07:24 UTC (rev 141549)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer: Ray Rashif <schiv at archlinux.org>
-# Contributor: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=gdal1
-_pkgname=gdal
-pkgver=1.11.2
-pkgrel=1
-pkgdesc="A translator library for raster geospatial data formats"
-arch=('i686' 'x86_64')
-url="http://www.gdal.org/"
-license=('custom')
-depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libspatialite' 'libtiff' 'netcdf' 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
-makedepends=('perl' 'swig' 'chrpath' 'doxygen')
-optdepends=('postgresql: postgresql database support'
- 'mariadb: mariadb database support'
- 'perl: perl binding support')
-provides=('gdal')
-conflicts=('gdal')
-changelog=$pkgname.changelog
-source=(http://download.osgeo.org/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.gz
- gdal-1.5.1-python-install.patch
- poppler-0.31.patch
- glibc.patch)
-sha256sums=('66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845'
- '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6'
- '4fc42bdb729cec92920236ef9f3302fab497069dbb7d41d81222e7e48a36e7a6'
- 'f0096bfbd9219a000d173a97ee10e30d8939c3fff40ef44e2dfb1a494b617a9f')
-
-prepare() {
- cd "${srcdir}"/$_pkgname-$pkgver
- patch -Np0 -i "${srcdir}"/gdal-1.5.1-python-install.patch
- patch -Np1 -i "${srcdir}"/poppler-0.31.patch
- patch -Np3 -i "${srcdir}"/glibc.patch
-
-# python2 fixes
- sed -i 's_python python1.5_python2 python python1.5_' configure
- for file in swig/python/{,osgeo/,samples/,scripts/}*.py; do
- sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
- done
-
-# Fix mandir
- sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
-}
-
-build() {
- cd "${srcdir}"/$_pkgname-$pkgver
- export CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-# bug #23654
- export LDFLAGS="$LDFLAGS -Wl,--as-needed"
-
- ./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
-
-# workaround for bug #13646
- sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
- sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile
-
- make
- make man
-}
-
-package () {
- cd "${srcdir}"/$_pkgname-$pkgver
- make DESTDIR="${pkgdir}" install
- make DESTDIR="${pkgdir}" install-man
-
-# install license
- install -D -m644 LICENSE.TXT "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
-
-#FS15477 clean up junks
- rm -f "${pkgdir}"/usr/bin/*.dox
- 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
-}
Copied: gdal1/repos/community-i686/PKGBUILD (from rev 141548, gdal1/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-09-23 21:07:24 UTC (rev 141549)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=gdal1
+_pkgname=gdal
+pkgver=1.11.2
+pkgrel=2
+pkgdesc="A translator library for raster geospatial data formats"
+arch=('i686' 'x86_64')
+url="http://www.gdal.org/"
+license=('custom')
+depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libspatialite' 'libtiff' 'netcdf' 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
+makedepends=('perl' 'swig' 'chrpath' 'doxygen')
+optdepends=('postgresql: postgresql database support'
+ 'mariadb: mariadb database support'
+ 'perl: perl binding support')
+conflicts=('gdal')
+changelog=$pkgname.changelog
+source=(http://download.osgeo.org/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.gz
+ gdal-1.5.1-python-install.patch
+ poppler-0.31.patch
+ glibc.patch)
+sha256sums=('66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845'
+ '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6'
+ '4fc42bdb729cec92920236ef9f3302fab497069dbb7d41d81222e7e48a36e7a6'
+ 'f0096bfbd9219a000d173a97ee10e30d8939c3fff40ef44e2dfb1a494b617a9f')
+
+prepare() {
+ cd "${srcdir}"/$_pkgname-$pkgver
+ patch -Np0 -i "${srcdir}"/gdal-1.5.1-python-install.patch
+ patch -Np1 -i "${srcdir}"/poppler-0.31.patch
+ patch -Np3 -i "${srcdir}"/glibc.patch
+
+# python2 fixes
+ sed -i 's_python python1.5_python2 python python1.5_' configure
+ for file in swig/python/{,osgeo/,samples/,scripts/}*.py; do
+ sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
+ done
+
+# Fix mandir
+ sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
+}
+
+build() {
+ cd "${srcdir}"/$_pkgname-$pkgver
+ export CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+# bug #23654
+ export LDFLAGS="$LDFLAGS -Wl,--as-needed"
+
+ ./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
+
+# workaround for bug #13646
+ sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
+ sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile
+
+ make
+ make man
+}
+
+package () {
+ cd "${srcdir}"/$_pkgname-$pkgver
+ make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" install-man
+
+# install license
+ install -D -m644 LICENSE.TXT "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
+
+#FS15477 clean up junks
+ rm -f "${pkgdir}"/usr/bin/*.dox
+ 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
+}
Deleted: community-i686/gdal-1.5.1-python-install.patch
===================================================================
--- community-i686/gdal-1.5.1-python-install.patch 2015-09-23 21:07:02 UTC (rev 141548)
+++ community-i686/gdal-1.5.1-python-install.patch 2015-09-23 21:07:24 UTC (rev 141549)
@@ -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
Copied: gdal1/repos/community-i686/gdal-1.5.1-python-install.patch (from rev 141548, gdal1/trunk/gdal-1.5.1-python-install.patch)
===================================================================
--- community-i686/gdal-1.5.1-python-install.patch (rev 0)
+++ community-i686/gdal-1.5.1-python-install.patch 2015-09-23 21:07:24 UTC (rev 141549)
@@ -0,0 +1,10 @@
+--- 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
Deleted: community-i686/gdal1.changelog
===================================================================
--- community-i686/gdal1.changelog 2015-09-23 21:07:02 UTC (rev 141548)
+++ community-i686/gdal1.changelog 2015-09-23 21:07:24 UTC (rev 141549)
@@ -1,50 +0,0 @@
-2015-09-23 Ray Rashif <schiv at archlinux.org>
- * gdal1 1.11.2-1 for VTK (FS#46346)
-
-2015-02-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.2-1
-
-2015-01-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.1-6 poppler 0.30.0 rebuild
-
-2014-12-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.1-5 FS#43193 fix
-
-2014-12-20 Evangelos Foutras <evangelos at foutrelis.com>
- * gdal 1.11.1-4 poppler 0.29.0 rebuild
-
-2014-11-25 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.1-3 hdf5 1.8.14 rebuild
-
-2014-10-03 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.1-1
-
-2014-07-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.0-4 libspatialite soname rebuild
-
-2014-05-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.0-2 giflib soname rebuild
-
-2014-04-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.0-1
-
-2013-11-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.10.1-1
-
-2013-09-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.10.0-4 FS#36328 fix
-
-2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.10.0-1
-
-2011-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.8.0-1
-
-2010-11-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.7.3
-
-2010-06-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * FS#19946 fixed in 1.7.2-2
-
-2010-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.7.2
Copied: gdal1/repos/community-i686/gdal1.changelog (from rev 141548, gdal1/trunk/gdal1.changelog)
===================================================================
--- community-i686/gdal1.changelog (rev 0)
+++ community-i686/gdal1.changelog 2015-09-23 21:07:24 UTC (rev 141549)
@@ -0,0 +1,57 @@
+2015-09-24 Ray Rashif <schiv at archlinux.org>
+ * gdal1 1.11.2-2 remove wrong provision for gdal
+
+ users must tentatively choose between vtk and other
+ packages depending on gdal; this is only a short-term
+ workaround as the gdal2 rebuild had to move on.
+
+2015-09-23 Ray Rashif <schiv at archlinux.org>
+ * gdal1 1.11.2-1 for VTK (FS#46346)
+
+2015-02-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.2-1
+
+2015-01-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.1-6 poppler 0.30.0 rebuild
+
+2014-12-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.1-5 FS#43193 fix
+
+2014-12-20 Evangelos Foutras <evangelos at foutrelis.com>
+ * gdal 1.11.1-4 poppler 0.29.0 rebuild
+
+2014-11-25 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.1-3 hdf5 1.8.14 rebuild
+
+2014-10-03 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.1-1
+
+2014-07-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.0-4 libspatialite soname rebuild
+
+2014-05-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.0-2 giflib soname rebuild
+
+2014-04-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.0-1
+
+2013-11-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.10.1-1
+
+2013-09-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.10.0-4 FS#36328 fix
+
+2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.10.0-1
+
+2011-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.8.0-1
+
+2010-11-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.7.3
+
+2010-06-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * FS#19946 fixed in 1.7.2-2
+
+2010-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.7.2
Deleted: community-i686/glibc.patch
===================================================================
--- community-i686/glibc.patch 2015-09-23 21:07:02 UTC (rev 141548)
+++ community-i686/glibc.patch 2015-09-23 21:07:24 UTC (rev 141549)
@@ -1,14 +0,0 @@
-Index: trunk/gdal/apps/gdalserver.c
-===================================================================
---- a/trunk/gdal/apps/gdalserver.c
-+++ b/trunk/gdal/apps/gdalserver.c
-@@ -28,7 +28,6 @@
- ****************************************************************************/
-
--#if defined(__STDC_VERSION__)
--#define _XOPEN_SOURCE
--#endif
-+// So that __USE_XOPEN2K is defined to have getaddrinfo
-+#define _XOPEN_SOURCE 600
-
- #include "cpl_port.h"
Copied: gdal1/repos/community-i686/glibc.patch (from rev 141548, gdal1/trunk/glibc.patch)
===================================================================
--- community-i686/glibc.patch (rev 0)
+++ community-i686/glibc.patch 2015-09-23 21:07:24 UTC (rev 141549)
@@ -0,0 +1,14 @@
+Index: trunk/gdal/apps/gdalserver.c
+===================================================================
+--- a/trunk/gdal/apps/gdalserver.c
++++ b/trunk/gdal/apps/gdalserver.c
+@@ -28,7 +28,6 @@
+ ****************************************************************************/
+
+-#if defined(__STDC_VERSION__)
+-#define _XOPEN_SOURCE
+-#endif
++// So that __USE_XOPEN2K is defined to have getaddrinfo
++#define _XOPEN_SOURCE 600
+
+ #include "cpl_port.h"
Deleted: community-i686/poppler-0.31.patch
===================================================================
--- community-i686/poppler-0.31.patch 2015-09-23 21:07:02 UTC (rev 141548)
+++ community-i686/poppler-0.31.patch 2015-09-23 21:07:24 UTC (rev 141549)
@@ -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) {}
Copied: gdal1/repos/community-i686/poppler-0.31.patch (from rev 141548, gdal1/trunk/poppler-0.31.patch)
===================================================================
--- community-i686/poppler-0.31.patch (rev 0)
+++ community-i686/poppler-0.31.patch 2015-09-23 21:07:24 UTC (rev 141549)
@@ -0,0 +1,12 @@
+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) {}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-09-23 21:07:02 UTC (rev 141548)
+++ community-x86_64/PKGBUILD 2015-09-23 21:07:24 UTC (rev 141549)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer: Ray Rashif <schiv at archlinux.org>
-# Contributor: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=gdal1
-_pkgname=gdal
-pkgver=1.11.2
-pkgrel=1
-pkgdesc="A translator library for raster geospatial data formats"
-arch=('i686' 'x86_64')
-url="http://www.gdal.org/"
-license=('custom')
-depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libspatialite' 'libtiff' 'netcdf' 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
-makedepends=('perl' 'swig' 'chrpath' 'doxygen')
-optdepends=('postgresql: postgresql database support'
- 'mariadb: mariadb database support'
- 'perl: perl binding support')
-provides=('gdal')
-conflicts=('gdal')
-changelog=$pkgname.changelog
-source=(http://download.osgeo.org/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.gz
- gdal-1.5.1-python-install.patch
- poppler-0.31.patch
- glibc.patch)
-sha256sums=('66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845'
- '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6'
- '4fc42bdb729cec92920236ef9f3302fab497069dbb7d41d81222e7e48a36e7a6'
- 'f0096bfbd9219a000d173a97ee10e30d8939c3fff40ef44e2dfb1a494b617a9f')
-
-prepare() {
- cd "${srcdir}"/$_pkgname-$pkgver
- patch -Np0 -i "${srcdir}"/gdal-1.5.1-python-install.patch
- patch -Np1 -i "${srcdir}"/poppler-0.31.patch
- patch -Np3 -i "${srcdir}"/glibc.patch
-
-# python2 fixes
- sed -i 's_python python1.5_python2 python python1.5_' configure
- for file in swig/python/{,osgeo/,samples/,scripts/}*.py; do
- sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
- done
-
-# Fix mandir
- sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
-}
-
-build() {
- cd "${srcdir}"/$_pkgname-$pkgver
- export CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-# bug #23654
- export LDFLAGS="$LDFLAGS -Wl,--as-needed"
-
- ./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
-
-# workaround for bug #13646
- sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
- sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile
-
- make
- make man
-}
-
-package () {
- cd "${srcdir}"/$_pkgname-$pkgver
- make DESTDIR="${pkgdir}" install
- make DESTDIR="${pkgdir}" install-man
-
-# install license
- install -D -m644 LICENSE.TXT "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
-
-#FS15477 clean up junks
- rm -f "${pkgdir}"/usr/bin/*.dox
- 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
-}
Copied: gdal1/repos/community-x86_64/PKGBUILD (from rev 141548, gdal1/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-09-23 21:07:24 UTC (rev 141549)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=gdal1
+_pkgname=gdal
+pkgver=1.11.2
+pkgrel=2
+pkgdesc="A translator library for raster geospatial data formats"
+arch=('i686' 'x86_64')
+url="http://www.gdal.org/"
+license=('custom')
+depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libspatialite' 'libtiff' 'netcdf' 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
+makedepends=('perl' 'swig' 'chrpath' 'doxygen')
+optdepends=('postgresql: postgresql database support'
+ 'mariadb: mariadb database support'
+ 'perl: perl binding support')
+conflicts=('gdal')
+changelog=$pkgname.changelog
+source=(http://download.osgeo.org/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.gz
+ gdal-1.5.1-python-install.patch
+ poppler-0.31.patch
+ glibc.patch)
+sha256sums=('66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845'
+ '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6'
+ '4fc42bdb729cec92920236ef9f3302fab497069dbb7d41d81222e7e48a36e7a6'
+ 'f0096bfbd9219a000d173a97ee10e30d8939c3fff40ef44e2dfb1a494b617a9f')
+
+prepare() {
+ cd "${srcdir}"/$_pkgname-$pkgver
+ patch -Np0 -i "${srcdir}"/gdal-1.5.1-python-install.patch
+ patch -Np1 -i "${srcdir}"/poppler-0.31.patch
+ patch -Np3 -i "${srcdir}"/glibc.patch
+
+# python2 fixes
+ sed -i 's_python python1.5_python2 python python1.5_' configure
+ for file in swig/python/{,osgeo/,samples/,scripts/}*.py; do
+ sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
+ done
+
+# Fix mandir
+ sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
+}
+
+build() {
+ cd "${srcdir}"/$_pkgname-$pkgver
+ export CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+# bug #23654
+ export LDFLAGS="$LDFLAGS -Wl,--as-needed"
+
+ ./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
+
+# workaround for bug #13646
+ sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
+ sed -i 's/EXE_DEP_LIBS/KILL_EXE_DEP_LIBS/' apps/GNUmakefile
+
+ make
+ make man
+}
+
+package () {
+ cd "${srcdir}"/$_pkgname-$pkgver
+ make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" install-man
+
+# install license
+ install -D -m644 LICENSE.TXT "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
+
+#FS15477 clean up junks
+ rm -f "${pkgdir}"/usr/bin/*.dox
+ 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
+}
Deleted: community-x86_64/gdal-1.5.1-python-install.patch
===================================================================
--- community-x86_64/gdal-1.5.1-python-install.patch 2015-09-23 21:07:02 UTC (rev 141548)
+++ community-x86_64/gdal-1.5.1-python-install.patch 2015-09-23 21:07:24 UTC (rev 141549)
@@ -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
Copied: gdal1/repos/community-x86_64/gdal-1.5.1-python-install.patch (from rev 141548, gdal1/trunk/gdal-1.5.1-python-install.patch)
===================================================================
--- community-x86_64/gdal-1.5.1-python-install.patch (rev 0)
+++ community-x86_64/gdal-1.5.1-python-install.patch 2015-09-23 21:07:24 UTC (rev 141549)
@@ -0,0 +1,10 @@
+--- 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
Deleted: community-x86_64/gdal1.changelog
===================================================================
--- community-x86_64/gdal1.changelog 2015-09-23 21:07:02 UTC (rev 141548)
+++ community-x86_64/gdal1.changelog 2015-09-23 21:07:24 UTC (rev 141549)
@@ -1,50 +0,0 @@
-2015-09-23 Ray Rashif <schiv at archlinux.org>
- * gdal1 1.11.2-1 for VTK (FS#46346)
-
-2015-02-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.2-1
-
-2015-01-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.1-6 poppler 0.30.0 rebuild
-
-2014-12-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.1-5 FS#43193 fix
-
-2014-12-20 Evangelos Foutras <evangelos at foutrelis.com>
- * gdal 1.11.1-4 poppler 0.29.0 rebuild
-
-2014-11-25 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.1-3 hdf5 1.8.14 rebuild
-
-2014-10-03 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.1-1
-
-2014-07-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.0-4 libspatialite soname rebuild
-
-2014-05-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.0-2 giflib soname rebuild
-
-2014-04-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.11.0-1
-
-2013-11-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.10.1-1
-
-2013-09-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.10.0-4 FS#36328 fix
-
-2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.10.0-1
-
-2011-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * gdal 1.8.0-1
-
-2010-11-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.7.3
-
-2010-06-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * FS#19946 fixed in 1.7.2-2
-
-2010-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * Update to major release 1.7.2
Copied: gdal1/repos/community-x86_64/gdal1.changelog (from rev 141548, gdal1/trunk/gdal1.changelog)
===================================================================
--- community-x86_64/gdal1.changelog (rev 0)
+++ community-x86_64/gdal1.changelog 2015-09-23 21:07:24 UTC (rev 141549)
@@ -0,0 +1,57 @@
+2015-09-24 Ray Rashif <schiv at archlinux.org>
+ * gdal1 1.11.2-2 remove wrong provision for gdal
+
+ users must tentatively choose between vtk and other
+ packages depending on gdal; this is only a short-term
+ workaround as the gdal2 rebuild had to move on.
+
+2015-09-23 Ray Rashif <schiv at archlinux.org>
+ * gdal1 1.11.2-1 for VTK (FS#46346)
+
+2015-02-23 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.2-1
+
+2015-01-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.1-6 poppler 0.30.0 rebuild
+
+2014-12-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.1-5 FS#43193 fix
+
+2014-12-20 Evangelos Foutras <evangelos at foutrelis.com>
+ * gdal 1.11.1-4 poppler 0.29.0 rebuild
+
+2014-11-25 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.1-3 hdf5 1.8.14 rebuild
+
+2014-10-03 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.1-1
+
+2014-07-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.0-4 libspatialite soname rebuild
+
+2014-05-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.0-2 giflib soname rebuild
+
+2014-04-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.11.0-1
+
+2013-11-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.10.1-1
+
+2013-09-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.10.0-4 FS#36328 fix
+
+2013-05-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.10.0-1
+
+2011-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * gdal 1.8.0-1
+
+2010-11-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.7.3
+
+2010-06-26 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * FS#19946 fixed in 1.7.2-2
+
+2010-05-05 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.7.2
Deleted: community-x86_64/glibc.patch
===================================================================
--- community-x86_64/glibc.patch 2015-09-23 21:07:02 UTC (rev 141548)
+++ community-x86_64/glibc.patch 2015-09-23 21:07:24 UTC (rev 141549)
@@ -1,14 +0,0 @@
-Index: trunk/gdal/apps/gdalserver.c
-===================================================================
---- a/trunk/gdal/apps/gdalserver.c
-+++ b/trunk/gdal/apps/gdalserver.c
-@@ -28,7 +28,6 @@
- ****************************************************************************/
-
--#if defined(__STDC_VERSION__)
--#define _XOPEN_SOURCE
--#endif
-+// So that __USE_XOPEN2K is defined to have getaddrinfo
-+#define _XOPEN_SOURCE 600
-
- #include "cpl_port.h"
Copied: gdal1/repos/community-x86_64/glibc.patch (from rev 141548, gdal1/trunk/glibc.patch)
===================================================================
--- community-x86_64/glibc.patch (rev 0)
+++ community-x86_64/glibc.patch 2015-09-23 21:07:24 UTC (rev 141549)
@@ -0,0 +1,14 @@
+Index: trunk/gdal/apps/gdalserver.c
+===================================================================
+--- a/trunk/gdal/apps/gdalserver.c
++++ b/trunk/gdal/apps/gdalserver.c
+@@ -28,7 +28,6 @@
+ ****************************************************************************/
+
+-#if defined(__STDC_VERSION__)
+-#define _XOPEN_SOURCE
+-#endif
++// So that __USE_XOPEN2K is defined to have getaddrinfo
++#define _XOPEN_SOURCE 600
+
+ #include "cpl_port.h"
Deleted: community-x86_64/poppler-0.31.patch
===================================================================
--- community-x86_64/poppler-0.31.patch 2015-09-23 21:07:02 UTC (rev 141548)
+++ community-x86_64/poppler-0.31.patch 2015-09-23 21:07:24 UTC (rev 141549)
@@ -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) {}
Copied: gdal1/repos/community-x86_64/poppler-0.31.patch (from rev 141548, gdal1/trunk/poppler-0.31.patch)
===================================================================
--- community-x86_64/poppler-0.31.patch (rev 0)
+++ community-x86_64/poppler-0.31.patch 2015-09-23 21:07:24 UTC (rev 141549)
@@ -0,0 +1,12 @@
+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) {}
More information about the arch-commits
mailing list