Bump gpsd from version 2.95 to version 3.5
PATCH RESEND 1/1 Bump gpsd from version 2.95 to version 3.5
From: Simon Dawson <[email protected]>
Signed-off-by Simon Dawson <[email protected]>
--- package/gpsd/Config.in | 17 +-- package/gpsd/gpsd-3.5-fix-compile-errors.patch | 14 +++ package/gpsd/gpsd-fix-libgpsmm.patch | 23 ---- package/gpsd/gpsd-navcom.patch | 47 ------- package/gpsd/gpsd.mk | 156 +++++++++++++----------- 5 files changed, 107 insertions(+), 150 deletions(-) create mode 100644 package/gpsd/gpsd-3.5-fix-compile-errors.patch delete mode 100644 package/gpsd/gpsd-fix-libgpsmm.patch delete mode 100644 package/gpsd/gpsd-navcom.patch
package/gpsd/Config.in +10 -7
@@ -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
package/gpsd/gpsd-3.5-fix-compile-errors.patch new file +14 -0
@@ -0,0 +1,14 @@ +The build falls over because the CLOCK_REALTIME symbol is undefined. + +diff -Nur a/gpsutils.c b/gpsutils.c +--- a/gpsutils.c 2012-04-06 20:36:44.000000000 +0100 ++++ b/gpsutils.c 2012-04-20 16:07:42.570742457 +0100 +@@ -6,7 +6,7 @@ + + /* The strptime prototype is not provided unless explicitly requested. + * So add the define that POSIX says to to avoid: */ +-#define _XOPEN_SOURCE ++//#define _XOPEN_SOURCE + + #include <stdio.h> + #include <time.h>
package/gpsd/gpsd-fix-libgpsmm.patch deleted +0 -23
@@ -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 +83 -73
266 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH RESEND 1/1 Bump gpsd from version 2.95 to version 3.5
Quoted 14 lines · spdawson at gmail.com
From: Simon Dawson <[email protected]>
Signed-off-by Simon Dawson <[email protected]>--- package/gpsd/Config.in | 17 +-- package/gpsd/gpsd-3.5-fix-compile-errors.patch | 14 +++ package/gpsd/gpsd-fix-libgpsmm.patch | 23 ---- package/gpsd/gpsd-navcom.patch | 47 ------- package/gpsd/gpsd.mk | 156 +++++++++++++----------- 5 files changed, 107 insertions(+), 150 deletions(-) create mode 100644 package/gpsd/gpsd-3.5-fix-compile-errors.patch delete mode 100644 package/gpsd/gpsd-fix-libgpsmm.patch delete mode 100644 package/gpsd/gpsd-navcom.patch
Hi Simon,
I believe you need to remove the version string from the "gpsd-3.5-fix-compile-errors.patch". See
http://lists.busybox.net/pipermail/buildroot/2012-May/053739.html
Signature · 1 line
markos
PATCH RESEND 1/1 Bump gpsd from version 2.95 to version 3.5
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Markos" == Markos Chandras <[email protected]> writes:
Quoted 14 lines · spdawson at gmail.com
Quoted 10 lines
From: Simon Dawson <[email protected]>
Signed-off-by Simon Dawson <[email protected]>---
package/gpsd/Config.in | 17 +-- package/gpsd/gpsd-3.5-fix-compile-errors.patch | 14 +++ package/gpsd/gpsd-fix-libgpsmm.patch | 23 ---- package/gpsd/gpsd-navcom.patch | 47 ------- package/gpsd/gpsd.mk | 156 +++++++++++++----------- 5 files changed, 107 insertions(+), 150 deletions(-)Quoted 4 lines
create mode 100644
package/gpsd/gpsd-3.5-fix-compile-errors.patchdelete mode 100644package/gpsd/gpsd-fix-libgpsmm.patchdelete mode 100644package/gpsd/gpsd-navcom.patch
Markos> Hi Simon,
Markos> I believe you need to remove the version string from the Markos> "gpsd-3.5-fix-compile-errors.patch". See
Markos> http://lists.busybox.net/pipermail/buildroot/2012-May/053739.html
Indeed. And as 3.6 has recently been released, it makes more sense to use that instead.
Signature · 1 line
Bye, Peter Korsgaard