[109276] trunk/dports/devel/geoclue

[jeremyhu at macports.org]

Revision: 109276
          https://trac.macports.org/changeset/109276
Author:   jeremyhu at macports.org
Date:     2013-08-11 22:26:40 -0700 (Sun, 11 Aug 2013)
Log Message:
-----------
geoclue: Build fix, add dep on gpsd (#35874)

Modified Paths:
--------------
    trunk/dports/devel/geoclue/Portfile

Added Paths:
-----------
    trunk/dports/devel/geoclue/files/
    trunk/dports/devel/geoclue/files/geoclue-0.12.99-gpsd.patch

Modified: trunk/dports/devel/geoclue/Portfile
===================================================================
--- trunk/dports/devel/geoclue/Portfile	2013-08-12 05:26:07 UTC (rev 109275)
+++ trunk/dports/devel/geoclue/Portfile	2013-08-12 05:26:40 UTC (rev 109276)
@@ -5,7 +5,7 @@
 
 name                geoclue
 version             0.12.99
-revision            1
+revision            2
 categories          devel net
 license             LGPL-2.1+
 platforms           darwin
@@ -20,9 +20,14 @@
                     rmd160  f95c8a0aac9ef1d0a011fc2cfc151f62bf400a6c \
                     sha256  fe396c91cb52de4219281f4d9223156338fc03670d34700281e86d1399b80a72
 
+patchfiles \
+        geoclue-0.12.99-gpsd.patch
+
 depends_build   \
         port:pkgconfig
+
 depends_lib     \
+        port:gpsd \
         port:gtk2 \
         port:dbus-glib
 

Added: trunk/dports/devel/geoclue/files/geoclue-0.12.99-gpsd.patch
===================================================================
--- trunk/dports/devel/geoclue/files/geoclue-0.12.99-gpsd.patch	                        (rev 0)
+++ trunk/dports/devel/geoclue/files/geoclue-0.12.99-gpsd.patch	2013-08-12 05:26:40 UTC (rev 109276)
@@ -0,0 +1,73 @@
+Description: Refactoring to support new libgps API 
+Author: James Page <james.page at ubuntu.com>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40996
+Forwarded: no
+
+--- providers/gpsd/geoclue-gpsd.c
++++ providers/gpsd/geoclue-gpsd.c
+@@ -40,7 +40,12 @@
+ #include <geoclue/gc-iface-position.h>
+ #include <geoclue/gc-iface-velocity.h>
+ 
++#if GPSD_API_MAJOR_VERSION >= 5
++/* gps_data conflicts with gps_data function */
++typedef struct gps_data_t gps_data_l;
++#else
+ typedef struct gps_data_t gps_data;
++#endif
+ typedef struct gps_fix_t gps_fix;
+ 
+ /* only listing used tags */
+@@ -59,7 +64,11 @@
+ 	char *host;
+ 	char *port;
+ 	
++#if GPSD_API_MAJOR_VERSION >= 5
++	gps_data_l *gpsdata;
++#else
+ 	gps_data *gpsdata;
++#endif
+ 	
+ 	gps_fix *last_fix;
+ 	
+@@ -394,10 +403,16 @@
+ static gboolean
+ geoclue_gpsd_start_gpsd (GeoclueGpsd *self)
+ {
++#if GPSD_API_MAJOR_VERSION >= 5
++	int status = gps_open (self->host, self->port, self->gpsdata);
++	if (status == 0) {
++		gps_stream(self->gpsdata, WATCH_ENABLE | WATCH_NMEA, NULL);
++#else
+ 	self->gpsdata = gps_open (self->host, self->port);
+ 	if (self->gpsdata) {
+ 		gps_stream(self->gpsdata, WATCH_ENABLE | WATCH_NMEA | POLL_NONBLOCK, NULL);
+ 		gps_set_raw_hook (self->gpsdata, gpsd_raw_hook);
++#endif
+ 		return TRUE;
+ 	} else {
+ 		g_warning ("gps_open() failed, is gpsd running (host=%s,port=%s)?", self->host, self->port);
+@@ -410,10 +425,23 @@
+ {
+ 	GeoclueGpsd *self = (GeoclueGpsd*)data;
+ 	if (self->gpsdata) {
++#if GPSD_API_MAJOR_VERSION >= 5 
++		/* gps_poll and gps_set_raw_hook no longer present in this API version */
++		if (gps_waiting(self->gpsdata, 500)) {
++			if (gps_read(self->gpsdata) == -1) {
++				geoclue_gpsd_set_status (self, GEOCLUE_STATUS_ERROR);
++				geoclue_gpsd_stop_gpsd(self);
++				return FALSE;
++			} else {          
++				/* Call existing raw_hook to process the data */
++				gpsd_raw_hook(self->gpsdata, NULL, 0);    
++			}
++#else
+ 		if (gps_poll(self->gpsdata) < 0) {
+ 			geoclue_gpsd_set_status (self, GEOCLUE_STATUS_ERROR);
+ 			geoclue_gpsd_stop_gpsd(self);
+ 			return FALSE;
++#endif
+ 		}
+ 	}
+ 	return TRUE;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130811/241312b1/attachment.html>