Bump gpsd from version 2.95 to version 3.7

PATCH New spdawson at gmail.com 2 participants 4 messages Jul 20, 2012 – Jul 21, 2012

lore

Share & tools

lore

spdawson at gmail.com

author

2012-07-20 10:11 UTC #0 lore raw

PATCH 1/1 Bump gpsd from version 2.95 to version 3.7

From: Simon Dawson <[email protected]>

Signed-off-by Simon Dawson <[email protected]>

---
 package/gpsd/Config.in                             |   22 ++-
 package/gpsd/gpsd-fix-acs_map-compile-errors.patch |   29 ++++
 package/gpsd/gpsd-fix-libgpsmm.patch               |   23 ---
 package/gpsd/gpsd-navcom.patch                     |   47 ------
 package/gpsd/gpsd.mk                               |  175 ++++++++++++--------
 5 files changed, 146 insertions(+), 150 deletions(-)
 create mode 100644 package/gpsd/gpsd-fix-acs_map-compile-errors.patch
 delete mode 100644 package/gpsd/gpsd-fix-libgpsmm.patch
 delete mode 100644 package/gpsd/gpsd-navcom.patch

package/gpsd/Config.in +15 -7

index 16635dc..18e21e5 100644
@@ -38,10 +38,6 @@ config BR2_PACKAGE_GPSD_NTP_SHM
 config BR2_PACKAGE_GPSD_PPS
 	bool "PPS time syncing support"
 
-config BR2_PACKAGE_GPSD_PPS_ON_CTS
-	bool "PPS pulse on CTS rather than DCD"
-	depends on BR2_PACKAGE_GPSD_PPS
-
 config BR2_PACKAGE_GPSD_USER
 	bool "GPSD privilege revocation user"
 config BR2_PACKAGE_GPSD_USER_VALUE

@@ -85,9 +81,6 @@ config BR2_PACKAGE_GPSD_CONTROLSEND
 	bool "allow gpsctl/gpsmon to change device settings"
 	default y
 
-config BR2_PACKAGE_GPSD_RAW
-	bool "enable raw measurement processing"
-
 config BR2_PACKAGE_GPSD_SQUELCH
 	bool "squelch gpsd_report and gpsd_hexdump to save cpu"

@@ -116,6 +109,11 @@ config BR2_PACKAGE_GPSD_EVERMORE
 	help
 	  EverMore binary support
 
+config BR2_PACKAGE_GPSD_FURY
+	bool "Fury"
+	help
+	  Jackson Labs Fury and Firefly support
+
 config BR2_PACKAGE_GPSD_FV18
 	bool "FV-18"
 	help

@@ -131,6 +129,11 @@ config BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT
 	help
 	  Garmin Simple Text support
 
+config BR2_PACKAGE_GPSD_GEOSTAR
+	bool "Geostar"
+	help
+	  Geostar Protocol support
+
 config BR2_PACKAGE_GPSD_GPSCLOCK
 	bool "GPSClock"
 	help

@@ -162,6 +165,11 @@ config BR2_PACKAGE_GPSD_NAVCOM
 	help
 	  Navcom binary support
 
+config BR2_PACKAGE_GPSD_NMEA2000
+	bool "nmea2000"
+	help
+	  NMEA2000/CAN support
+
 config BR2_PACKAGE_GPSD_OCEANSERVER
 	bool "OceanServer"
 	help

package/gpsd/gpsd-fix-acs_map-compile-errors.patch new file +29 -0

new file mode 100644
index 0000000..14d9287
@@ -0,0 +1,29 @@
+Hack gpsd to prevent undefined references to acs_map from ncurses.
+
+Signed-off-by: Simon Dawson <[email protected]>
+diff -Nurp a/gpsmon.c b/gpsmon.c
+--- a/gpsmon.c	2012-05-18 09:45:37.000000000 +0100
++++ b/gpsmon.c	2012-06-07 12:41:31.257807969 +0100
+@@ -24,6 +24,9 @@
+ #include <unistd.h>
+ #endif /* S_SPLINT_S */
+ 
++/* Ugly hack to prevent undefined reference to acs_map */
++unsigned long acs_map[128];
++
+ #include "gpsd_config.h"
+ #ifdef HAVE_BLUEZ
+ #include <bluetooth/bluetooth.h>
+diff -Nurp a/monitor_nmea.c b/monitor_nmea.c
+--- a/monitor_nmea.c	2011-11-22 08:49:33.000000000 +0000
++++ b/monitor_nmea.c	2012-06-07 12:41:37.081807709 +0100
+@@ -15,6 +15,9 @@
+ #include <unistd.h>
+ #endif /* S_SPLINT_S */
+ 
++/* Ugly hack to prevent undefined reference to acs_map */
++unsigned long acs_map[128];
++
+ #include "gpsd.h"
+ #include "gpsmon.h"
+ #include "gpsdclient.h"

package/gpsd/gpsd-fix-libgpsmm.patch deleted +0 ~~-23~~

deleted file mode 100644
index 893965e..0000000
@@ -1,23 +0,0 @@
-diff -Nura gpsd-2.95.orig/Makefile.in gpsd-2.95.x/Makefile.in
---- gpsd-2.95.orig/Makefile.in	2010-07-13 19:48:24.000000000 -0300
-+++ gpsd-2.95.x/Makefile.in	2010-07-27 17:40:28.902568874 -0300
-@@ -546,7 +546,7 @@
- libgps_VERSION__REVISION = 0
- libgps_VERSION_AGE = 0
- libgps_VERSION_NUMBER = $(libgps_VERSION_AGE):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
--libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
-+libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE) $(LDFLAGS)
- lib_LTLIBRARIES = libgps.la libgpsd.la
- libgps_SONAME = $(shell expr $(libgps_VERSION_CURRENT) - $(libgps_VERSION_AGE))
- libgps_VERSION = $(libgps_SONAME).$(libgps_VERSION_AGE).$(libgps_VERSION__REVISION)
-@@ -612,8 +612,8 @@
- libgpsd_la_SOURCES = $(libgpsd_c_sources) $(libgpsd_h_sources) \
- 				driver_rtcm2.h packet_states.h
- 
-- at LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@
-- at LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@
-+ at LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link $(CC) $(libgps_la_LDFLAGS) -o $@
-+ at LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link $(CXX) $(libgps_la_LDFLAGS) -o $@
- nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i
- libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD)
- libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) libgps.la

package/gpsd/gpsd-navcom.patch deleted +0 ~~-47~~

47 lines not on this page · raw message

package/gpsd/gpsd.mk +102 ~~-73~~

285 lines not on this page · raw message

Signature · 1 line

1.7.9.5

Thomas Petazzoni

2012-07-20 18:16 UTC #1 lore raw

PATCH 1/1 Bump gpsd from version 2.95 to version 3.7

Le Fri, 20 Jul 2012 11:11:18 +0100,
spdawson at gmail.com a ?crit :

Quoted 8 lines

package/gpsd/gpsd-fix-acs_map-compile-errors.patch new file +2 -0
new file mode 100644
index 0000000..14d9287
@@ -0,0 +1,29 @@
+Hack gpsd to prevent undefined references to acs_map from ncurses.
+

package/gpsd/gpsd-fix-acs_map-compile-errors.patch line 12

Quoted 10 lines

package/gpsd/gpsd-fix-acs_map-compile-errors.patch new file +10 -0

+Signed-off-by: Simon Dawson <[email protected]>
+diff -Nurp a/gpsmon.c b/gpsmon.c
+--- a/gpsmon.c	2012-05-18 09:45:37.000000000 +0100
++++ b/gpsmon.c	2012-06-07 12:41:31.257807969 +0100
+@@ -24,6 +24,9 @@
+ #include <unistd.h>
+ #endif /* S_SPLINT_S */
+ 
++/* Ugly hack to prevent undefined reference to acs_map */
++unsigned long acs_map[128];

Is there a non-ugly variant of this in the works?

package/gpsd/gpsd-fix-acs_map-compile-errors.patch

Quoted 8 lines

package/gpsd/gpsd-fix-acs_map-compile-errors.patch new file +4 -3

-GPSD_VERSION = 2.95
-GPSD_SITE = http://download.berlios.de/gpsd
+GPSD_VERSION = 3.7
+GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd/
 GPSD_INSTALL_STAGING = YES
-GPSD_TARGET_BINS = cgps gpsctl gpsdecode gpsmon gpspipe gpxlogger lcdgps
+
+GPSD_DEPENDENCIES = host-scons host-python

Do we really need a host-python here? I mean, can't we use the one provided by the distribution, which is a Buildroot requirement?

Of course, if we need to have the same Python version on the host and the target, then host-python is needed. Otherwise, if we could avoid that dependency, it would be great.

Thanks,

Thomas

Signature · 4 lines

Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

Simon Dawson

author

2012-07-21 09:07 UTC #2 lore raw

PATCH 1/1 Bump gpsd from version 2.95 to version 3.7

Hi Thomas, thanks for the feedback.

Quoted 4 lines · Thomas Petazzoni

Quoted 2 lines
++/* Ugly hack to prevent undefined reference to acs_map */ ++unsigned long acs_map[128];
Is there a non-ugly variant of this in the works?

Not at present, I'm afraid. What would you suggest? Obviously, I can kick off the process of trying to get a fix into gpsd upstream. That could be a slow process; so, in the meantime, is it acceptable to have this (ugly, but small) patch in Buildroot?

Quoted 3 lines

Quoted 1 line
+GPSD_DEPENDENCIES = host-scons host-python
Do we really need a host-python here?

You're quite right: there is no need for the Python version to be the same on host and target. I'll remove this spurious dependency in the next iteration of the patch.

Simon.

Thomas Petazzoni

2012-07-21 13:26 UTC #3 lore raw

PATCH 1/1 Bump gpsd from version 2.95 to version 3.7

Le Sat, 21 Jul 2012 10:07:38 +0100,
Simon Dawson <[email protected]> a ?crit :

Quoted 6 lines

Quoted 1 line
Is there a non-ugly variant of this in the works?
Not at present, I'm afraid. What would you suggest? Obviously, I can kick off the process of trying to get a fix into gpsd upstream. That could be a slow process; so, in the meantime, is it acceptable to have this (ugly, but small) patch in Buildroot?

Yes, it is perfectly acceptable. It's just that we generally try to start the process of getting problems fixed upstream at the same time, so hopefully at some point in the future (which may be a distant point), such patches can be removed.

Quoted 7 lines

Quoted 3 lines
Quoted 1 line
+GPSD_DEPENDENCIES = host-scons host-python
Do we really need a host-python here?
You're quite right: there is no need for the Python version to be the same on host and target. I'll remove this spurious dependency in the next iteration of the patch.

Excellent, thanks.

Thomas

Signature · 4 lines

Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com