diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-navigation')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch | 82 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.4.bb (renamed from meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc) | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.1.1.bb (renamed from meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.1.0.bb) | 2 |
4 files changed, 86 insertions, 5 deletions
diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch b/meta-openembedded/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..6cfd2e81bc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch @@ -0,0 +1,82 @@ +From 11b9ef265a942cb3fdd373520d0c3fce67d3cdf9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 18:05:33 -0800 +Subject: [PATCH] include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> 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 <raj.khem@gmail.com> +--- + 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 <geos/inline.h> + #include <geos/geom/Location.h> + ++#include <cstdint> + #include <vector> + #include <array> + #include <string> +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 <string> + #include <cctype> ++#include <cstdint> + + #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 <geos/export.h> + #include <string> ++#include <cstdint> + + // 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 <geos/export.h> ++#include <cstdint> + #include <string> + #include <vector> + +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 <geos/export.h> + #include <string> ++#include <cstdint> + + // Forward declarations + namespace geos { +-- +2.39.1 + diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb deleted file mode 100644 index fdb72204ea..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require geos.inc - -SRC_URI[sha256sum] = "f8b2314e311456f7a449144efb5e3188c2a28774752bc50fc882a3cd5c89ee35" diff --git a/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.4.bb index 484ca9154f..558acd92bf 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc +++ b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.9.4.bb @@ -5,7 +5,9 @@ SECTION = "libs" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "http://download.osgeo.org/geos/geos-${PV}.tar.bz2" +SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2 \ + file://0001-include-missing-cstdint.patch" +SRC_URI[sha256sum] = "70dff2530d8cd2dfaeeb91a5014bd17afb1baee8f0e3eb18e44d5b4dbea47b14" inherit autotools pkgconfig binconfig diff --git a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.1.0.bb b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.1.1.bb index 218f083969..6ce1c88772 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.1.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27445198ba1500f508fce2b183ce0ff" DEPENDS = "sqlite3 sqlite3-native" SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "81b2239b94cad0886222cde4f53cb49d34905aad2a1317244a0c30a553db2315" +SRC_URI[sha256sum] = "003cd4010e52bb5eb8f7de1c143753aa830c8902b6ed01209f294846e40e6d39" inherit cmake lib_package |