From 41123b82dd46c08d9fa3f9c296980ac3f922ded7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 4 Jul 2023 13:55:21 -0700 Subject: geos: Upgrade to 3.12.0 Drop upstreamed patch Signed-off-by: Khem Raj --- .../geos/geos/0001-include-missing-cstdint.patch | 82 ---------------------- meta-oe/recipes-navigation/geos/geos_3.12.0.bb | 24 +++++++ meta-oe/recipes-navigation/geos/geos_3.9.4.bb | 25 ------- 3 files changed, 24 insertions(+), 107 deletions(-) delete mode 100644 meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch create mode 100644 meta-oe/recipes-navigation/geos/geos_3.12.0.bb delete mode 100644 meta-oe/recipes-navigation/geos/geos_3.9.4.bb (limited to 'meta-oe/recipes-navigation') diff --git a/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch b/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch deleted file mode 100644 index 6cfd2e81bc..0000000000 --- a/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 11b9ef265a942cb3fdd373520d0c3fce67d3cdf9 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 26 Jan 2023 18:05:33 -0800 -Subject: [PATCH] include missing - -gcc 13 moved some includes around and as a result is no longer transitively included [1]. Explicitly include it for uint{32,64}_t. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Backport [https://github.com/kraj/geos/commit/0e8d4368b] -Signed-off-by: Khem Raj ---- - include/geos/geomgraph/TopologyLocation.h | 1 + - include/geos/io/WKTWriter.h | 1 + - include/geos/shape/fractal/HilbertCode.h | 1 + - include/geos/shape/fractal/HilbertEncoder.h | 1 + - include/geos/shape/fractal/MortonCode.h | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/include/geos/geomgraph/TopologyLocation.h b/include/geos/geomgraph/TopologyLocation.h -index 4cbbacb3..a3ecd212 100644 ---- a/include/geos/geomgraph/TopologyLocation.h -+++ b/include/geos/geomgraph/TopologyLocation.h -@@ -25,6 +25,7 @@ - #include - #include - -+#include - #include - #include - #include -diff --git a/include/geos/io/WKTWriter.h b/include/geos/io/WKTWriter.h -index c0af8e71..0d60e975 100644 ---- a/include/geos/io/WKTWriter.h -+++ b/include/geos/io/WKTWriter.h -@@ -25,6 +25,7 @@ - - #include - #include -+#include - - #ifdef _MSC_VER - #pragma warning(push) -diff --git a/include/geos/shape/fractal/HilbertCode.h b/include/geos/shape/fractal/HilbertCode.h -index 46012efc..beeb28c6 100644 ---- a/include/geos/shape/fractal/HilbertCode.h -+++ b/include/geos/shape/fractal/HilbertCode.h -@@ -17,6 +17,7 @@ - - #include - #include -+#include - - // Forward declarations - namespace geos { -diff --git a/include/geos/shape/fractal/HilbertEncoder.h b/include/geos/shape/fractal/HilbertEncoder.h -index 61c0010d..0126d3d9 100644 ---- a/include/geos/shape/fractal/HilbertEncoder.h -+++ b/include/geos/shape/fractal/HilbertEncoder.h -@@ -16,6 +16,7 @@ - #pragma once - - #include -+#include - #include - #include - -diff --git a/include/geos/shape/fractal/MortonCode.h b/include/geos/shape/fractal/MortonCode.h -index 6743f87c..ad4a42e7 100644 ---- a/include/geos/shape/fractal/MortonCode.h -+++ b/include/geos/shape/fractal/MortonCode.h -@@ -17,6 +17,7 @@ - - #include - #include -+#include - - // Forward declarations - namespace geos { --- -2.39.1 - 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..b77f3af2a8 --- /dev/null +++ b/meta-oe/recipes-navigation/geos/geos_3.12.0.bb @@ -0,0 +1,24 @@ +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 autotools pkgconfig binconfig + +EXTRA_OECONF += "--enable-inline=no" + +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.9.4.bb b/meta-oe/recipes-navigation/geos/geos_3.9.4.bb deleted file mode 100644 index 558acd92bf..0000000000 --- a/meta-oe/recipes-navigation/geos/geos_3.9.4.bb +++ /dev/null @@ -1,25 +0,0 @@ -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 \ - file://0001-include-missing-cstdint.patch" -SRC_URI[sha256sum] = "70dff2530d8cd2dfaeeb91a5014bd17afb1baee8f0e3eb18e44d5b4dbea47b14" - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF += "--enable-inline=no" - -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" -- cgit v1.2.3-54-g00ecf