update gnuradio to version 3.3.0

build: refactor GR_GIT and GR_VERSION
Make C++ shared libraries versioned
howto: make versioned libraries
Changes to gr_udp_{source,sink} for MinGW
Ignore ENOPROTOOPT return from setsockopt(SO_LINGER)
Use getaddrinfo in gr_udp_{source,sink}
Discard data in gr_udp_sink until receiver is started.
Updates to udp source/sink (select(), wait, cleanup)
Merge branch 'master' into udp
Rework UDP source and sink, with incompatible API changes
Merge branch 'master' into udp
Flush pending errors in gr_udp_sink on disconnect()
Add additional conditionalization of networking includes
Use -1 as file descriptor "not open" value instead of 0
Identify memory leaks that occur on error conditions
Correct update of d_temp_offset (parallel construction)
Move initialization of select timeout
Defend against a peer that sends an invalid message length.
Return immediately when using d_residual.
Simplify USE_SELECT usage
Add USRP2 clock source parameter to GRC blocks.
grc: update UDP source and sink block wrappers
gnuradio-core: allow swig to handle exceptions in UDP source/sink
gnuradio-core: update copyrights
libvrt: remove from 3.3 API.
Merge remote branch 'gnuradio/wip/udp_source_sink'
Fix erroneous file modes
usrp2-firmware: fix missing files in tarball
Merge remote branch 'ets/grc-usrp2-clock-source'
howto: fix make check for win32, darwin (untested)
Remove bogus check for existence of prefix directory.
Update incorrectly checked in Makefile.am
Add support for the Bitshark USRP RX (BURX) daughterboard for the USRP1.
Add support for the Bitshark USRP RX (BURX) daughterboard for the USRP2.
Fixed issue with with wrong Makefile.am files being copied
Including bitshark_rx.h header file for USRP2 build
Updated db_bitshark_rx.c to the proper version that includes the
Once and for all, here is the properly updated Makefile.am for the apps
Updated to allow BURX support to be built into standard txrx.bin
usrp: Cleanup for merge of bitshark daughterboard code
Change default bandwidth to 25 MHz to match maximum USRP2 bandwidth
Merge branch 'master' into wip/burx_support
Merge remote branch 'nldudok1/gr-wxgui_emulate_analog' into master
gr-wxgui: Renamed "emulate analog" feature to "use persistence"
gr-wxgui: update copyrights
gnuradio-core: Disable (temporarily) interpolator tap calculation
build: force use of ltmain.sh from libtool 2.2.6b
build: use correct comment delimiter
build: distribute version controlled ltmain.sh in tarball
Merge remote branch 'bitshark/burx_support' into wip/burx_support
Revert "build: force use of ltmain.sh from libtool 2.2.6b"
Revert "build: distribute version controlled ltmain.sh in tarball"
Merge branch 'wip/burx_support'
gnuradio-core: removed gr.dd_mpsk_sync_cc block as obsolete
grc: rename execution binary from 'grc' to 'gnuradio-companion'
Update revision to release 3.3.0-rc1, update autotools
Add analog CRT screen afterglow emulation for gr-wxgui

9 files changed, 102 insertions, 80 deletions

diff --git a/meta-pkgs/gnuradio/Makefile.version b/meta-pkgs/gnuradio/Makefile.version
index 0ce642e3631..3179968786b 100644
--- a/meta-pkgs/gnuradio/Makefile.version
+++ b/meta-pkgs/gnuradio/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.3 2009/08/12 12:20:04 markd Exp $
+# $NetBSD: Makefile.version,v 1.4 2010/09/15 09:38:42 markd Exp $
 
-VERSION=        3.2
+VERSION=        3.3.0
diff --git a/meta-pkgs/gnuradio/distinfo b/meta-pkgs/gnuradio/distinfo
index 0b5c2aa743b..cb0a14daa56 100644
--- a/meta-pkgs/gnuradio/distinfo
+++ b/meta-pkgs/gnuradio/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.3 2010/02/21 23:11:39 schwarz Exp $
+$NetBSD: distinfo,v 1.4 2010/09/15 09:38:42 markd Exp $
 
-SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
-RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
-Size (gnuradio-3.2.tar.gz) = 6864952 bytes
+SHA1 (gnuradio-3.3.0.tar.gz) = 41d5c177b173ce73404f5fe539b013c82600f73f
+RMD160 (gnuradio-3.3.0.tar.gz) = ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
+Size (gnuradio-3.3.0.tar.gz) = 6997955 bytes
 SHA1 (patch-aa) = 08c9b0fc725bcb2f6795445cbd64af431f9ce9a1
 SHA1 (patch-ab) = f7db7741c27b3dd32eb104637b537b304234d12c
 SHA1 (patch-ac) = bfd82ea0e6dd7ed0fc5194d0027323a4adbb306b
-SHA1 (patch-ad) = 496fad80b4050a08c0f4e5197d491e7be6828c50
-SHA1 (patch-ae) = 0e5211736ffa70edd704b10fce2d8d3943c552c2
-SHA1 (patch-af) = dfb9521d9cd9f30f02f67b2d6259c325dc02fc2f
+SHA1 (patch-ae) = 44c99528a5ae8fe10f473f0da9f1c41edaa8ba8d
+SHA1 (patch-ag) = 1707574a02ecb9391f54b9a740b350b07d14740d
+SHA1 (patch-ah) = 713fd140b8143b468b8ac2422f825a1ee24d4419
+SHA1 (patch-ai) = 2e8291c4d8a117c9c69de0ee906fbff85485d797
+SHA1 (patch-aj) = 046fb46567fcbef58143ac3eeb2d0f1fd905618e
+SHA1 (patch-ak) = c6d2d9289600a89cd425d1bab671b080888d9c04
diff --git a/meta-pkgs/gnuradio/patches/patch-ae b/meta-pkgs/gnuradio/patches/patch-ae
index 2481d1a6ea9..5369b7a8b46 100644
--- a/meta-pkgs/gnuradio/patches/patch-ae
+++ b/meta-pkgs/gnuradio/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.1 2009/12/30 21:13:15 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2010/09/15 09:38:42 markd Exp $
 
---- gnuradio-core/src/python/gnuradio/Makefile.am.orig	2009-12-23 19:51:56.000000000 +0000
+--- gnuradio-core/src/python/gnuradio/Makefile.am.orig	2010-06-02 00:57:53.000000000 +0000
 +++ gnuradio-core/src/python/gnuradio/Makefile.am
-@@ -21,7 +21,7 @@
- 
+@@ -22,7 +22,7 @@
  include $(top_srcdir)/Makefile.common
  
+ if PYTHON
 -SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder
 +SUBDIRS = gr gru gruimpl blks2 blks2impl
  
diff --git a/meta-pkgs/gnuradio/patches/patch-af b/meta-pkgs/gnuradio/patches/patch-af
deleted file mode 100644
index 9fb38f810c4..00000000000
--- a/meta-pkgs/gnuradio/patches/patch-af
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-af,v 1.1 2010/02/21 23:11:39 schwarz Exp $
-
---- usrp/host/lib/legacy/fusb_darwin.cc.orig	2010-02-21 15:52:58.000000000 +0100
-+++ usrp/host/lib/legacy/fusb_darwin.cc	2010-02-21 15:57:20.000000000 +0100
-@@ -345,7 +345,7 @@
-   if ((! l_both) || (! d_started)) {
-     if (usb_debug > 4)
-       fprintf (stderr, "fusb_ephandle_darwin::read_issue: Doing nothing; "
--	       "l_both is %X; started is %s\n", (unsigned int) l_both,
-+	       "l_both is %X; started is %s\n", (unsigned long) l_both,
- 	       d_started ? "TRUE" : "FALSE");
-     return;
-   }
-@@ -380,7 +380,7 @@
- 			  darwin_error_str (result));
-   else if (usb_debug > 4)
-     fprintf (stderr, "fusb_ephandle_darwin::read_issue: "
--	     "Queued %X (%ld Bytes)\n", (unsigned int) l_both, bufLen);
-+	     "Queued %X (%ld Bytes)\n", (unsigned long) l_both, bufLen);
- }
- 
- void
-@@ -388,7 +388,7 @@
- 				      io_return_t result,
- 				      void* io_size)
- {
--  UInt32 l_size = (UInt32) io_size;
-+  unsigned long l_size = (unsigned long) io_size;
-   s_both_ptr l_both = static_cast<s_both_ptr>(refCon);
-   fusb_ephandle_darwin* This = static_cast<fusb_ephandle_darwin*>(l_both->This ());
-   s_node_ptr l_node = l_both->node ();
-@@ -403,7 +403,7 @@
-   else if (usb_debug > 4)
-     fprintf (stderr, "fusb_ephandle_darwin::read_completed: "
- 	     "Read %X (%ld bytes)\n",
--	     (unsigned int) l_both, l_size);
-+	     (unsigned long) l_both, l_size);
- 
- // add this read to the transfer buffer
-   if (l_buffer->enqueue (l_buf->buffer (), l_size) == -1) {
-@@ -477,7 +477,7 @@
- 		     darwin_error_str (result));
-     else if (usb_debug > 4) {
-       fprintf (stderr, "fusb_ephandle_darwin::write_thread: "
--	       "Queued %X (%ld Bytes)\n", (unsigned int) l_both, t_nbytes);
-+	       "Queued %X (%ld Bytes)\n", (unsigned long) l_both, t_nbytes);
-     }
-     l_nbytes -= t_nbytes;
-   }
-@@ -492,7 +492,7 @@
- {
-   s_both_ptr l_both = static_cast<s_both_ptr>(refCon);
-   fusb_ephandle_darwin* This = static_cast<fusb_ephandle_darwin*>(l_both->This ());
--  UInt32 l_size = (UInt32) io_size;
-+  unsigned long l_size = (unsigned long) io_size;
-   s_node_ptr l_node = l_both->node ();
-   s_queue_ptr l_queue = This->d_queue;
-   s_buffer_ptr l_buf = l_node->object ();
-@@ -504,7 +504,7 @@
- 	     l_i_size, l_size);
-   else if (usb_debug > 4)
-     fprintf (stderr, "fusb_ephandle_darwin::write_completed: "
--	     "Wrote %X (%ld Bytes)\n", (unsigned int) l_both, l_size);
-+	     "Wrote %X (%ld Bytes)\n", (unsigned long) l_both, l_size);
- 
- // set buffer's # data to 0
-   l_buf->n_used (0);
diff --git a/meta-pkgs/gnuradio/patches/patch-ag b/meta-pkgs/gnuradio/patches/patch-ag
new file mode 100644
index 00000000000..9756dae4d53
--- /dev/null
+++ b/meta-pkgs/gnuradio/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1 2010/09/15 09:38:42 markd Exp $
+
+--- config/gr_version.m4.orig	2010-06-03 06:22:52.000000000 +0000
++++ config/gr_version.m4
+@@ -36,7 +36,7 @@ AC_DEFUN([GR_VERSION],[
+   GR_GIT
+ 
+   dnl Test if we should use git version
+-  if test "$MINOR_VERSION" == "git"; then
++  if test "$MINOR_VERSION" = "git"; then
+     dnl RELEASE: 3.3git-xxx-gxxxxxxxx
+     dnl DOCVER:  3.3git
+     dnl LIBVER:  3.3git
+@@ -44,7 +44,7 @@ AC_DEFUN([GR_VERSION],[
+     DOCVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION
+     LIBVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION
+   else
+-    if test "$MAINT_VERSION" == "git" ; then
++    if test "$MAINT_VERSION" = "git" ; then
+       dnl RELEASE: 3.3.1git-xxx-gxxxxxxxx
+       dnl DOCVER:  3.3.1git
+       dnl LIBVER:  3.3.1git
diff --git a/meta-pkgs/gnuradio/patches/patch-ah b/meta-pkgs/gnuradio/patches/patch-ah
new file mode 100644
index 00000000000..efdb49048cd
--- /dev/null
+++ b/meta-pkgs/gnuradio/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2010/09/15 09:38:42 markd Exp $
+
+--- configure.ac.orig	2010-06-03 06:45:00.000000000 +0000
++++ configure.ac
+@@ -297,8 +297,8 @@ BUILD_DATE=`date -u +"%a, %d %b %Y %R:%S
+ AC_SUBST(BUILD_DATE)
+ 
+ dnl SYSCONFDIR substitution
+-if test "${sysconfdir}" == "\${prefix}/etc" ; then
+-   if test "${prefix}" == "NONE" ; then
++if test "${sysconfdir}" = "\${prefix}/etc" ; then
++   if test "${prefix}" = "NONE" ; then
+       SYSCONFDIR=["$ac_default_prefix/etc"]
+    else
+       SYSCONFDIR=["${prefix}/etc"]
diff --git a/meta-pkgs/gnuradio/patches/patch-ai b/meta-pkgs/gnuradio/patches/patch-ai
new file mode 100644
index 00000000000..b0e5797be1e
--- /dev/null
+++ b/meta-pkgs/gnuradio/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1 2010/09/15 09:38:42 markd Exp $
+
+--- gnuradio-core/src/lib/io/gr_udp_sink.cc.orig	2010-06-03 06:22:52.000000000 +0000
++++ gnuradio-core/src/lib/io/gr_udp_sink.cc
+@@ -34,6 +34,9 @@
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>  //usually included by <netdb.h>?
++#endif
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>  //usually included by <netdb.h>?
+ #endif
diff --git a/meta-pkgs/gnuradio/patches/patch-aj b/meta-pkgs/gnuradio/patches/patch-aj
new file mode 100644
index 00000000000..6610d4aee18
--- /dev/null
+++ b/meta-pkgs/gnuradio/patches/patch-aj
@@ -0,0 +1,17 @@
+$NetBSD: patch-aj,v 1.1 2010/09/15 09:38:42 markd Exp $
+
+--- gr-usrp/src/usrp_swig.i.orig	2010-08-22 12:32:11.000000000 +0000
++++ gr-usrp/src/usrp_swig.i
+@@ -27,9 +27,9 @@
+ %}
+ 
+ %include <usrp/usrp_subdev_spec.h>
+-%include <usrp/db_base.i>
+-%include <fpga_regs_common.h>
+-%include <fpga_regs_standard.h>
++%include <db_base.i>
++%include <usrp/fpga_regs_common.h>
++%include <usrp/fpga_regs_standard.h>
+ %include "usrp_standard.i"
+ %include "usrp_base.i"
+ %include "usrp_source_base.i"
diff --git a/meta-pkgs/gnuradio/patches/patch-ak b/meta-pkgs/gnuradio/patches/patch-ak
new file mode 100644
index 00000000000..b9827ef6193
--- /dev/null
+++ b/meta-pkgs/gnuradio/patches/patch-ak
@@ -0,0 +1,18 @@
+$NetBSD: patch-ak,v 1.1 2010/09/15 09:38:42 markd Exp $
+
+--- gr-usrp/src/usrp_standard.i.orig	2010-06-01 05:04:09.000000000 +0000
++++ gr-usrp/src/usrp_standard.i
+@@ -24,11 +24,11 @@
+ 
+ %{
+ #include <usrp/usrp_standard.h>
+-#include <usrp_spi_defs.h>
++#include <usrp/usrp_spi_defs.h>
+ #include <usrp/usrp_dbid.h>
+ %}
+ 
+-%include <usrp_spi_defs.h>
++%include <usrp/usrp_spi_defs.h>
+ %include <usrp/usrp_dbid.h>
+ 
+ %constant int FPGA_MODE_NORMAL   = usrp_standard_rx::FPGA_MODE_NORMAL;