[oe-commits] Otavio Salvador : gdal: Use external TIFF support

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: fdf356abf2bb2149fe594e849748a1e3ba4fee1d
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=fdf356abf2bb2149fe594e849748a1e3ba4fee1d

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Mon Jan 13 17:10:09 2014 -0200

gdal: Use external TIFF support

The TIFF support cannot be disabled so prefer to depends on 'tiff' and
use external by default.

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-navigation/gdal/gdal_1.10.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-navigation/gdal/gdal_1.10.1.bb b/meta-oe/recipes-navigation/gdal/gdal_1.10.1.bb
index f942a9d..ce8574e 100644
--- a/meta-oe/recipes-navigation/gdal/gdal_1.10.1.bb
+++ b/meta-oe/recipes-navigation/gdal/gdal_1.10.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gdal.org/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=b9bd75ae5af7ff87ab259be0121c4106"
 
-DEPENDS = "proj sqlite3"
+DEPENDS = "proj sqlite3 tiff"
 
 SRC_URI = "ftp://download.osgeo.org/gdal/${PV}/${P}.tar.xz"
 
@@ -80,6 +80,7 @@ EXTRA_OECONF = "--without-perl \
                 --with-geotiff=internal \
                 \
                 --with-sqlite3=${STAGING_LIBDIR} \
+                --with-libtiff=${STAGING_LIBDIR} \
 "
 
 EXTRA_OEMAKE += "INST_DATA="${datadir}/gdal""
@@ -88,7 +89,6 @@ PACKAGECONFIG ?= "geos png jasper"
 PACKAGECONFIG[geos] = "--with-geos,--without-geos,geos"
 PACKAGECONFIG[lzma] = "--with-liblzma,--without-liblzma,xz"
 PACKAGECONFIG[png] = "--with-png,--without-png,libpng"
-PACKAGECONFIG[tiff] = "--with-libtiff,--without-tiff,tiff"
 PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib"
 PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg"
 PACKAGECONFIG[z] = "--with-libz,--without-libz,zlib"