diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2018-04-23 16:42:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-23 16:42:40 +0300 |
| commit | d9c5440adcc142fbaba86d96a22217a6beea5a7e (patch) | |
| tree | d3cbffab80166b03c9033222ac71edd7e50f7aab /utils | |
| parent | 47d18a0d08649ec0a828b8e76e97e82f4aa85a25 (diff) | |
| parent | 2eb973c573c4e15aaf1743bc4833292b1657cb0a (diff) | |
Merge pull request #5863 from p-wassi/gpsd
utils/gpsd: update to 3.17
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/gpsd/Makefile | 4 | ||||
| -rw-r--r-- | utils/gpsd/patches/0002-ncurses6_detection.patch | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/utils/gpsd/Makefile b/utils/gpsd/Makefile index 5593bffab..f6433ac38 100644 --- a/utils/gpsd/Makefile +++ b/utils/gpsd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gpsd -PKG_VERSION:=3.16 +PKG_VERSION:=3.17 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME) -PKG_HASH:=03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029 +PKG_HASH:=68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a PKG_MAINTAINER:=Pushpal Sidhu <psidhu.devel@gmail.com> PKG_LICENSE:=BSD-3-Clause diff --git a/utils/gpsd/patches/0002-ncurses6_detection.patch b/utils/gpsd/patches/0002-ncurses6_detection.patch index 7a1f40969..a62710c1e 100644 --- a/utils/gpsd/patches/0002-ncurses6_detection.patch +++ b/utils/gpsd/patches/0002-ncurses6_detection.patch @@ -2,10 +2,10 @@ Index: gpsd-3.16/SConstruct =================================================================== --- gpsd-3.16.orig/SConstruct +++ gpsd-3.16/SConstruct -@@ -543,6 +543,10 @@ else: - ncurseslibs = pkg_config('ncurses') - if config.CheckPKG('tinfo'): - ncurseslibs += pkg_config('tinfo') +@@ -672,6 +672,10 @@ else: + ncurseslibs += pkg_config('tinfo', rpath_hack=True) + # It's not yet known whether rpath_hack is appropriate for + # ncurses5-config. + elif WhereIs('ncurses6-config'): + ncurseslibs = ['!ncurses6-config --libs --cflags'] + elif WhereIs('ncursesw6-config'): |