summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2013-11-11 12:03:15 +0000
committerRobby Workman <rworkman@slackbuilds.org>2013-11-11 10:53:37 -0600
commit2e3bd540209dad8a5379ff74ef32a3291f88da0b (patch)
tree324e93ea8434f283ef74d910f859c58276473a40 /libraries
parentb5bcdfe098768b029bff69af1f213637d390fce1 (diff)
downloadslackbuilds-2e3bd540209dad8a5379ff74ef32a3291f88da0b.tar.gz
libraries/gdal: Updated for version 1.10.1.
Signed-off-by: David Spencer <baildon.research@googlemail.com> Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/gdal/gdal.SlackBuild19
-rw-r--r--libraries/gdal/gdal.info6
-rw-r--r--libraries/gdal/slack-desc6
3 files changed, 19 insertions, 12 deletions
diff --git a/libraries/gdal/gdal.SlackBuild b/libraries/gdal/gdal.SlackBuild
index 109396aef6..eeabac69ac 100644
--- a/libraries/gdal/gdal.SlackBuild
+++ b/libraries/gdal/gdal.SlackBuild
@@ -24,7 +24,7 @@
# Maintained by David Spencer <baildon.research@googlemail.com>
PRGNAM=gdal
-VERSION=${VERSION:-1.9.2}
+VERSION=${VERSION:-1.10.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -61,7 +61,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
chown -R root:root .
find . \
@@ -70,7 +70,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# OpenCL, webp, Grass and Spatialite support need special arrangements.
+# OpenCL, webp, Spatialite and Grass support need special arrangements.
# Everything else is handled automatically by configure.
WITHLIST=""
@@ -102,6 +102,15 @@ if pkg-config --exists grass; then
fi
fi
+# 12 bit JPEG support is handled by internal modified versions of libjpeg
+# and libtiff, but this can cause segfaults in other software linked against
+# the real libjpeg (eg. qgis calling qt). Enable JPEG12 only if you need it:
+if [ ${JPEG12:-no} = "yes" ]; then
+ WITHLIST+=" --with-jpeg=internal --with-libtiff=internal"
+else
+ WITHLIST+=" --with-jpeg=/usr/lib${LIBDIRSUFFIX} --with-libtiff=/usr/lib${LIBDIRSUFFIX}"
+fi
+
# Thanks to the people at Arch for this:
patch -p0 <$CWD/gdal-python-install.patch
@@ -120,8 +129,6 @@ CXXFLAGS="$SLKCFLAGS" \
--with-ogr=yes \
--with-libz=/usr/lib${LIBDIRSUFFIX} \
--with-liblzma \
- --with-jpeg=internal \
- --with-libtiff=internal \
--with-curl=/usr/bin/curl-config \
--without-grib \
--with-static-proj4 \
@@ -131,7 +138,7 @@ CXXFLAGS="$SLKCFLAGS" \
$WITHLIST \
--build=$ARCH-slackware-linux
-make -j1
+make
make install DESTDIR=$PKG
# Kill erroneously installed .dox files
diff --git a/libraries/gdal/gdal.info b/libraries/gdal/gdal.info
index 6075600418..092df41919 100644
--- a/libraries/gdal/gdal.info
+++ b/libraries/gdal/gdal.info
@@ -1,8 +1,8 @@
PRGNAM="gdal"
-VERSION="1.9.2"
+VERSION="1.10.1"
HOMEPAGE="http://www.gdal.org/"
-DOWNLOAD="http://download.osgeo.org/gdal/gdal-1.9.2.tar.gz"
-MD5SUM="3f39db89f4710269b3a8bf94178e07aa"
+DOWNLOAD="http://download.osgeo.org/gdal/1.10.1/gdal-1.10.1.tar.xz"
+MD5SUM="f354c614aea76e5630e4edbf06e5c292"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="geos proj %README%"
diff --git a/libraries/gdal/slack-desc b/libraries/gdal/slack-desc
index 9e7c2c4b77..9bfe528cf2 100644
--- a/libraries/gdal/slack-desc
+++ b/libraries/gdal/slack-desc
@@ -9,9 +9,9 @@
gdal: GDAL (translator library for raster geospatial data formats)
gdal:
gdal: The Geospatial Data Abstraction Library (GDAL) is a unifying
-gdal: C/C++ API for accessing raster geospatial data, and currently
-gdal: includes formats like GeoTIFF, Erdas Imagine, Arc/Info Binary,
-gdal: CEOS, DTED, GXF, and SDTS.
+gdal: C/C++ API for accessing raster geospatial data. The related OGR
+gdal: library (included with GDAL) provides a similar capability for vector
+gdal: data.
gdal:
gdal: Homepage: http://www.gdal.org
gdal: