From cb90e02a0486a07c01eb0808cb1236e62c52a57f Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Fri, 14 Jun 2019 02:59:06 +0200 Subject: libspatialite: update to 4.3.0a Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- .../libspatialite-4.2.0/geos-config.patch | 17 ---------------- .../libspatialite/libspatialite/geos-config.patch | 17 ++++++++++++++++ .../libspatialite/libspatialite_4.2.0.bb | 23 ---------------------- .../libspatialite/libspatialite_4.3.0a.bb | 21 ++++++++++++++++++++ 4 files changed, 38 insertions(+), 40 deletions(-) delete mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite-4.2.0/geos-config.patch create mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite/geos-config.patch delete mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite_4.2.0.bb create mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite_4.3.0a.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite-4.2.0/geos-config.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite-4.2.0/geos-config.patch deleted file mode 100644 index 28bd7dad87..0000000000 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite-4.2.0/geos-config.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://www.gaia-gis.it/fossil/libspatialite/tktview?name=abeeaad448 - -Upstream-Status: Submitted [rpm5-devel@rpm5.org] - -Index: libspatialite-4.2.0/configure.ac -=================================================================== ---- libspatialite-4.2.0.orig/configure.ac -+++ libspatialite-4.2.0/configure.ac -@@ -260,7 +260,7 @@ if test x"$enable_geos" != "xno"; then - fi - # Extract the linker and include flags - GEOS_LDFLAGS=`$GEOSCONFIG --ldflags` -- GEOS_CFLAGS=-I`$GEOSCONFIG --includes` -+ GEOS_CFLAGS=`$GEOSCONFIG --cflags` - AC_SUBST([GEOS_LDFLAGS]) - AC_SUBST([GEOS_CFLAGS]) - # Ensure that we can parse geos_c.h diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/geos-config.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/geos-config.patch new file mode 100644 index 0000000000..28bd7dad87 --- /dev/null +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/geos-config.patch @@ -0,0 +1,17 @@ +https://www.gaia-gis.it/fossil/libspatialite/tktview?name=abeeaad448 + +Upstream-Status: Submitted [rpm5-devel@rpm5.org] + +Index: libspatialite-4.2.0/configure.ac +=================================================================== +--- libspatialite-4.2.0.orig/configure.ac ++++ libspatialite-4.2.0/configure.ac +@@ -260,7 +260,7 @@ if test x"$enable_geos" != "xno"; then + fi + # Extract the linker and include flags + GEOS_LDFLAGS=`$GEOSCONFIG --ldflags` +- GEOS_CFLAGS=-I`$GEOSCONFIG --includes` ++ GEOS_CFLAGS=`$GEOSCONFIG --cflags` + AC_SUBST([GEOS_LDFLAGS]) + AC_SUBST([GEOS_CFLAGS]) + # Ensure that we can parse geos_c.h diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite_4.2.0.bb b/meta-oe/recipes-navigation/libspatialite/libspatialite_4.2.0.bb deleted file mode 100644 index d66dc875be..0000000000 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite_4.2.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Library extending the SQLite core to support fully fledged Spatial SQL capabilities" -HOMEPAGE = "https://www.gaia-gis.it/fossil/libspatialite/" -SECTION = "libs" -DEPENDS = "proj geos sqlite3 libxml2 zlib" - -LICENSE = "MPLv1.1 & GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e" - -SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-freexl=no" - -# package plugins for SQLite3 -PACKAGES += "${PN}-plugin" -INSANE_SKIP_${PN}-plugin = "dev-so" -FILES_${PN}-plugin += "${libdir}/mod_*" - -SRC_URI[md5sum] = "83305ed694a77152120d1f74c5151779" -SRC_URI[sha256sum] = "9f138a6854740c7827fdee53845eb1485fce3e805a7aa9fc9151f8046ebd312d" - -SRC_URI += "file://geos-config.patch" diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite_4.3.0a.bb b/meta-oe/recipes-navigation/libspatialite/libspatialite_4.3.0a.bb new file mode 100644 index 0000000000..a3f09036c2 --- /dev/null +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite_4.3.0a.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Library extending the SQLite core to support fully fledged Spatial SQL capabilities" +HOMEPAGE = "https://www.gaia-gis.it/fossil/libspatialite/" +SECTION = "libs" +DEPENDS = "proj geos sqlite3 libxml2 zlib" + +LICENSE = "MPLv1.1 & GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e" + +SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz \ + file://geos-config.patch" +SRC_URI[md5sum] = "6b380b332c00da6f76f432b10a1a338c" +SRC_URI[sha256sum] = "88900030a4762904a7880273f292e5e8ca6b15b7c6c3fb88ffa9e67ee8a5a499" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-freexl=no" + +# package plugins for SQLite3 +PACKAGES += "${PN}-plugin" +INSANE_SKIP_${PN}-plugin = "dev-so" +FILES_${PN}-plugin += "${libdir}/mod_*" -- cgit 1.2.3-korg