diff options
Diffstat (limited to 'gis/gdal')
| -rw-r--r-- | gis/gdal/gdal.SlackBuild | 15 | ||||
| -rw-r--r-- | gis/gdal/gdal.info | 6 |
2 files changed, 13 insertions, 8 deletions
diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild index a18220fec6..26d1206b96 100644 --- a/gis/gdal/gdal.SlackBuild +++ b/gis/gdal/gdal.SlackBuild @@ -24,7 +24,7 @@ # Maintained by David Spencer <baildon.research@googlemail.com> PRGNAM=gdal -VERSION=${VERSION:-1.11.2} +VERSION=${VERSION:-1.11.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -106,9 +106,9 @@ fi # 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" + WITHLIST+=" --with-jpeg=internal" else - WITHLIST+=" --with-jpeg=/usr/lib${LIBDIRSUFFIX} --with-libtiff=/usr/lib${LIBDIRSUFFIX}" + WITHLIST+=" --with-jpeg=/usr/lib${LIBDIRSUFFIX}" fi # Thanks to the people at Arch for this: @@ -135,6 +135,10 @@ CXXFLAGS="$SLKCFLAGS" \ --with-mysql \ --with-python \ --with-poppler \ + --with-libtiff=internal \ + --with-rename-internal-libtiff-symbols=yes \ + --with-geotiff=internal \ + --with-rename-internal-libgeotiff-symbols=yes \ $WITHLIST \ --build=$ARCH-slackware-linux @@ -144,12 +148,13 @@ make install DESTDIR=$PKG # Kill erroneously installed .dox files rm $PKG/usr/bin/*.dox -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true make -f GNUmakefile -B man make install-man DESTDIR=$PKG -gzip -9 $PKG/usr/man/man?/* || exit 1 +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 :-( diff --git a/gis/gdal/gdal.info b/gis/gdal/gdal.info index daa0c83862..3942d89a94 100644 --- a/gis/gdal/gdal.info +++ b/gis/gdal/gdal.info @@ -1,8 +1,8 @@ PRGNAM="gdal" -VERSION="1.11.2" +VERSION="1.11.3" HOMEPAGE="http://www.gdal.org/" -DOWNLOAD="http://download.osgeo.org/gdal/1.11.2/gdal-1.11.2.tar.xz" -MD5SUM="90221810dd9ca656ee23d434d4266ef6" +DOWNLOAD="http://download.osgeo.org/gdal/1.11.3/gdal-1.11.3.tar.xz" +MD5SUM="129a235798e2883c8cf6fd6862213da2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="geos proj" |