utils/gpsd: Update to 3.16

Update gpsd to upstream release 3.16
The local patch is already included upstream, therefore
removed here.

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
This commit is contained in:
p-wassi 2016-12-07 21:41:06 +01:00
parent bcb2de7dbd
commit b06eac5382
2 changed files with 4 additions and 46 deletions

View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gpsd
PKG_VERSION:=3.15
PKG_RELEASE:=2
PKG_VERSION:=3.16
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://download-mirror.savannah.gnu.org/releases/gpsd/
PKG_MD5SUM:=afd79b87337fadf38ee2a7c4314dac79
PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME)
PKG_MD5SUM:=68691b5de4c94f82ec4062b042b5eb63
PKG_MAINTAINER:=Pushpal Sidhu <psidhu.devel@gmail.com>
PKG_LICENSE:=BSD-3-Clause

View File

@ -1,42 +0,0 @@
From 95c99f69e026e8c57aecba545e51c97f3b284e75 Mon Sep 17 00:00:00 2001
From: "Gary E. Miller" <gem@rellim.com>
Date: Tue, 23 Jun 2015 14:36:26 -0700
Subject: [PATCH] Remove a BSD-ism.
CTRL('L') is a BSD-ism. CTRL() is defined in sys/ttydefaults.h
which does not always exist. Instead of adding scons tests for
needing CTRL() and its include files just replace with a simple
constant.
Needed for musl and found by Baruch Siach <baruch@tkos.co.il>
---
gpsmon.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gpsmon.c b/gpsmon.c
index c3001c8..58c8300 100644
--- a/gpsmon.c
+++ b/gpsmon.c
@@ -583,6 +583,9 @@ static void select_packet_monitor(struct gps_device_t *device)
(void)wnoutrefresh(devicewin);
}
+/* Control-L character */
+#define CTRL_L 0x0C
+
static char *curses_get_command(void)
/* char-by-char nonblocking input, return accumulated command line on \n */
{
@@ -591,7 +594,8 @@ static char *curses_get_command(void)
int c;
c = wgetch(cmdwin);
- if (c == CTRL('L')) {
+ if (CTRL_L == c) {
+ /* ^L is to repaint the screen */
(void)clearok(stdscr, true);
if (active != NULL && (*active)->initialize != NULL)
(void)(*active)->initialize();
--
2.6.0