gpsd: version bump 2.39 -> 3.19

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

1 files changed, 122 insertions, 85 deletions

diff --git a/rules/gpsd.make b/rules/gpsd.make
index cec308af9..ae4e0628e 100644
--- a/rules/gpsd.make
+++ b/rules/gpsd.make
@@ -2,6 +2,7 @@
 #
 # Copyright (C) 2008 by J.Kilb
 #               2009 by Marc Kleine-Budde <mkl@pengutronix.de>
+#               2019 by Ladislav Michl <ladis@linux-mips.org>
 #
 # For further information about the PTXdist project and license conditions
 # see the README file.
@@ -15,11 +16,11 @@ PACKAGES-$(PTXCONF_GPSD) += gpsd
 #
 # Paths and names
 #
-GPSD_VERSION	:= 2.39
-GPSD_MD5	:= 3db437196a6840c252fca99b6c19d4d0
+GPSD_VERSION	:= 3.19
+GPSD_MD5	:= b3bf88706794eb8e5f2c2543bf7ba87b
 GPSD		:= gpsd-$(GPSD_VERSION)
 GPSD_SUFFIX	:= tar.gz
-GPSD_URL	:= $(call ptx/mirror, SF, gpsd.berlios/$(GPSD).$(GPSD_SUFFIX))
+GPSD_URL	:= http://download.savannah.gnu.org/releases/gpsd/$(GPSD).$(GPSD_SUFFIX)
 GPSD_SOURCE	:= $(SRCDIR)/$(GPSD).$(GPSD_SUFFIX)
 GPSD_DIR	:= $(BUILDDIR)/$(GPSD)
 
@@ -27,56 +28,127 @@ GPSD_DIR	:= $(BUILDDIR)/$(GPSD)
 # Prepare
 # ----------------------------------------------------------------------------
 
-GPSD_ENV = \
-	$(CROSS_ENV) \
-	PYTHON=$(CROSS_PYTHON)
+GPSD_PROGS-y				:=
+GPSD_PROGS-$(PTXCONF_GPSD_GPS2UDP)	+= gps2udp
+GPSD_PROGS-$(PTXCONF_GPSD_GPSCTL)	+= gpsctl
+GPSD_PROGS-$(PTXCONF_GPSD_GPSDECODE)	+= gpsdecode
+GPSD_PROGS-$(PTXCONF_GPSD_GPSPIPE)	+= gpspipe
+GPSD_PROGS-$(PTXCONF_GPSD_GPSRINEX)	+= gpsrinex
+GPSD_PROGS-$(PTXCONF_GPSD_GPXLOGGER)	+= gpxlogger
+GPSD_PROGS-$(PTXCONF_GPSD_LCDGPS)	+= lcdgps
+GPSD_PROGS-$(PTXCONF_GPSD_CGPS)		+= cgps
+GPSD_PROGS-$(PTXCONF_GPSD_GPSMON)	+= gpsmon
+GPSD_PROGS-$(PTXCONF_GPSD_NTPSHMMON)	+= ntpshmmon
+GPSD_PROGS-$(PTXCONF_GPSD_PPSCHECK)	+= ppscheck
+
+GPSD_BUILD_CLIENTS := $(if $(strip $(GPSD_PROGS-y)),yes,no)
+
+# Python programs
+GPSD_PROGS-$(PTXCONF_GPSD_GEGPS)	+= gegps
+GPSD_PROGS-$(PTXCONF_GPSD_GPSCAT)	+= gpscat
+GPSD_PROGS-$(PTXCONF_GPSD_GPSFAKE)	+= gpsfake
+GPSD_PROGS-$(PTXCONF_GPSD_GPSPROF)	+= gpsprof
+GPSD_PROGS-$(PTXCONF_GPSD_UBXTOOL)	+= ubxtool
+GPSD_PROGS-$(PTXCONF_GPSD_ZERK)		+= zerk
+
+GPSD_CONF_TOOL	:= scons
+GPSD_CONF_OPT	:= \
+	aivdm=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_AIVDM) \
+	ashtech=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ASHTECH) \
+	bluez=$(call ptx/yesno, PTXCONF_GPSD_BLUEZ) \
+	clientdebug=no \
+	control_socket=yes \
+	controlsend=$(call ptx/yesno, PTXCONF_GPSD_CONTROLSEND) \
+	coveraging=no \
+	dbus_export=$(call ptx/yesno, PTXCONF_GPSD_DBUS) \
+	debug=no \
+	earthmate=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_EARTHMATE) \
+	evermore=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_EVERMORE) \
+	force_global=yes \
+	fury=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_FURY) \
+	fv18=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_FV18) \
+	garmin=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GARMIN) \
+	garmintxt=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GARMINTXT) \
+	geostar=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GEOSTAR) \
+	gpsclock=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GPSCLOCK) \
+	gpsd=$(call ptx/yesno, PTXCONF_GPSD_GPSD) \
+	gpsdclients=$(GPSD_BUILD_CLIENTS) \
+	greis=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GREIS) \
+	implicit_link=yes \
+	ipv6=$(call ptx/yesno, PTXCONF_GLOBAL_IPV6) \
+	isync=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ISYNC) \
+	itrax=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ITRAX) \
+	leapfetch=yes \
+	libdir=/usr/$(CROSS_LIB_DIR) \
+	libgpsmm=no \
+	magic_hat=no \
+	manbuild=no \
+	minimal=yes \
+	mtk3301=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_MTK3301) \
+	navcom=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NAVCOM) \
+	ncurses=$(call ptx/yesno, PTXCONF_GPSD_NCURSES) \
+	netfeed=yes \
+	nmea0183=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NMEA) \
+	nmea2000=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NMEA) \
+	nofloats=no \
+	nostrip=yes \
+	ntp=$(call ptx/yesno, PTXCONF_GPSD_NTP) \
+	ntpshm=$(call ptx/yesno, PTXCONF_GPSD_SHM) \
+	ntrip=$(call ptx/yesno, GPSD_DRIVER_NTRIP) \
+	oceanserver=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_OCEANSERVER) \
+	oncore=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ONCORE) \
+	oscillator=$(call ptx/yesno, PTXCONF_GPSD_OSCILLATOR) \
+	passthrough=no \
+	pps=$(call ptx/yesno, PTXCONF_GPSD_PPS) \
+	prefix=/usr \
+	profiling=$(call ptx/yesno, PTXCONF_GPSD_PROFILING) \
+	python=$(call ptx/yesno, PTXCONF_GPSD_PYTHON) \
+	python_libdir=/usr/lib/python$(PYTHON3_MAJORMINOR) \
+	qt=no \
+	reconfigure=$(call ptx/yesno, PTXCONF_GPSD_RECONFIGURE) \
+	rtcm104v2=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_RTCM104V2) \
+	rtcm104v3=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_RTCM104V3) \
+	shared=yes \
+	shm_export=$(call ptx/yesno, PTXCONF_GPSD_SHM) \
+	sirf=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SIRF) \
+	skytraq=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SKYTRAQ) \
+	socket_export=$(call ptx/yesno, PTXCONF_GPSD_SOCKET) \
+	squelch=yes \
+	superstar2=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SUPERSTAR2) \
+	sysconfdir=/etc \
+	sysroot=$(SYSROOT) \
+	systemd=$(call ptx/yesno, PTXCONF_GPSD_SYSTEMD) \
+	target=$(PTXCONF_GNU_TARGET) \
+	target_python=$(CROSS_PYTHON3) \
+	timeservice=no \
+	timing=no \
+	tnt=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TNT) \
+	tripmate=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TRIPMATE) \
+	tsip=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TSIP) \
+	ublox=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_UBX) \
+	udevdir=/usr/lib/udev \
+	usb=$(call ptx/yesno, PTXCONF_GPSD_USB) \
+	xgps=no
 
-#
-# autoconf
-#
-GPSD_AUTOCONF := \
-	$(CROSS_AUTOCONF_USR) \
-	--without-x \
-	--$(call ptx/endis, PTXCONF_GPSD_PYTHON)-python \
-	--$(call ptx/endis, PTXCONF_GPSD_PROFILING)-profiling \
-	--$(call ptx/endis, PTXCONF_GPSD_NTPSHM)-ntpshm \
-	--$(call ptx/endis, PTXCONF_GPSD_PPS)-pps \
-	--$(call ptx/endis, PTXCONF_GPSD_PPS_ON_CTS)-pps-on-cts \
-	--$(call ptx/endis, PTXCONF_GPSD_DBUS)-dbus \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_NMEA)-nmea \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_SIRF)-sirf \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_TSIP)-tsip \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_FV18)-fv18 \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_TRIPMATE)-tripmate \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_EARTHMATE)-earthmate \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_ITRAX)-itrax \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_ASHTECH)-ashtech \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_NAVCOM)-navcom \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_GARMIN)-garmin \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_GARMINTXT)-garmintxt \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_TNT)-tnt \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_UBX)-ubx \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_EVERMORE)-evermore \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_GPSCLOCK)-gpsclock \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_RTCM104V2)-rtcm104v2 \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_RTCM104V3)-rtcm104v3 \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_NTRIP)-ntrip \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_SUPERSTAR2)-superstar2 \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_OCEANSERVER)-oceanserver \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_MKT3301)-mkt3301
+ifneq ($(call remove_quotes,$(PTXCONF_GPSD_FIXED_PORT_SPEED)),)
+GPSD_CONF_OPT += fixed_port_speed=$(PTXCONF_GPSD_FIXED_PORT_SPEED)
+endif
+ifneq ($(call remove_quotes,$(PTXCONF_GPSD_FIXED_PORT_BITS)),)
+GPSD_CONF_OPT += fixed_port_bits=$(PTXCONF_GPSD_FIXED_PORT_BITS)
+endif
 
-ifneq ($(call remove_quotes,$(PTXCONF_GPSD_USER)),)
-GPSD_AUTOCONF += --enable-gpsd-user=$(PTXCONF_GPSD_USER)
+ifneq ($(call remove_quotes,$(PTXCONF_GPSD_GROUP)),)
+GPSD_CONF_OPT += gpsd_group=$(PTXCONF_GPSD_GROUP)
 endif
-ifneq ($(call remove_quotes,$(PTXCONF_GPSD_FIXED_PORT_SPEED)),)
-GPSD_AUTOCONF += --enable-fixed-port-speed=$(PTXCONF_GPSD_FIXED_PORT_SPEED)
+ifneq ($(call remove_quotes,$(PTXCONF_GPSD_USER)),)
+GPSD_CONF_OPT += gpsd_user=$(PTXCONF_GPSD_USER)
 endif
 
 ifneq ($(call remove_quotes,$(PTXCONF_GPSD_MAX_CLIENTS)),)
-GPSD_AUTOCONF += --enable-max-clients=$(PTXCONF_GPSD_MAX_CLIENTS)
+GPSD_CONF_OPT += max_clients=$(PTXCONF_GPSD_MAX_CLIENTS)
 endif
 ifneq ($(call remove_quotes,$(PTXCONF_GPSD_MAX_DEVICES)),)
-GPSD_AUTOCONF += --enable-max-devices=$(PTXCONF_GPSD_MAX_DEVICES)
+GPSD_CONF_OPT += max_devices=$(PTXCONF_GPSD_MAX_DEVICES)
 endif
 
 # ----------------------------------------------------------------------------
@@ -93,51 +165,16 @@ $(STATEDIR)/gpsd.targetinstall:
 	@$(call install_fixup, gpsd,DESCRIPTION,missing)
 
 	@$(call install_lib, gpsd, 0, 0, 0644, libgps)
-
+	@$(foreach prog, $(GPSD_PROGS-y), \
+		$(call install_copy, gpsd, 0, 0, 0755, -, \
+			/usr/bin/$(prog))$(ptx/nl))
 ifdef PTXCONF_GPSD_GPSD
 	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpsd)
 endif
-ifdef PTXCONF_GPSD_GPSCTL
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsctl)
-endif
-ifdef PTXCONF_GPSD_GPSPIPE
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpspipe)
-endif
-ifdef PTXCONF_GPSD_GPSFLASH
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsflash)
-endif
-ifdef PTXCONF_GPSD_GPXLOGGER
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpxlogger)
-endif
-ifdef PTXCONF_GPSD_CGPS
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/cgps)
-endif
-ifdef PTXCONF_GPSD_GPSMON
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsmon)
-endif
-ifdef PTXCONF_GPSD_GPSDECODE
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsdecode)
-endif
-
-ifdef PTXCONF_GPSD_GPSCAT
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpscat)
-endif
-ifdef PTXCONF_GPSD_GPSFAKE
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsfake)
-endif
-ifdef PTXCONF_GPSD_GPSPROF
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsprof)
-endif
-
 ifdef PTXCONF_GPSD_PYTHON
-	@cd $(GPSD_PKGDIR) && \
-		find ./usr/lib/python$(PYTHON_MAJORMINOR) \
-		-name "*.so" -o -name "*.pyc" | \
-		while read file; do \
-		$(call install_copy, gpsd, 0, 0, 644, -, $${file##.}); \
-	done
+	@$(call install_glob, gpsd, 0, 0, -, \
+		/usr/lib/python$(PYTHON3_MAJORMINOR), *.so *.py)
 endif
-
 	@$(call install_finish, gpsd)
 
 	@$(call touch)