navit: rebuild against gpsd-3.18.1.

This commit is contained in:
Cameron Nemo 2019-02-02 00:20:12 -08:00 committed by Helmut Pozimski
parent 16e4d7886c
commit 16e297ed28
2 changed files with 27 additions and 2 deletions

View file

@ -0,0 +1,25 @@
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);

View file

@ -1,9 +1,9 @@
# Template file for 'navit'
pkgname=navit
version=0.5.3
revision=1
revision=2
build_style=cmake
configure_args="-DLIBDIR=lib/navit -Wno-dev"
configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
makedepends="SDL-devel qt5-devel gpsd-devel imlib2-devel dbus-glib-devel
fontconfig-devel zlib-devel libpng-devel qt5-declarative-devel qt5-svg-devel