summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spencer <idlemoor@slackbuilds.org>2016-03-17 15:16:03 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-03-20 07:37:45 +0700
commit130b1340a9447d2eb5eeecb1d10307e32c7743ee (patch)
tree6ca4f8149c3f59a6575bd41f98d9a4fa222346c9
parentf683207484a223397c8029ff57124eb2dfc38873 (diff)
downloadslackbuilds-130b1340a9447d2eb5eeecb1d10307e32c7743ee.tar.gz
gis/gdal: Use podofo.
Fixes build failure with poppler-0.41. Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r--gis/gdal/gdal.SlackBuild8
-rw-r--r--gis/gdal/gdal.info2
2 files changed, 8 insertions, 2 deletions
diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild
index cbfdffc387..668acf0464 100644
--- a/gis/gdal/gdal.SlackBuild
+++ b/gis/gdal/gdal.SlackBuild
@@ -114,6 +114,13 @@ fi
# Thanks to the people at Arch for this:
patch -p0 <$CWD/gdal-python-install.patch
+# poppler-0.41 broke the build again, so we're going to use podofo. This is
+# really an optional dependency that most people don't need, but podofo doesn't
+# have a .pc file for us to autodetect, and pdf support with poppler was
+# included by default in previous gdal builds, so we're going to pretend podofo
+# is a mandatory dep. See also http://www.gdal.org/frmt_pdf.html
+WITHLIST+=" --with-podofo"
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -134,7 +141,6 @@ CXXFLAGS="$SLKCFLAGS" \
--with-static-proj4 \
--with-mysql \
--with-python \
- --with-poppler \
--with-libtiff=internal \
--with-rename-internal-libtiff-symbols=yes \
--with-geotiff=internal \
diff --git a/gis/gdal/gdal.info b/gis/gdal/gdal.info
index 8b7fe178eb..c923cbb034 100644
--- a/gis/gdal/gdal.info
+++ b/gis/gdal/gdal.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://download.osgeo.org/gdal/1.11.4/gdal-1.11.4.tar.xz"
MD5SUM="39d5125f8bf41179db0b450c8db9e1ee"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="geos proj"
+REQUIRES="geos proj podofo"
MAINTAINER="David Spencer"
EMAIL="baildon.research@googlemail.com"