diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-navigation')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb | 26 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-navigation/proj/proj_7.0.0.bb (renamed from meta-openembedded/meta-oe/recipes-navigation/proj/proj_6.2.0.bb) | 9 |
2 files changed, 19 insertions, 16 deletions
diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb index 9fdbbf254c..f74ebda5f1 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.19.bb @@ -2,7 +2,7 @@ SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" SECTION = "console/network" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=01764c35ae34d9521944bb6ab312af53" -DEPENDS = "dbus ncurses python python3 pps-tools" +DEPENDS = "dbus ncurses python3 pps-tools" PROVIDES = "virtual/gpsd" SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ @@ -12,7 +12,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ SRC_URI[md5sum] = "b3bf88706794eb8e5f2c2543bf7ba87b" SRC_URI[sha256sum] = "27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39" -inherit scons update-rc.d python-dir pythonnative systemd update-alternatives +inherit scons update-rc.d python3-dir python3native systemd update-alternatives INITSCRIPT_PACKAGES = "gpsd-conf" INITSCRIPT_NAME = "gpsd" @@ -84,7 +84,7 @@ do_install_append() { install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket } -PACKAGES =+ "libgps libgpsd python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils" +PACKAGES =+ "libgps libgpsd python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils" RPROVIDES_${PN}-dbg += "python-pygps-dbg" @@ -114,17 +114,17 @@ FILES_gpsd-gpsctl = "${bindir}/gpsctl" SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS" # Python files are required for gps/fake, required for gpsfake. FILES_gps-utils = "${bindir}/* ${libdir}/gps/*.py ${libdir}/gps/*.so" -RDEPENDS_gps-utils = "python-pygps" - -SUMMARY_python-pygps = "Python bindings to gpsd" -FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}/*.egg-info" -RDEPENDS_python-pygps = " \ - python-core \ - python-io \ - python-threading \ - python-terminal \ +RDEPENDS_gps-utils = "python3-pygps" + +SUMMARY_python3-pygps = "Python bindings to gpsd" +FILES_python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}/*.egg-info" +RDEPENDS_python3-pygps = " \ + python3-core \ + python3-io \ + python3-threading \ + python3-terminal \ gpsd \ - python-json" + python3-json" RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" diff --git a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_6.2.0.bb b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_7.0.0.bb index fa269d01b3..44674244ef 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_6.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_7.0.0.bb @@ -6,11 +6,14 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=74d9aaec5fa0cd734341e8c4dc91b608" SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "5cde556545828beaffbe50b1bb038480" -SRC_URI[sha256sum] = "b300c0f872f632ad7f8eb60725edbf14f0f8f52db740a3ab23e7b94f1cd22a50" +SRC_URI[sha256sum] = "ee0e14c1bd2f9429b1a28999240304c0342ed739ebaea3d4ff44c585b1097be8" -DEPENDS = "sqlite3 sqlite3-native" +DEPENDS = "sqlite3 sqlite3-native tiff" inherit autotools pkgconfig lib_package +PACKAGECONFIG ?= "curl" + +PACKAGECONFIG[curl] = ",--without-curl,curl" + FILES_${PN} += "${datadir}/proj" |