4 files changed, 1 insertions, 50 deletions

diff --git a/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
index e82b75eb011d..d2bae2fca05e 100644
--- a/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
@@ -1,4 +1,4 @@
---- gr-digital/doc/CMakeLists.txt.orig	2016-09-02 04:16:13 UTC
+--- gr-digital/doc/CMakeLists.txt.orig	2017-02-27 23:19:00 UTC
 +++ gr-digital/doc/CMakeLists.txt
 @@ -17,7 +17,9 @@
  # the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc b/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc
deleted file mode 100644
index d17022e8e701..000000000000
--- a/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- gr-dtv/lib/dvbt/dvbt_reed_solomon.cc.orig	2016-09-02 04:16:13 UTC
-+++ gr-dtv/lib/dvbt/dvbt_reed_solomon.cc
-@@ -42,7 +42,7 @@ namespace gr {
-       d_p = p; d_m = m;
- 
-       //maximum number of elements in the GF(p^m)
--      int q = powl(p, m);
-+      int q = pow(p, m);
- 
-       d_gf_exp = new unsigned char[q];
-       if (d_gf_exp == NULL) {
diff --git a/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c b/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
deleted file mode 100644
index 09ec29f7f75f..000000000000
--- a/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gr-fcd/lib/hid/hid-libusb.c.orig	2016-09-02 04:16:14 UTC
-+++ gr-fcd/lib/hid/hid-libusb.c
-@@ -250,8 +250,8 @@ static int get_usage(uint8_t *report_des
- }
- #endif /* INVASIVE_GET_USAGE */
- 
--#ifdef __FreeBSD__
--/* The FreeBSD version of libusb doesn't have this funciton. In mainline
-+#ifndef HAVE_LIBUSB_GET_STRING_DESCRIPTOR
-+/* The FreeBSD version of libusb doesn't have this function. In mainline
-    libusb, it's inlined in libusb.h. This function will bear a striking
-    resemblence to that one, because there's about one way to code it.
- 
-@@ -756,8 +756,12 @@ static void *read_thread(void *param)
- 	   if no transfers are pending, but that's OK. */
- 	libusb_cancel_transfer(dev->transfer);
- 
-+#if 0
- 	while (!dev->cancelled)
- 		libusb_handle_events_completed(usb_context, &dev->cancelled);
-+#endif
-+	while (!dev->cancelled)
-+		libusb_handle_events(NULL);
- 
- 	/* Now that the read thread is stopping, Wake any threads which are
- 	   waiting on data (in hid_read_timeout()). Do this under a mutex to
diff --git a/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion b/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion
deleted file mode 100644
index a2ddf49af4eb..000000000000
--- a/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion
+++ /dev/null
@@ -1,12 +0,0 @@
---- grc/scripts/gnuradio-companion.orig	2016-09-02 04:16:13 UTC
-+++ grc/scripts/gnuradio-companion
-@@ -22,6 +22,9 @@ import os
- import sys
- import warnings
- 
-+# XXX workaround to make sure we import gcc libgcc4
-+# the older one from base: 
-+from numpy.linalg import lapack_lite 
- 
- GR_IMPORT_ERROR_MESSAGE = """\
- Cannot import gnuradio.