navit: update to 0.5.4.
This commit is contained in:
parent
e048ce39d4
commit
41199f595b
2 changed files with 3 additions and 28 deletions
|
@ -1,25 +0,0 @@
|
||||||
From 1543af6c08bfca4ae5832b870503fe7fdc5f8b49 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Joop Boonen <joop.boonen@boonen.org>
|
|
||||||
Date: Thu, 24 Jan 2019 22:07:13 +0100
|
|
||||||
Subject: [PATCH] Fix:Core:Fixed Added fix for gpsd >= 1.7
|
|
||||||
|
|
||||||
---
|
|
||||||
navit/vehicle/gpsd/vehicle_gpsd.c | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/navit/vehicle/gpsd/vehicle_gpsd.c b/navit/vehicle/gpsd/vehicle_gpsd.c
|
|
||||||
index 95324f324..99a4b4ffc 100644
|
|
||||||
--- navit/vehicle/gpsd/vehicle_gpsd.c
|
|
||||||
+++ navit/vehicle/gpsd/vehicle_gpsd.c
|
|
||||||
@@ -325,7 +325,11 @@ static void vehicle_gpsd_io(struct vehicle_priv *priv) {
|
|
||||||
int read_result;
|
|
||||||
/* Read until EOF, in case we are lagging behind.
|
|
||||||
* No point in processing old GPS reports. */
|
|
||||||
+#if GPSD_API_MAJOR_VERSION >= 7
|
|
||||||
+ while((read_result=gps_read(priv->gps, NULL, 0))>0);
|
|
||||||
+#else
|
|
||||||
while((read_result=gps_read(priv->gps))>0);
|
|
||||||
+#endif
|
|
||||||
if(read_result==-1) {
|
|
||||||
dbg(lvl_error,"gps_poll failed");
|
|
||||||
vehicle_gpsd_close(priv);
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'navit'
|
# Template file for 'navit'
|
||||||
pkgname=navit
|
pkgname=navit
|
||||||
version=0.5.3
|
version=0.5.4
|
||||||
revision=3
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
|
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
|
||||||
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
|
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
|
||||||
|
@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
|
||||||
license="GPL-2.0-only, LGPL-2.0-only"
|
license="GPL-2.0-only, LGPL-2.0-only"
|
||||||
homepage="http://www.navit-project.org/"
|
homepage="http://www.navit-project.org/"
|
||||||
distfiles="https://github.com/navit-gps/navit/archive/v${version}.tar.gz"
|
distfiles="https://github.com/navit-gps/navit/archive/v${version}.tar.gz"
|
||||||
checksum=5dd3c1292cad6d85dfba2d23770bdff70e981937a7c271a54c75395e6dd6019d
|
checksum=728d9dcad00e97769f6cd85bfad5518b0edf62ef75d60543fa4c48c1c3ab1243
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
sed -i -e 's/\(GET_FILENAME_COMPONENT (LIB_DIR ${LIBDIR}\) NAME/\1 DIRECTORY/' CMakeLists.txt
|
sed -i -e 's/\(GET_FILENAME_COMPONENT (LIB_DIR ${LIBDIR}\) NAME/\1 DIRECTORY/' CMakeLists.txt
|
||||||
|
|
Loading…
Reference in a new issue