summaryrefslogtreecommitdiff
path: root/gis
diff options
context:
space:
mode:
authorDavid Spencer <idlemoor@slackbuilds.org>2018-05-19 22:43:27 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-05-20 08:35:09 +0700
commitc97bd17ac886c33fb90b3954945e2c3b07907acc (patch)
treeaa077f38d3063d85f289fe4a8c3f6f55326a3514 /gis
parent0d0cf9629d386a3ebe06b96f6b801d258f8ef403 (diff)
downloadslackbuilds-c97bd17ac886c33fb90b3954945e2c3b07907acc.tar.gz
gis/gdal: Updated for version 2.2.4.
The update to version 2.3.0 broke lots of dependent packages that don't use c++11. Sorry! This reverts commit 92f5754b90444345b6da5f5c3b0d851a6e23f463. Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'gis')
-rw-r--r--gis/gdal/README2
-rw-r--r--gis/gdal/gdal.SlackBuild22
-rw-r--r--gis/gdal/gdal.info6
3 files changed, 14 insertions, 16 deletions
diff --git a/gis/gdal/README b/gis/gdal/README
index b6502064c6..c959862f44 100644
--- a/gis/gdal/README
+++ b/gis/gdal/README
@@ -11,7 +11,7 @@ provides a similar capability for simple features vector data.
The following optional requirements are detected automatically:
cfitsio, freexl, hdf, hdf5, libkml, libwebp, netcdf,
- postgresql, python3, xerces-c, zstd
+ postgresql, python3, xerces-c
To enable OpenCL GPU-accelerated performance, specify the option
OPENCL=yes (requires opencl-headers to build, and either nvidia-driver
diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild
index d0e34fb3c4..2973ebf43c 100644
--- a/gis/gdal/gdal.SlackBuild
+++ b/gis/gdal/gdal.SlackBuild
@@ -25,7 +25,7 @@
# Maintained by David Spencer <baildon.research@googlemail.com>
PRGNAM=gdal
-VERSION=${VERSION:-2.3.0}
+VERSION=${VERSION:-2.2.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -71,23 +71,20 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# zstd, webp, OpenCL, Spatialite, Grass support via $WITHLIST
-# (everything else is handled automatically by configure)
+# OpenCL, webp, Spatialite and Grass support need special arrangements.
+# Everything else is handled automatically by configure.
WITHLIST=""
-if pkg-config --exists zstd; then
- WITHLIST+=" --with-zstd"
+# Request OpenCL support:
+if [ ${OPENCL:-no} = "yes" ]; then
+ WITHLIST+=" --with-opencl"
fi
+# Request webp support if it's installed:
if pkg-config --exists libwebp; then
WITHLIST+=" --with-webp"
fi
-# OpenCL support if requested:
-if [ ${OPENCL:-no} = "yes" ]; then
- WITHLIST+=" --with-opencl"
-fi
-
# Spatialite support in gdal optionally has a circular dependency
# via the postgis 'liblwgeom' library (postgis depends on gdal).
# Here is an undocumented option to request Spatialite support,
@@ -131,7 +128,7 @@ CXXFLAGS="$SLKCFLAGS" \
--with-liblzma \
--with-curl=/usr/bin/curl-config \
--without-grib \
- --with-proj \
+ --with-static-proj4 \
--with-mysql \
--with-python \
--with-poppler \
@@ -163,9 +160,10 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
make -f GNUmakefile -B docs
+# --docdir is ignored :-(
make install-docs DESTDIR=$PKG INST_DOCS=/usr/doc/$PRGNAM-$VERSION
cp -a \
- COMMITTERS HOWTO-RELEASE LICENSE.TXT MIGRATION_GUIDE.TXT NEWS PROVENANCE.TXT VERSION \
+ COMMITERS HOWTO-RELEASE LICENSE.TXT NEWS PROVENANCE.TXT VERSION \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/gis/gdal/gdal.info b/gis/gdal/gdal.info
index c841acb54c..dfc2a8c9a3 100644
--- a/gis/gdal/gdal.info
+++ b/gis/gdal/gdal.info
@@ -1,8 +1,8 @@
PRGNAM="gdal"
-VERSION="2.3.0"
+VERSION="2.2.4"
HOMEPAGE="http://www.gdal.org/"
-DOWNLOAD="http://download.osgeo.org/gdal/2.3.0/gdal-2.3.0.tar.xz"
-MD5SUM="2fe9d64fcd9dc37645940df020d3e200"
+DOWNLOAD="http://download.osgeo.org/gdal/2.2.4/gdal-2.2.4.tar.xz"
+MD5SUM="51b1df61dbdf81473689fab3075e7a5e"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="geos proj"