gpsd: upgrade from 2.95 to 2.96, drop 2 patches applied upstream

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

6 files changed, 3 insertions, 38 deletions

diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-2.95/fix-build-with-python2.7.patch b/meta-oe/recipes-navigation/gpsd/gpsd-2.95/fix-build-with-python2.7.patch
deleted file mode 100644
index 6bba2b860..000000000
--- a/meta-oe/recipes-navigation/gpsd/gpsd-2.95/fix-build-with-python2.7.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Without this patch python2.6 from host could be preferred over python from native sysroot.
-
-Upstream-Status: Pending
-diff -uNr gpsd-2.95.orig/configure.ac gpsd-2.95/configure.ac
---- gpsd-2.95.orig/configure.ac 2011-10-31 18:26:08.860719033 +0100
-+++ gpsd-2.95/configure.ac      2011-10-31 18:27:47.718716963 +0100
-@@ -31,7 +31,7 @@
- dnl AM_PATH_PYTHON provided with automake can be too old.  Look
- dnl for newer python first, and include 2.6 on the list.
- m4_define([_AM_PYTHON_INTERPRETER_LIST],
--           [python2.6 python2.5 python2.4 python])
-+           [python2.7 python2.6 python2.5 python2.4 python])
- AM_PATH_PYTHON([2.4])
- ac_python=yes
- if test "x$PYTHON" = "x"; then
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-2.95/libtool.patch b/meta-oe/recipes-navigation/gpsd/gpsd-2.95/libtool.patch
deleted file mode 100644
index 7b78a72d8..000000000
--- a/meta-oe/recipes-navigation/gpsd/gpsd-2.95/libtool.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gpsd-2.95/Makefile.am
-===================================================================
---- gpsd-2.95.orig/Makefile.am  2010-08-26 15:31:38.804330723 +0200
-+++ gpsd-2.95/Makefile.am       2010-08-26 15:31:57.170020341 +0200
-@@ -253,9 +253,9 @@
- # Warning: This overrides autoconf's normal link-line generation process
- if LIBGPSMM_ENABLE
- libgps_la_SOURCES += libgpsmm.cpp
--libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@
-+libgps_la_LINK = $(LIBTOOL) --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@
- else
--libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@
-+libgps_la_LINK = $(LIBTOOL) --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@
- endif
- 
- nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-2.95/60-gpsd.rules b/meta-oe/recipes-navigation/gpsd/gpsd-2.96/60-gpsd.rules
index c01db068d..c01db068d 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd-2.95/60-gpsd.rules
+++ b/meta-oe/recipes-navigation/gpsd/gpsd-2.96/60-gpsd.rules
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-2.95/gpsd b/meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd
index 3687d2400..3687d2400 100755
--- a/meta-oe/recipes-navigation/gpsd/gpsd-2.95/gpsd
+++ b/meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-2.95/gpsd-default b/meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd-default
index 0ceff0382..0ceff0382 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd-2.95/gpsd-default
+++ b/meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd-default
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_2.95.bb b/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb
index cdcb77c2a..0dc06a148 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_2.95.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb
@@ -5,22 +5,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus-glib ncurses python libusb1"
 PROVIDES = "virtual/gpsd"
 
-PR = "r2"
-
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
                 --x-libraries=${STAGING_LIBDIR} \
                 --enable-dbus \
                 --disable-libQgpsmm \
 "
 
-SRC_URI = "http://download.berlios.de/${PN}/${P}.tar.gz;name=gpsd \
-           file://libtool.patch \
-           file://fix-build-with-python2.7.patch \
+SRC_URI = "http://download.berlios.de/${PN}/${P}bis.tar.gz;name=gpsd \
            file://gpsd-default \
            file://gpsd \
            file://60-gpsd.rules"
-SRC_URI[gpsd.md5sum] = "12535a9ed9fecf9ea2c5bdc9840da5ae"
-SRC_URI[gpsd.sha256sum] = "832343a53921a8371efa540ba57c91dadedda445e571c1beb97c06539ef450ae"
+SRC_URI[gpsd.md5sum] = "52b00cab0fb34bbf1923ae35c7ced6c4"
+SRC_URI[gpsd.sha256sum] = "c6d72565bc06b802c749e69808eb7c6ee165962dc17383971c9001b5e1763690"
 
 inherit autotools update-rc.d python-dir