From a42a55002f5b7a37e5dcbfb82beb6de539936b76 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Fri, 27 May 2011 23:24:18 -0300
Subject: libraries/gdal: Updated for version 1.8.0.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 libraries/gdal/README          | 4 ----
 libraries/gdal/gdal.SlackBuild | 7 +++++--
 libraries/gdal/gdal.info       | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/libraries/gdal/README b/libraries/gdal/README
index dc4607d340e5..eac68ea9ab98 100644
--- a/libraries/gdal/README
+++ b/libraries/gdal/README
@@ -9,7 +9,3 @@ The related OGR library (which is part of the GDAL source tree)
 provides a similar capability for simple features vector data.
 
 This requires geos and proj.
-
-To include gdal's optional support for grass, rebuild gdal after
-grass is installed.  If you don't want grass support, pass
-GRASS=no to the script.
diff --git a/libraries/gdal/gdal.SlackBuild b/libraries/gdal/gdal.SlackBuild
index ead65586c9b8..5a12fd2de777 100644
--- a/libraries/gdal/gdal.SlackBuild
+++ b/libraries/gdal/gdal.SlackBuild
@@ -4,7 +4,7 @@
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
 PRGNAM=gdal
-VERSION=${VERSION:-1.7.3}
+VERSION=${VERSION:-1.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -51,8 +51,10 @@ find . \
  -exec chmod 644 {} \;
 
 WITHLIST=""
+# Grass support causes segfaults on x86_64.  If you really want it,
+# here is an undocumented option to enable it :-/
 if pkg-config --exists grass; then
-  if [ ${GRASS:-yes} = "yes" ]; then
+  if [ ${GRASS:-no} = "yes" ]; then
     WITHLIST+=" --with-grass=$(pkg-config --variable=prefix grass)"
   fi
 fi
@@ -75,6 +77,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-static-proj4 \
   --with-mysql \
   --with-python \
+  --with-poppler \
   $WITHLIST \
   --build=$ARCH-slackware-linux
 
diff --git a/libraries/gdal/gdal.info b/libraries/gdal/gdal.info
index f2a7c1a65b72..c68884ca0a4f 100644
--- a/libraries/gdal/gdal.info
+++ b/libraries/gdal/gdal.info
@@ -1,8 +1,8 @@
 PRGNAM="gdal"
-VERSION="1.7.3"
+VERSION="1.8.0"
 HOMEPAGE="http://www.gdal.org/"
-DOWNLOAD="http://download.osgeo.org/gdal/gdal-1.7.3.tar.gz"
-MD5SUM="c4673970bd2285032de9ae9bbd82754a"
+DOWNLOAD="http://download.osgeo.org/gdal/gdal-1.8.0.tar.gz"
+MD5SUM="c762cdab0f7e51a677ba49278a8a263d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Spencer"
-- 
cgit v1.2.3