diff options
Diffstat (limited to 'meta-oe/recipes-navigation/geos')
5 files changed, 22 insertions, 89 deletions
diff --git a/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch b/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch deleted file mode 100644 index 5c5fbd1d9a..0000000000 --- a/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- geos-3.4.2/configure.in.orig 2016-06-08 17:46:43.002250304 +0000 -+++ geos-3.4.2/configure.in 2016-06-08 17:57:36.342241606 +0000 -@@ -197,7 +197,7 @@ - AC_LANG_PUSH([C++]) - AC_CACHE_CHECK([for isnan], ac_cv_isnan, - [AC_TRY_LINK([#include <cmath>], -- [double x; int y; y = isnan(x);], -+ [double x; int y; y = std::isnan(x);], - ac_cv_isnan=yes, - ac_cv_isnan=no - )]) ---- geos-3.4.2/include/geos/platform.h.in.orig 2016-06-08 14:06:53.910234182 -0400 -+++ geos-3.4.2/include/geos/platform.h.in 2016-06-08 14:07:19.298233844 -0400 -@@ -84,7 +84,7 @@ - #endif - - #if defined(HAVE_ISNAN) --# define ISNAN(x) (isnan(x)) -+# define ISNAN(x) (std::isnan(x)) - #else - # if defined(_MSC_VER) - # define ISNAN(x) _isnan(x) diff --git a/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch b/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch deleted file mode 100644 index 645e6f62a5..0000000000 --- a/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9d51027c228dafd7db2d0cffca1f0fc695e950fd Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Mon, 2 Dec 2013 11:33:26 -0200 -Subject: [PATCH] geos-config: Add includedir variable - -This fixes cross-compile as it is easier to mangle the includedir -during sysroot generation. - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - tools/geos-config.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/geos-config.in b/tools/geos-config.in -index 9b45b5f..1749892 100644 ---- a/tools/geos-config.in -+++ b/tools/geos-config.in -@@ -1,6 +1,7 @@ - #!/bin/sh - prefix=@prefix@ - exec_prefix=@exec_prefix@ -+includedir=@includedir@ - libdir=@libdir@ - - usage() -@@ -38,7 +39,7 @@ case $1 in - echo @VERSION@ - ;; - --cflags) -- echo -I${prefix}/include -+ echo -I${includedir} - ;; - --libs) - # TODO: make an alias for --clibs --- -1.7.10.4 - diff --git a/meta-oe/recipes-navigation/geos/geos.inc b/meta-oe/recipes-navigation/geos/geos.inc deleted file mode 100644 index 2e308b4882..0000000000 --- a/meta-oe/recipes-navigation/geos/geos.inc +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "GEOS - Geometry Engine, Open Source" -HOMEPAGE = "http://trac.osgeo.org/geos/" -SECTION = "libs" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -SRC_URI = "http://download.osgeo.org/geos/geos-${PV}.tar.bz2" - -inherit autotools pkgconfig binconfig - -PACKAGES =+ "geoslib ${PN}-c1" - -DESCRIPTION_${PN}lib = "Geometry engine for Geographic Information Systems - C++ Library" -FILES_${PN}lib += "${libdir}/libgeos-${PV}.so" - -DESCRIPTION_${PN}-c1 = "Geometry engine for Geographic Information Systems - C Library" -FILES_${PN}-c1 += "${libdir}/libgeos_c.so.*" - -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} += "geoslib ${PN}-c1" diff --git a/meta-oe/recipes-navigation/geos/geos_3.12.0.bb b/meta-oe/recipes-navigation/geos/geos_3.12.0.bb new file mode 100644 index 0000000000..95cb29775a --- /dev/null +++ b/meta-oe/recipes-navigation/geos/geos_3.12.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "GEOS - Geometry Engine, Open Source" +HOMEPAGE = "http://trac.osgeo.org/geos/" +SECTION = "libs" + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2" +SRC_URI[sha256sum] = "d96db96011259178a35555a0f6d6e75a739e52a495a6b2aa5efb3d75390fbc39" + +inherit cmake pkgconfig binconfig + +PACKAGES =+ "geoslib ${PN}-c1" + +DESCRIPTION:${PN}lib = "Geometry engine for Geographic Information Systems - C++ Library" +FILES:${PN}lib += "${libdir}/libgeos-${PV}.so" + +DESCRIPTION:${PN}-c1 = "Geometry engine for Geographic Information Systems - C Library" +FILES:${PN}-c1 += "${libdir}/libgeos_c.so.*" + +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} += "geoslib ${PN}-c1" diff --git a/meta-oe/recipes-navigation/geos/geos_3.4.2.bb b/meta-oe/recipes-navigation/geos/geos_3.4.2.bb deleted file mode 100644 index 7193f8fb56..0000000000 --- a/meta-oe/recipes-navigation/geos/geos_3.4.2.bb +++ /dev/null @@ -1,7 +0,0 @@ -require geos.inc - -SRC_URI += "file://geos-config-Add-includedir-variable.patch \ - file://fix-gcc6-isnan.patch" - -SRC_URI[md5sum] = "fc5df2d926eb7e67f988a43a92683bae" -SRC_URI[sha256sum] = "15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53" |