Thursday, June 20, 2019

Prepare for gpsd-3.x

Hi!
Long time ago I've started update of gpsd from 2.x to 3.x.
Upstream moved from auto crap to scons so it gave me some
headache.
Before switching to new gpsd we need to prepare some ports
which are linking against libgps because API has changed.
Here are the diffs for foxtrotgps, geoclue and qlandkaretegt.
(diff for geo/viking is still WIP):

Index: patches/patch-src_gps_functions_c
===================================================================
RCS file: patches/patch-src_gps_functions_c
diff -N patches/patch-src_gps_functions_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_gps_functions_c 14 Jun 2019 07:04:02 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Fix build with newer gpsd API.
+https://bazaar.launchpad.net/~foxtrotgps-team/foxtrotgps/trunk/revision/316
+
+Index: src/gps_functions.c
+--- src/gps_functions.c.orig
++++ src/gps_functions.c
+@@ -738,7 +738,11 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition,
+ if (!libgps_initialized)
+ return FALSE;
+
++#if GPSD_API_MAJOR_VERSION >= 7 /* API change. gpsd version 3.18 and
subsequent. */
++ ret = gps_read(&libgps_gpsdata, NULL, 0);
++#else
+ ret = gps_read(&libgps_gpsdata);
++

No comments:

Post a Comment