From bd49bbc1067fae650759f7e53033498b4f77d27f Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 11 Oct 2010 22:18:14 +0200 Subject: gnuradio : moved unused files to obsolete dir Signed-off-by: Frans Meulenbroeks --- recipes/gnuradio/gnuradio/gnuradio-libusb.patch | 25 ---------------------- recipes/gnuradio/gnuradio/no-trellis-doc.patch | 20 ----------------- .../gnuradio/gnuradio/gnuradio-libusb.patch | 25 ++++++++++++++++++++++ .../gnuradio/gnuradio/no-trellis-doc.patch | 20 +++++++++++++++++ 4 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 recipes/gnuradio/gnuradio/gnuradio-libusb.patch delete mode 100644 recipes/gnuradio/gnuradio/no-trellis-doc.patch create mode 100644 recipes/obsolete/gnuradio/gnuradio/gnuradio-libusb.patch create mode 100644 recipes/obsolete/gnuradio/gnuradio/no-trellis-doc.patch diff --git a/recipes/gnuradio/gnuradio/gnuradio-libusb.patch b/recipes/gnuradio/gnuradio/gnuradio-libusb.patch deleted file mode 100644 index d3be6294b4..0000000000 --- a/recipes/gnuradio/gnuradio/gnuradio-libusb.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Nurd gnuradio-3.1.2.orig/usrp/host/lib/legacy/usrp_prims.cc gnuradio-3.1.2/usrp/host/lib/legacy/usrp_prims.cc ---- gnuradio-3.1.2.orig/usrp/host/lib/legacy/usrp_prims.cc 2008-03-05 16:12:38.000000000 -0500 -+++ gnuradio-3.1.2/usrp/host/lib/legacy/usrp_prims.cc 2008-07-12 08:04:09.000000000 -0400 -@@ -131,10 +131,18 @@ - static struct usb_device * - dev_handle_to_dev (usb_dev_handle *udh) - { -+ struct list_head { -+ struct list_head *prev, *next; -+ }; -+ - struct usb_dev_handle_kludge { -- int fd; -- struct usb_bus *bus; -- struct usb_device *device; -+ /* lock protects claimed_interfaces */ -+ pthread_mutex_t lock; -+ unsigned long claimed_interfaces; -+ -+ struct list_head list; -+ struct usb_device *device; -+ unsigned char os_priv[0]; - }; - - return ((struct usb_dev_handle_kludge *) udh)->device; diff --git a/recipes/gnuradio/gnuradio/no-trellis-doc.patch b/recipes/gnuradio/gnuradio/no-trellis-doc.patch deleted file mode 100644 index 039aed9c8e..0000000000 --- a/recipes/gnuradio/gnuradio/no-trellis-doc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /tmp/Makefile.am 2007-07-27 13:44:31.000000000 +0200 -+++ trunk/gr-trellis/Makefile.am 2007-07-27 13:50:06.795215000 +0200 -@@ -21,5 +21,5 @@ - - include $(top_srcdir)/Makefile.common - --SUBDIRS = src doc -+SUBDIRS = src - ---- /tmp/Makefile.am 2007-07-27 19:18:00.000000000 +0200 -+++ trunk/usrp/Makefile.am 2007-07-27 19:18:20.995215000 +0200 -@@ -20,7 +20,7 @@ - # - - EXTRA_DIST = usrp.pc.in usrp.iss.in usrp.inf --SUBDIRS = host firmware fpga doc -+SUBDIRS = host firmware fpga - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = usrp.pc diff --git a/recipes/obsolete/gnuradio/gnuradio/gnuradio-libusb.patch b/recipes/obsolete/gnuradio/gnuradio/gnuradio-libusb.patch new file mode 100644 index 0000000000..d3be6294b4 --- /dev/null +++ b/recipes/obsolete/gnuradio/gnuradio/gnuradio-libusb.patch @@ -0,0 +1,25 @@ +diff -Nurd gnuradio-3.1.2.orig/usrp/host/lib/legacy/usrp_prims.cc gnuradio-3.1.2/usrp/host/lib/legacy/usrp_prims.cc +--- gnuradio-3.1.2.orig/usrp/host/lib/legacy/usrp_prims.cc 2008-03-05 16:12:38.000000000 -0500 ++++ gnuradio-3.1.2/usrp/host/lib/legacy/usrp_prims.cc 2008-07-12 08:04:09.000000000 -0400 +@@ -131,10 +131,18 @@ + static struct usb_device * + dev_handle_to_dev (usb_dev_handle *udh) + { ++ struct list_head { ++ struct list_head *prev, *next; ++ }; ++ + struct usb_dev_handle_kludge { +- int fd; +- struct usb_bus *bus; +- struct usb_device *device; ++ /* lock protects claimed_interfaces */ ++ pthread_mutex_t lock; ++ unsigned long claimed_interfaces; ++ ++ struct list_head list; ++ struct usb_device *device; ++ unsigned char os_priv[0]; + }; + + return ((struct usb_dev_handle_kludge *) udh)->device; diff --git a/recipes/obsolete/gnuradio/gnuradio/no-trellis-doc.patch b/recipes/obsolete/gnuradio/gnuradio/no-trellis-doc.patch new file mode 100644 index 0000000000..039aed9c8e --- /dev/null +++ b/recipes/obsolete/gnuradio/gnuradio/no-trellis-doc.patch @@ -0,0 +1,20 @@ +--- /tmp/Makefile.am 2007-07-27 13:44:31.000000000 +0200 ++++ trunk/gr-trellis/Makefile.am 2007-07-27 13:50:06.795215000 +0200 +@@ -21,5 +21,5 @@ + + include $(top_srcdir)/Makefile.common + +-SUBDIRS = src doc ++SUBDIRS = src + +--- /tmp/Makefile.am 2007-07-27 19:18:00.000000000 +0200 ++++ trunk/usrp/Makefile.am 2007-07-27 19:18:20.995215000 +0200 +@@ -20,7 +20,7 @@ + # + + EXTRA_DIST = usrp.pc.in usrp.iss.in usrp.inf +-SUBDIRS = host firmware fpga doc ++SUBDIRS = host firmware fpga + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = usrp.pc -- cgit 1.2.3-korg