From cbd11ae09008caf96211cc27f7b81b8e87ef80c8 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 21 Jan 2010 21:04:40 +0000 Subject: [PATCH] [packages] gpsd: update to v2.90 SVN-Revision: 19258 --- net/gpsd/Makefile | 9 ++-- net/gpsd/patches/001-fix-libtool-link.patch | 22 +++++++++ net/gpsd/patches/101-trimble.patch | 55 --------------------- net/gpsd/patches/102-no_rej.patch | 40 --------------- 4 files changed, 27 insertions(+), 99 deletions(-) create mode 100644 net/gpsd/patches/001-fix-libtool-link.patch delete mode 100644 net/gpsd/patches/101-trimble.patch delete mode 100644 net/gpsd/patches/102-no_rej.patch diff --git a/net/gpsd/Makefile b/net/gpsd/Makefile index e92a049539..21f0dddb7d 100644 --- a/net/gpsd/Makefile +++ b/net/gpsd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gpsd -PKG_VERSION:=2.39 -PKG_RELEASE:=2 +PKG_VERSION:=2.90 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.berlios.de/gpsd/ -PKG_MD5SUM:=3db437196a6840c252fca99b6c19d4d0 +PKG_MD5SUM:=a23c728b8734c542d559c485857238d2 PKG_FIXUP:=libtool-ucxx @@ -45,8 +45,9 @@ CONFIGURE_ARGS += \ CONFIGURE_VARS += \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \ - LDFLAGS="$$$$LDFLAGS" \ + LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib" \ LIBS="-nodefaultlibs -luClibc++ -lm -lgcc" \ + CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ diff --git a/net/gpsd/patches/001-fix-libtool-link.patch b/net/gpsd/patches/001-fix-libtool-link.patch new file mode 100644 index 0000000000..40d00f4264 --- /dev/null +++ b/net/gpsd/patches/001-fix-libtool-link.patch @@ -0,0 +1,22 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -559,7 +559,7 @@ + # + # Build shared libraries + # +-libgps_la_LDFLAGS = -version-number 19:0:0 ++libgps_la_LDFLAGS = -version-number 19:0:0 $(LDFLAGS) + lib_LTLIBRARIES = libgps.la + libgpsd_c_sources = \ + ais_json.c \ +@@ -616,8 +616,8 @@ + BUILT_SOURCES = packet_names.h gpsd.h revision.h ais_json.i maskdump.c + libgps_la_SOURCES = $(libgpsd_c_sources) $(libgpsd_h_sources) \ + driver_rtcm2.h packet_states.h $(am__append_2) +-@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@ +-@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@ ++@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link $(CC) $(libgps_la_LDFLAGS) -o $@ ++@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link $(CXX) $(libgps_la_LDFLAGS) -o $@ + nodist_libgps_la_SOURCES = packet_names.h ais_json.i + libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) + diff --git a/net/gpsd/patches/101-trimble.patch b/net/gpsd/patches/101-trimble.patch deleted file mode 100644 index d053157b10..0000000000 --- a/net/gpsd/patches/101-trimble.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -urN gpsd-2.39/drivers.c gpsd-2.39.new/drivers.c ---- gpsd-2.39/drivers.c 2009-03-18 18:37:56.000000000 +0100 -+++ gpsd-2.39.new/drivers.c 2009-07-29 00:22:54.000000000 +0200 -@@ -165,9 +165,13 @@ - /* probe for the FV-18 -- expect $PFEC,GPint followed by data */ - (void)nmea_send(session, "$PFEC,GPint"); - break; -+ case 3: -+ /* probe for the Trimble Copernicus */ -+ (void)nmea_send(session->gpsdata.gps_fd, "$PTNLSNM,0139,01"); -+ break; - #endif /* NMEA_ENABLE */ - #ifdef EVERMORE_ENABLE -- case 3: -+ case 4: - /* Enable checksum and GGA(1s), GLL(0s), GSA(1s), GSV(1s), RMC(1s), VTG(0s), PEMT101(1s) */ - /* EverMore will reply with: \x10\x02\x04\x38\x8E\xC6\x10\x03 */ - (void)gpsd_write(session, -@@ -175,31 +179,31 @@ - break; - #endif /* EVERMORE_ENABLE */ - #ifdef ITRAX_ENABLE -- case 4: -+ case 5: - /* probe for iTrax, looking for "$PFST,OK" */ - (void)nmea_send(session, "$PFST"); - break; - #endif /* ITRAX_ENABLE */ - #ifdef GPSCLOCK_ENABLE -- case 5: -+ case 6: - /* probe for Furuno Electric GH-79L4-N (GPSClock); expect $PFEC,GPssd */ - (void)nmea_send(session, "$PFEC,GPsrq"); - break; - #endif /* GPSCLOCK_ENABLE */ - #ifdef ASHTECH_ENABLE -- case 6: -+ case 7: - /* probe for Ashtech -- expect $PASHR,RID */ - (void)nmea_send(session, "$PASHQ,RID"); - break; - #endif /* ASHTECH_ENABLE */ - #ifdef UBX_ENABLE -- case 7: -+ case 8: - /* probe for UBX -- query software version */ - (void)ubx_write(session, 0x0au, 0x04, NULL, 0); - break; - #endif /* UBX_ENABLE */ - #ifdef MKT3301_ENABLE -- case 8: -+ case 9: - /* probe for MKT-3301 -- expect $PMTK705 */ - (void)nmea_send(session, "$PMTK605"); - break; diff --git a/net/gpsd/patches/102-no_rej.patch b/net/gpsd/patches/102-no_rej.patch deleted file mode 100644 index 2bc8f68c73..0000000000 --- a/net/gpsd/patches/102-no_rej.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -urN gpsd-2.39/packaging/gpsd.spec.in.rej gpsd-2.39.new/packaging/gpsd.spec.in.rej ---- gpsd-2.39/packaging/gpsd.spec.in.rej 2009-03-17 14:45:02.000000000 +0100 -+++ gpsd-2.39.new/packaging/gpsd.spec.in.rej 1970-01-01 01:00:00.000000000 +0100 -@@ -1,36 +0,0 @@ --*************** --*** 119,125 **** -- %{_mandir}/man1/gpsctl.1* -- %{_sysconfdir}/hotplug/usb/gpsd.hotplug -- %{_sysconfdir}/hotplug/usb/gpsd.usermap --- %attr(755, root, root) /usr/lib/python*/site-packages/gps.py* -- #%{_datadir}/gpsd/dgpsip-servers -- -- %files -n gpsd-devel ----- 115,121 ---- -- %{_mandir}/man1/gpsctl.1* -- %{_sysconfdir}/hotplug/usb/gpsd.hotplug -- %{_sysconfdir}/hotplug/usb/gpsd.usermap --+ %attr(755, root, root) %{_libdir}/python*/site-packages/gps.py* -- #%{_datadir}/gpsd/dgpsip-servers -- -- %files -n gpsd-devel --*************** --*** 129,136 **** -- %attr(755, root, root) %{_bindir}/gpsfake -- %attr(755, root, root) %{_bindir}/rtcmdecode -- %attr(755, root, root) %{_bindir}/gpsflash --- /usr/lib/python*/site-packages/gpsfake.py* --- /usr/lib/python*/site-packages/gpspacket.so* -- %{_includedir}/gps.h -- %{_includedir}/libgpsmm.h -- %{_includedir}/gpsd.h ----- 125,132 ---- -- %attr(755, root, root) %{_bindir}/gpsfake -- %attr(755, root, root) %{_bindir}/rtcmdecode -- %attr(755, root, root) %{_bindir}/gpsflash --+ %{_libdir}/python*/site-packages/gpsfake.py* --+ %{_libdir}/python*/site-packages/gpspacket.so* -- %{_includedir}/gps.h -- %{_includedir}/libgpsmm.h -- %{_includedir}/gpsd.h -- 2.30.2