From 7f0bf7279da8aa613e0d92e28b0e3deff7b19173 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 5 Oct 2014 08:35:06 +0200 Subject: gdal: upgrade to 1.11.1 * add json-c dependency and fix with-* params * LICENSE.txt change only added SUN copyright for gdal/alg/thinplatespline.cpp file Signed-off-by: Martin Jansa --- meta-oe/recipes-navigation/gdal/gdal_1.10.1.bb | 107 ------------------------ meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb | 109 +++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 107 deletions(-) delete mode 100644 meta-oe/recipes-navigation/gdal/gdal_1.10.1.bb create mode 100644 meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb (limited to 'meta-oe/recipes-navigation') diff --git a/meta-oe/recipes-navigation/gdal/gdal_1.10.1.bb b/meta-oe/recipes-navigation/gdal/gdal_1.10.1.bb deleted file mode 100644 index 14f1a5704..000000000 --- a/meta-oe/recipes-navigation/gdal/gdal_1.10.1.bb +++ /dev/null @@ -1,107 +0,0 @@ -SUMMARY = "GDAL is a translator library for raster geospatial data formats" -HOMEPAGE = "http://www.gdal.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=b9bd75ae5af7ff87ab259be0121c4106" - -DEPENDS = "proj sqlite3 tiff" - -SRC_URI = "ftp://download.osgeo.org/gdal/${PV}/${BP}.tar.xz" - -SRC_URI[md5sum] = "f354c614aea76e5630e4edbf06e5c292" -SRC_URI[sha256sum] = "e6c9c6c4480228c943af29120d87435ddfe9ca460458bc60b91639fb8d443791" - -inherit autotools-brokensep lib_package binconfig - -EXTRA_OECONF = "--without-perl \ - --without-php \ - --without-ruby \ - --without-python \ - \ - --without-grass \ - --without-libgrass \ - --without-cfitsio \ - --without-dds \ - --without-gta \ - --without-pcidsk \ - --without-ogdi \ - --without-fme \ - --without-hdf4 \ - --without-hdf5 \ - --without-pg \ - --without-jpeg12 \ - --without-ogdi \ - --without-netcdf \ - --without-openjpeg \ - --without-fgdb \ - --without-ecw \ - --without-kakadu \ - --without-mrsid \ - --without-jp2mrsid \ - --without-mrsid_lidar \ - --without-msg \ - --without-bsb \ - --without-grib \ - --without-mysql \ - --without-ingres \ - --without-odbc \ - --without-dods_root \ - --without-xml2 \ - --without-spatialite \ - --without-pcre \ - --without-dwgdirect \ - --without-dwgdirect \ - --without-idb \ - --without-sde \ - --without-sde-version \ - --without-epsilon \ - --without-webp \ - --without-opencl \ - --without-opencl-include \ - --without-opencl-lib \ - --without-freexl \ - --without-pam \ - --without-poppler \ - --without-podofo \ - --without-podofo-lib \ - --without-podofo-extra-lib-for-test \ - --without-static_proj4 \ - --without-perl \ - --without-php \ - --without-ruby \ - --without-python \ - --without-java \ - --without-mdb \ - --without-jvm-lib \ - --without-jvm-lib-add-rpath \ - --without-rasdaman \ - --without-armadillo \ - \ - --with-pcraster=internal \ - --with-geotiff=internal \ - \ - --with-sqlite3=${STAGING_LIBDIR} \ - --with-libtiff=${STAGING_LIBDIR} \ -" - -EXTRA_OEMAKE += "INST_DATA="${datadir}/gdal"" - -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[gif] = "--with-gif,--without-gif,giflib" -PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg" -PACKAGECONFIG[z] = "--with-libz,--without-libz,zlib" -PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper" -PACKAGECONFIG[curl] = "--with-curl,--without-curl,curl" - -do_configure_prepend () { - # The configure script has many hardcoded paths to search - # for the library headers when using external libraries, - # workaround it. - sed -e 's,/usr/include,NON_EXISTENT_DIR,g' \ - -e 's,/usr/lib,NON_EXISTENT_DIR,g' \ - -i ${S}/configure.in -} - -FILES_${PN} += "${libdir}/gdalplugins" diff --git a/meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb b/meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb new file mode 100644 index 000000000..b181b3ef8 --- /dev/null +++ b/meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb @@ -0,0 +1,109 @@ +SUMMARY = "GDAL is a translator library for raster geospatial data formats" +HOMEPAGE = "http://www.gdal.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=0952e17969fab12227096b5228f23149" + +DEPENDS = "proj sqlite3 tiff json-c" + +SRC_URI = "ftp://download.osgeo.org/gdal/${PV}/${BP}.tar.xz" + +SRC_URI[md5sum] = "2e126d7c6605691d38f3e71b945f5c73" +SRC_URI[sha256sum] = "20e1042cff15a71038459a299732fb342428aea9912f32df30c85790fcab6302" + +inherit autotools-brokensep lib_package binconfig + +EXTRA_OECONF = "--without-perl \ + --without-php \ + --without-ruby \ + --without-python \ + \ + --without-grass \ + --without-libgrass \ + --without-cfitsio \ + --without-dds \ + --without-gta \ + --without-pcidsk \ + --without-ogdi \ + --without-fme \ + --without-hdf4 \ + --without-hdf5 \ + --without-pg \ + --without-jpeg12 \ + --without-ogdi \ + --without-netcdf \ + --without-openjpeg \ + --without-fgdb \ + --without-ecw \ + --without-kakadu \ + --without-mrsid \ + --without-jp2mrsid \ + --without-mrsid_lidar \ + --without-msg \ + --without-bsb \ + --without-grib \ + --without-mysql \ + --without-ingres \ + --without-odbc \ + --without-dods_root \ + --without-xml2 \ + --without-spatialite \ + --without-pcre \ + --without-dwgdirect \ + --without-dwgdirect \ + --without-idb \ + --without-sde \ + --without-sde-version \ + --without-epsilon \ + --without-webp \ + --without-opencl \ + --without-opencl-include \ + --without-opencl-lib \ + --without-freexl \ + --without-pam \ + --without-poppler \ + --without-podofo \ + --without-podofo-lib \ + --without-podofo-extra-lib-for-test \ + --without-static_proj4 \ + --without-perl \ + --without-php \ + --without-ruby \ + --without-python \ + --without-java \ + --without-mdb \ + --without-jvm-lib \ + --without-jvm-lib-add-rpath \ + --without-rasdaman \ + --without-armadillo \ + \ + --with-pcraster=internal \ + --with-geotiff=internal \ + \ + --with-sqlite3=${STAGING_EXECPREFIXDIR} \ + --with-libtiff=${STAGING_EXECPREFIXDIR} \ + --with-libjson-c=${STAGING_EXECPREFIXDIR} \ + --with-expat=${STAGING_EXECPREFIXDIR} \ +" + +EXTRA_OEMAKE += "INST_DATA="${datadir}/gdal"" + +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[gif] = "--with-gif,--without-gif,giflib" +PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg" +PACKAGECONFIG[z] = "--with-libz,--without-libz,zlib" +PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper" +PACKAGECONFIG[curl] = "--with-curl,--without-curl,curl" + +do_configure_prepend () { + # The configure script has many hardcoded paths to search + # for the library headers when using external libraries, + # workaround it. + sed -e 's,/usr/include,NON_EXISTENT_DIR,g' \ + -e 's,/usr/lib,NON_EXISTENT_DIR,g' \ + -i ${S}/configure.in +} + +FILES_${PN} += "${libdir}/gdalplugins" -- cgit v1.2.3-54-g00ecf