gpsd: bump to version 3.15
PATCH 1/1 gpsd: bump to version 3.15
Drop upstream patches #1 and #3. Drop the no longer needed patch #2.
Signed-off-by Baruch Siach <[email protected]>
--- ...0001-Fix-build-error-when-ntpshm-is-false.patch | 39 -------------------- package/gpsd/0002-sconstruct-disable-rpath.patch | 18 --------- ...apping-of-ntpshm_latch-function-in-ifdef-.patch | 43 ---------------------- package/gpsd/gpsd.hash | 2 +- package/gpsd/gpsd.mk | 2 +- 5 files changed, 2 insertions(+), 102 deletions(-) delete mode 100644 package/gpsd/0001-Fix-build-error-when-ntpshm-is-false.patch delete mode 100644 package/gpsd/0002-sconstruct-disable-rpath.patch delete mode 100644 package/gpsd/0003-Complete-wrapping-of-ntpshm_latch-function-in-ifdef-.patch
package/gpsd/0001-Fix-build-error-when-ntpshm-is-false.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 8e081f1bd5c82b842ee317cd55e70f646ae31f05 Mon Sep 17 00:00:00 2001 -From: Simon Dawson <[email protected]> -Date: Mon, 25 Aug 2014 10:26:11 +0100 -Subject: [PATCH] Fix build error when ntpshm is false -To: gpsd-dev at nongnu.org - -The build fails as follows - -libgpsd_core.c: In function 'ntpshm_latch': -libgpsd_core.c:1660:24: error: 'const struct gps_type_t' has no member named 'time_offset' - || device->device_type->time_offset == NULL) - ^ -libgpsd_core.c:1663:33: error: 'const struct gps_type_t' has no member named 'time_offset' - fix_time += device->device_type->time_offset(device); - ^ -scons: *** [libgpsd_core.os] Error 1 - -The solution is to wrap #ifdef NTPSHM_ENABLE around the ntpshm_latch function - -Signed-off-by: Simon Dawson <[email protected]> ---- -diff -Nurp a/libgpsd_core.c b/libgpsd_core.c ---- a/libgpsd_core.c 2014-08-22 21:33:55.000000000 +0100 -+++ b/libgpsd_core.c 2014-09-03 18:48:34.184931741 +0100 -@@ -1642,6 +1642,7 @@ void gpsd_zero_satellites( /*@out@*/ str - #endif - } - -+#ifdef NTPSHM_ENABLE - void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td) - /* latch the fact that we've saved a fix */ - { -@@ -1672,5 +1673,6 @@ void ntpshm_latch(struct gps_device_t *d - device->last_fixtime.clock = td->clock.tv_sec + td->clock.tv_nsec / 1e9; - #endif /* S_SPLINT_S */ - } -+#endif /* NTPSHM_ENABLE */ - - /* end */
package/gpsd/0002-sconstruct-disable-rpath.patch deleted +0 -18
@@ -1,18 +0,0 @@ -Disable addition of RPATH to the generated libraries - -Signed-off-by: Simon Dawson <[email protected]> -Signed-off-by: Thomas Petazzoni <[email protected]> - -diff -Nurp a/SConstruct b/SConstruct ---- a/SConstruct 2014-08-23 18:41:09.000000000 +0100 -+++ b/SConstruct 2014-08-25 09:46:53.754364989 +0100 -@@ -300,9 +300,6 @@ if env["sysroot"]: - - # Don't hack RPATH unless libdir points somewhere that is not on the - # minimum default load path. --if env["shared"]: -- if env["libdir"] not in ["/usr/lib", "/lib"]: -- env.Prepend(RPATH=[installdir('libdir')]) - - # Give deheader a way to set compiler flags - if 'MORECFLAGS' in os.environ:
package/gpsd/0003-Complete-wrapping-of-ntpshm_latch-function-in-ifdef-.patch deleted +0 -43
43 lines not on this page · raw message
package/gpsd/gpsd.hash +1 -1
@@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 ed66c6b6b1e2b4951de2c0b2399c22f77fe9f5927ef6b948dd8eb023ff53b7ee gpsd-3.11.tar.gz +sha256 81c89e271ae112313e68655ab30d227bc38fe7841ffbff0f1860b12a9d7696ea gpsd-3.15.tar.gz
package/gpsd/gpsd.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -GPSD_VERSION = 3.11 +GPSD_VERSION = 3.15 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-3c GPSD_LICENSE_FILES = COPYING
Signature · 1 line
2.1.4
PATCH 1/1 gpsd: bump to version 3.15
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
Drop upstream patches #1 and #3. Drop the no longer needed patch #2.
Signed-off-by Baruch Siach <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard