Patchwork [meta-oe] gdal: Use external TIFF support

login
register
mail settings
Submitter Otavio Salvador
Date Jan. 13, 2014, 7:10 p.m.
Message ID <1389640209-2487-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/64673/
State Accepted, archived
Headers show

Comments

Otavio Salvador - Jan. 13, 2014, 7:10 p.m.
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>
---
 meta-oe/recipes-navigation/gdal/gdal_1.10.1.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Martin Jansa - Jan. 13, 2014, 8:29 p.m.
On Mon, Jan 13, 2014 at 05:10:09PM -0200, Otavio Salvador wrote:
> The TIFF support cannot be disabled so prefer to depends on 'tiff' and
> use external by default.

I haven't looked at configure script, but isn't it only caused by
typo in PACKAGECONFIG?

--without-tiff
instead of
--without-libtiff (to match --with variant)?

> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  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 4ce5d33..5b461bf 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"
>  
> @@ -82,6 +82,7 @@ EXTRA_OECONF = "--without-perl \
>                  --with-geotiff=internal \
>                  \
>                  --with-sqlite3=${STAGING_LIBDIR} \
> +                --with-libtiff=${STAGING_LIBDIR} \
>  "
>  
>  EXTRA_OEMAKE += "INST_DATA="${datadir}/gdal""
> @@ -90,7 +91,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"
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Otavio Salvador - Jan. 13, 2014, 8:36 p.m.
On Mon, Jan 13, 2014 at 6:29 PM, Martin Jansa <martin.jansa@gmail.com>wrote:

> On Mon, Jan 13, 2014 at 05:10:09PM -0200, Otavio Salvador wrote:
> > The TIFF support cannot be disabled so prefer to depends on 'tiff' and
> > use external by default.
>
> I haven't looked at configure script, but isn't it only caused by
> typo in PACKAGECONFIG?
>
> --without-tiff
> instead of
> --without-libtiff (to match --with variant)?


The configure.in force it to be internal in case it does not find it. This
seems to be the safest route for it.

Patch

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 4ce5d33..5b461bf 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"
 
@@ -82,6 +82,7 @@  EXTRA_OECONF = "--without-perl \
                 --with-geotiff=internal \
                 \
                 --with-sqlite3=${STAGING_LIBDIR} \
+                --with-libtiff=${STAGING_LIBDIR} \
 "
 
 EXTRA_OEMAKE += "INST_DATA="${datadir}/gdal""
@@ -90,7 +91,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"