Update to gnuradio 3.2

many new features and bugfixes.

4 files changed, 101 insertions, 41 deletions

diff --git a/ham/gnuradio-wxgui/Makefile b/ham/gnuradio-wxgui/Makefile
index 0b5d354aea1..ce7cc3a03ea 100644
--- a/ham/gnuradio-wxgui/Makefile
+++ b/ham/gnuradio-wxgui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/07/14 12:56:06 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2009/08/12 12:21:41 markd Exp $
 
 PKGNAME=	gnuradio-wxgui-${VERSION}
 COMMENT=	GUI framework for GNU Radio based on wxPython
@@ -22,6 +22,7 @@ SUBST_SED.py-exec=	-e 's,python -c,${PYTHONBIN} -c,g'
 
 CONF_FILES+=	${EGDIR}/gr-wxgui.conf ${PKG_SYSCONFDIR}/gr-wxgui.conf
 CONFIGURE_ARGS+=--enable-gr-wxgui
+CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 
 .include "../../ham/gnuradio-core/buildlink3.mk"
 .include "../../x11/py-wxWidgets/buildlink3.mk"
diff --git a/ham/gnuradio-wxgui/PLIST b/ham/gnuradio-wxgui/PLIST
index 84297e4bb44..759b4aaef4e 100644
--- a/ham/gnuradio-wxgui/PLIST
+++ b/ham/gnuradio-wxgui/PLIST
@@ -1,29 +1,111 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:00:34 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/08/12 12:21:41 markd Exp $
+lib/pkgconfig/gr-wxgui.pc
 ${PYSITELIB}/gnuradio/wxgui/__init__.py
 ${PYSITELIB}/gnuradio/wxgui/__init__.pyc
 ${PYSITELIB}/gnuradio/wxgui/__init__.pyo
-${PYSITELIB}/gnuradio/wxgui/fftsink.py
-${PYSITELIB}/gnuradio/wxgui/fftsink.pyc
-${PYSITELIB}/gnuradio/wxgui/fftsink.pyo
+${PYSITELIB}/gnuradio/wxgui/common.py
+${PYSITELIB}/gnuradio/wxgui/common.pyc
+${PYSITELIB}/gnuradio/wxgui/common.pyo
+${PYSITELIB}/gnuradio/wxgui/const_window.py
+${PYSITELIB}/gnuradio/wxgui/const_window.pyc
+${PYSITELIB}/gnuradio/wxgui/const_window.pyo
+${PYSITELIB}/gnuradio/wxgui/constants.py
+${PYSITELIB}/gnuradio/wxgui/constants.pyc
+${PYSITELIB}/gnuradio/wxgui/constants.pyo
+${PYSITELIB}/gnuradio/wxgui/constsink_gl.py
+${PYSITELIB}/gnuradio/wxgui/constsink_gl.pyc
+${PYSITELIB}/gnuradio/wxgui/constsink_gl.pyo
+${PYSITELIB}/gnuradio/wxgui/fft_window.py
+${PYSITELIB}/gnuradio/wxgui/fft_window.pyc
+${PYSITELIB}/gnuradio/wxgui/fft_window.pyo
+${PYSITELIB}/gnuradio/wxgui/fftsink_gl.py
+${PYSITELIB}/gnuradio/wxgui/fftsink_gl.pyc
+${PYSITELIB}/gnuradio/wxgui/fftsink_gl.pyo
+${PYSITELIB}/gnuradio/wxgui/fftsink_nongl.py
+${PYSITELIB}/gnuradio/wxgui/fftsink_nongl.pyc
+${PYSITELIB}/gnuradio/wxgui/fftsink_nongl.pyo
+${PYSITELIB}/gnuradio/wxgui/fftsink2.py
+${PYSITELIB}/gnuradio/wxgui/fftsink2.pyc
+${PYSITELIB}/gnuradio/wxgui/fftsink2.pyo
 ${PYSITELIB}/gnuradio/wxgui/form.py
 ${PYSITELIB}/gnuradio/wxgui/form.pyc
 ${PYSITELIB}/gnuradio/wxgui/form.pyo
+${PYSITELIB}/gnuradio/wxgui/gui.py
+${PYSITELIB}/gnuradio/wxgui/gui.pyc
+${PYSITELIB}/gnuradio/wxgui/gui.pyo
+${PYSITELIB}/gnuradio/wxgui/histo_window.py
+${PYSITELIB}/gnuradio/wxgui/histo_window.pyc
+${PYSITELIB}/gnuradio/wxgui/histo_window.pyo
+${PYSITELIB}/gnuradio/wxgui/histosink_gl.py
+${PYSITELIB}/gnuradio/wxgui/histosink_gl.pyc
+${PYSITELIB}/gnuradio/wxgui/histosink_gl.pyo
+${PYSITELIB}/gnuradio/wxgui/number_window.py
+${PYSITELIB}/gnuradio/wxgui/number_window.pyc
+${PYSITELIB}/gnuradio/wxgui/number_window.pyo
+${PYSITELIB}/gnuradio/wxgui/numbersink2.py
+${PYSITELIB}/gnuradio/wxgui/numbersink2.pyc
+${PYSITELIB}/gnuradio/wxgui/numbersink2.pyo
 ${PYSITELIB}/gnuradio/wxgui/plot.py
 ${PYSITELIB}/gnuradio/wxgui/plot.pyc
 ${PYSITELIB}/gnuradio/wxgui/plot.pyo
+${PYSITELIB}/gnuradio/wxgui/plotter/__init__.py
+${PYSITELIB}/gnuradio/wxgui/plotter/__init__.pyc
+${PYSITELIB}/gnuradio/wxgui/plotter/__init__.pyo
+${PYSITELIB}/gnuradio/wxgui/plotter/bar_plotter.py
+${PYSITELIB}/gnuradio/wxgui/plotter/bar_plotter.pyc
+${PYSITELIB}/gnuradio/wxgui/plotter/bar_plotter.pyo
+${PYSITELIB}/gnuradio/wxgui/plotter/channel_plotter.py
+${PYSITELIB}/gnuradio/wxgui/plotter/channel_plotter.pyc
+${PYSITELIB}/gnuradio/wxgui/plotter/channel_plotter.pyo
+${PYSITELIB}/gnuradio/wxgui/plotter/common.py
+${PYSITELIB}/gnuradio/wxgui/plotter/common.pyc
+${PYSITELIB}/gnuradio/wxgui/plotter/common.pyo
+${PYSITELIB}/gnuradio/wxgui/plotter/gltext.py
+${PYSITELIB}/gnuradio/wxgui/plotter/gltext.pyc
+${PYSITELIB}/gnuradio/wxgui/plotter/gltext.pyo
+${PYSITELIB}/gnuradio/wxgui/plotter/grid_plotter_base.py
+${PYSITELIB}/gnuradio/wxgui/plotter/grid_plotter_base.pyc
+${PYSITELIB}/gnuradio/wxgui/plotter/grid_plotter_base.pyo
+${PYSITELIB}/gnuradio/wxgui/plotter/plotter_base.py
+${PYSITELIB}/gnuradio/wxgui/plotter/plotter_base.pyc
+${PYSITELIB}/gnuradio/wxgui/plotter/plotter_base.pyo
+${PYSITELIB}/gnuradio/wxgui/plotter/waterfall_plotter.py
+${PYSITELIB}/gnuradio/wxgui/plotter/waterfall_plotter.pyc
+${PYSITELIB}/gnuradio/wxgui/plotter/waterfall_plotter.pyo
 ${PYSITELIB}/gnuradio/wxgui/powermate.py
 ${PYSITELIB}/gnuradio/wxgui/powermate.pyc
 ${PYSITELIB}/gnuradio/wxgui/powermate.pyo
-${PYSITELIB}/gnuradio/wxgui/scopesink.py
-${PYSITELIB}/gnuradio/wxgui/scopesink.pyc
-${PYSITELIB}/gnuradio/wxgui/scopesink.pyo
+${PYSITELIB}/gnuradio/wxgui/pubsub.py
+${PYSITELIB}/gnuradio/wxgui/pubsub.pyc
+${PYSITELIB}/gnuradio/wxgui/pubsub.pyo
+${PYSITELIB}/gnuradio/wxgui/scope_window.py
+${PYSITELIB}/gnuradio/wxgui/scope_window.pyc
+${PYSITELIB}/gnuradio/wxgui/scope_window.pyo
+${PYSITELIB}/gnuradio/wxgui/scopesink_gl.py
+${PYSITELIB}/gnuradio/wxgui/scopesink_gl.pyc
+${PYSITELIB}/gnuradio/wxgui/scopesink_gl.pyo
+${PYSITELIB}/gnuradio/wxgui/scopesink_nongl.py
+${PYSITELIB}/gnuradio/wxgui/scopesink_nongl.pyc
+${PYSITELIB}/gnuradio/wxgui/scopesink_nongl.pyo
+${PYSITELIB}/gnuradio/wxgui/scopesink2.py
+${PYSITELIB}/gnuradio/wxgui/scopesink2.pyc
+${PYSITELIB}/gnuradio/wxgui/scopesink2.pyo
 ${PYSITELIB}/gnuradio/wxgui/slider.py
 ${PYSITELIB}/gnuradio/wxgui/slider.pyc
 ${PYSITELIB}/gnuradio/wxgui/slider.pyo
-${PYSITELIB}/gnuradio/wxgui/stdgui.py
-${PYSITELIB}/gnuradio/wxgui/stdgui.pyc
-${PYSITELIB}/gnuradio/wxgui/stdgui.pyo
-${PYSITELIB}/gnuradio/wxgui/waterfallsink.py
-${PYSITELIB}/gnuradio/wxgui/waterfallsink.pyc
-${PYSITELIB}/gnuradio/wxgui/waterfallsink.pyo
+${PYSITELIB}/gnuradio/wxgui/stdgui2.py
+${PYSITELIB}/gnuradio/wxgui/stdgui2.pyc
+${PYSITELIB}/gnuradio/wxgui/stdgui2.pyo
+${PYSITELIB}/gnuradio/wxgui/waterfall_window.py
+${PYSITELIB}/gnuradio/wxgui/waterfall_window.pyc
+${PYSITELIB}/gnuradio/wxgui/waterfall_window.pyo
+${PYSITELIB}/gnuradio/wxgui/waterfallsink_gl.py
+${PYSITELIB}/gnuradio/wxgui/waterfallsink_gl.pyc
+${PYSITELIB}/gnuradio/wxgui/waterfallsink_gl.pyo
+${PYSITELIB}/gnuradio/wxgui/waterfallsink_nongl.py
+${PYSITELIB}/gnuradio/wxgui/waterfallsink_nongl.pyc
+${PYSITELIB}/gnuradio/wxgui/waterfallsink_nongl.pyo
+${PYSITELIB}/gnuradio/wxgui/waterfallsink2.py
+${PYSITELIB}/gnuradio/wxgui/waterfallsink2.pyc
+${PYSITELIB}/gnuradio/wxgui/waterfallsink2.pyo
 share/examples/gnuradio/conf.d/gr-wxgui.conf
diff --git a/ham/gnuradio-wxgui/distinfo b/ham/gnuradio-wxgui/distinfo
index eedabe7d097..a5c484e1d99 100644
--- a/ham/gnuradio-wxgui/distinfo
+++ b/ham/gnuradio-wxgui/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2007/08/08 14:48:55 wulf Exp $
+$NetBSD: distinfo,v 1.7 2009/08/12 12:21:41 markd Exp $
 
-SHA1 (gnuradio-3.0.4.tar.gz) = ce2d0bd4c5217cdda8c675c80a446ca38f274121
-RMD160 (gnuradio-3.0.4.tar.gz) = a1d4ae0495f51c5b7349dd8d1305b4bfb16056dc
-Size (gnuradio-3.0.4.tar.gz) = 3381051 bytes
-SHA1 (patch-aa) = 2dd396d139b02a1991825956d4a7d5e6376ca135
+SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
+RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
+Size (gnuradio-3.2.tar.gz) = 6864952 bytes
diff --git a/ham/gnuradio-wxgui/patches/patch-aa b/ham/gnuradio-wxgui/patches/patch-aa
deleted file mode 100644
index 4590a3224cc..00000000000
--- a/ham/gnuradio-wxgui/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/08/08 14:48:55 wulf Exp $
-
---- Makefile.common.orig	2007-08-08 04:40:14.000000000 +0930
-+++ Makefile.common	2007-08-08 04:40:47.000000000 +0930
-@@ -52,7 +52,7 @@
- 	            $(FFTW3F_CFLAGS)
- 
- # How to link in GNU Radio core library from inside the tree
--GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
-+GNURADIO_CORE_LA = -lgnuradio-core
- 
- # This is a dependency for many swig operations
- GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
-@@ -60,7 +60,7 @@
- # How to link in the USRP library from inside the tree
- USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \
- 		-I$(top_srcdir)/usrp/firmware/include
--USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la
-+USRP_LA = -lusrp
- 
- # This used to be set in configure.ac but is now defined here for all 
- # Makefiles when this fragment is included.