diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-01-13 17:10:09 -0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-22 12:22:36 +0100 |
commit | fdf356abf2bb2149fe594e849748a1e3ba4fee1d (patch) | |
tree | c98b5744bd075bc10567bb1a5cbd8c95f30ab4b3 | |
parent | 31716a11cdf814b15552b441498cf32b76759ebf (diff) | |
download | meta-openembedded-fdf356abf2bb2149fe594e849748a1e3ba4fee1d.tar.gz |
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@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-navigation/gdal/gdal_1.10.1.bb | 4 |
1 files 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 f942a9dc2..ce8574e92 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/" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=b9bd75ae5af7ff87ab259be0121c4106" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=b9bd75ae5af7ff87ab259be0121c4106" |
5 | 5 | ||
6 | DEPENDS = "proj sqlite3" | 6 | DEPENDS = "proj sqlite3 tiff" |
7 | 7 | ||
8 | SRC_URI = "ftp://download.osgeo.org/gdal/${PV}/${P}.tar.xz" | 8 | SRC_URI = "ftp://download.osgeo.org/gdal/${PV}/${P}.tar.xz" |
9 | 9 | ||
@@ -80,6 +80,7 @@ EXTRA_OECONF = "--without-perl \ | |||
80 | --with-geotiff=internal \ | 80 | --with-geotiff=internal \ |
81 | \ | 81 | \ |
82 | --with-sqlite3=${STAGING_LIBDIR} \ | 82 | --with-sqlite3=${STAGING_LIBDIR} \ |
83 | --with-libtiff=${STAGING_LIBDIR} \ | ||
83 | " | 84 | " |
84 | 85 | ||
85 | EXTRA_OEMAKE += "INST_DATA="${datadir}/gdal"" | 86 | EXTRA_OEMAKE += "INST_DATA="${datadir}/gdal"" |
@@ -88,7 +89,6 @@ PACKAGECONFIG ?= "geos png jasper" | |||
88 | PACKAGECONFIG[geos] = "--with-geos,--without-geos,geos" | 89 | PACKAGECONFIG[geos] = "--with-geos,--without-geos,geos" |
89 | PACKAGECONFIG[lzma] = "--with-liblzma,--without-liblzma,xz" | 90 | PACKAGECONFIG[lzma] = "--with-liblzma,--without-liblzma,xz" |
90 | PACKAGECONFIG[png] = "--with-png,--without-png,libpng" | 91 | PACKAGECONFIG[png] = "--with-png,--without-png,libpng" |
91 | PACKAGECONFIG[tiff] = "--with-libtiff,--without-tiff,tiff" | ||
92 | PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib" | 92 | PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib" |
93 | PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg" | 93 | PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg" |
94 | PACKAGECONFIG[z] = "--with-libz,--without-libz,zlib" | 94 | PACKAGECONFIG[z] = "--with-libz,--without-libz,zlib" |