From dad35281a7d0cc6424ac346ef02aa158174f6f0c Mon Sep 17 00:00:00 2001 From: markd Date: Wed, 12 Aug 2009 12:20:04 +0000 Subject: Update to gnuradio 3.2 many new features and bugfixes. --- ham/gnuradio-usrp/Makefile | 3 +- ham/gnuradio-usrp/PLIST | 71 ++++++++++++++------------------------ ham/gnuradio-usrp/distinfo | 11 +++--- ham/gnuradio-usrp/patches/patch-ab | 22 ------------ ham/gnuradio-usrp/patches/patch-ac | 25 -------------- ham/gnuradio-usrp/patches/patch-ad | 12 +++++++ 6 files changed, 45 insertions(+), 99 deletions(-) delete mode 100644 ham/gnuradio-usrp/patches/patch-ab delete mode 100644 ham/gnuradio-usrp/patches/patch-ac create mode 100644 ham/gnuradio-usrp/patches/patch-ad (limited to 'ham/gnuradio-usrp') diff --git a/ham/gnuradio-usrp/Makefile b/ham/gnuradio-usrp/Makefile index 361a1d4bbcb..fbf3b28db98 100644 --- a/ham/gnuradio-usrp/Makefile +++ b/ham/gnuradio-usrp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2008/07/14 12:56:06 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2009/08/12 12:21:41 markd Exp $ PKGNAME= gnuradio-usrp-${VERSION} COMMENT= USRP bindings for GNU Radio @@ -12,6 +12,7 @@ PYTHON_PATCH_SCRIPTS+= gr-usrp/src/tx_debug_gui.py .include "../../meta-pkgs/gnuradio/Makefile.common" CONFIGURE_ARGS+=--enable-gr-usrp +CONFIGURE_ARGS+=--with-usrp --with-gnuradio-core --with-omnithread --with-gruel .include "../../ham/usrp/buildlink3.mk" .include "../../math/fftwf/buildlink3.mk" diff --git a/ham/gnuradio-usrp/PLIST b/ham/gnuradio-usrp/PLIST index a7312c869ab..1786dae36f6 100644 --- a/ham/gnuradio-usrp/PLIST +++ b/ham/gnuradio-usrp/PLIST @@ -1,45 +1,26 @@ -@comment $NetBSD: PLIST,v 1.4 2006/11/13 18:12:41 wulf Exp $ -include/gnuradio/swig/usrp1.i -include/gnuradio/usrp1_sink_base.h -include/gnuradio/usrp1_sink_c.h -include/gnuradio/usrp1_sink_s.h -include/gnuradio/usrp1_source_base.h -include/gnuradio/usrp1_source_c.h -include/gnuradio/usrp1_source_s.h -${PYSITELIB}/gnuradio/_usrp1.la -${PYSITELIB}/gnuradio/db_base.py -${PYSITELIB}/gnuradio/db_base.pyc -${PYSITELIB}/gnuradio/db_base.pyo -${PYSITELIB}/gnuradio/db_basic.py -${PYSITELIB}/gnuradio/db_basic.pyc -${PYSITELIB}/gnuradio/db_basic.pyo -${PYSITELIB}/gnuradio/db_dbs_rx.py -${PYSITELIB}/gnuradio/db_dbs_rx.pyc -${PYSITELIB}/gnuradio/db_dbs_rx.pyo -${PYSITELIB}/gnuradio/db_flexrf.py -${PYSITELIB}/gnuradio/db_flexrf.pyc -${PYSITELIB}/gnuradio/db_flexrf.pyo -${PYSITELIB}/gnuradio/db_flexrf_mimo.py -${PYSITELIB}/gnuradio/db_flexrf_mimo.pyc -${PYSITELIB}/gnuradio/db_flexrf_mimo.pyo -${PYSITELIB}/gnuradio/db_instantiator.py -${PYSITELIB}/gnuradio/db_instantiator.pyc -${PYSITELIB}/gnuradio/db_instantiator.pyo -${PYSITELIB}/gnuradio/db_tv_rx.py -${PYSITELIB}/gnuradio/db_tv_rx.pyc -${PYSITELIB}/gnuradio/db_tv_rx.pyo -${PYSITELIB}/gnuradio/flexrf_debug_gui.py -${PYSITELIB}/gnuradio/flexrf_debug_gui.pyc -${PYSITELIB}/gnuradio/flexrf_debug_gui.pyo -${PYSITELIB}/gnuradio/tx_debug_gui.py -${PYSITELIB}/gnuradio/tx_debug_gui.pyc -${PYSITELIB}/gnuradio/tx_debug_gui.pyo -${PYSITELIB}/gnuradio/usrp.py -${PYSITELIB}/gnuradio/usrp.pyc -${PYSITELIB}/gnuradio/usrp.pyo -${PYSITELIB}/gnuradio/usrp1.py -${PYSITELIB}/gnuradio/usrp1.pyc -${PYSITELIB}/gnuradio/usrp1.pyo -${PYSITELIB}/gnuradio/usrp_multi.py -${PYSITELIB}/gnuradio/usrp_multi.pyc -${PYSITELIB}/gnuradio/usrp_multi.pyo +@comment $NetBSD: PLIST,v 1.5 2009/08/12 12:21:41 markd Exp $ +include/gnuradio/swig/usrp_base.i +include/gnuradio/swig/usrp_sink_base.i +include/gnuradio/swig/usrp_sink_c.i +include/gnuradio/swig/usrp_sink_s.i +include/gnuradio/swig/usrp_source_base.i +include/gnuradio/swig/usrp_source_c.i +include/gnuradio/swig/usrp_source_s.i +include/gnuradio/swig/usrp_standard.i +include/gnuradio/swig/usrp_swig.i +include/gnuradio/usrp_base.h +include/gnuradio/usrp_sink_base.h +include/gnuradio/usrp_sink_c.h +include/gnuradio/usrp_sink_s.h +include/gnuradio/usrp_source_base.h +include/gnuradio/usrp_source_c.h +include/gnuradio/usrp_source_s.h +lib/libgnuradio-usrp.la +lib/pkgconfig/gnuradio-usrp.pc +${PYSITELIB}/gnuradio/usrp/__init__.py +${PYSITELIB}/gnuradio/usrp/__init__.pyc +${PYSITELIB}/gnuradio/usrp/__init__.pyo +${PYSITELIB}/gnuradio/usrp/_usrp_swig.la +${PYSITELIB}/gnuradio/usrp/usrp_swig.py +${PYSITELIB}/gnuradio/usrp/usrp_swig.pyc +${PYSITELIB}/gnuradio/usrp/usrp_swig.pyo diff --git a/ham/gnuradio-usrp/distinfo b/ham/gnuradio-usrp/distinfo index d5759d157a2..c604f832ee2 100644 --- a/ham/gnuradio-usrp/distinfo +++ b/ham/gnuradio-usrp/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.6 2007/08/08 14:39:59 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-ab) = 2dd396d139b02a1991825956d4a7d5e6376ca135 -SHA1 (patch-ac) = f64a60f2ef14489de3823c27f0fba128faa40f0c +SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba +RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8 +Size (gnuradio-3.2.tar.gz) = 6864952 bytes +SHA1 (patch-ad) = 496fad80b4050a08c0f4e5197d491e7be6828c50 diff --git a/ham/gnuradio-usrp/patches/patch-ab b/ham/gnuradio-usrp/patches/patch-ab deleted file mode 100644 index 76dc3890ec0..00000000000 --- a/ham/gnuradio-usrp/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2007/08/08 14:37:46 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. diff --git a/ham/gnuradio-usrp/patches/patch-ac b/ham/gnuradio-usrp/patches/patch-ac deleted file mode 100644 index b7a3065a905..00000000000 --- a/ham/gnuradio-usrp/patches/patch-ac +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2007/08/08 03:20:08 wulf Exp $ - ---- config/grc_gr_usrp.m4.orig 2007-07-29 19:01:28.000000000 +0930 -+++ config/grc_gr_usrp.m4 2007-07-29 18:53:09.000000000 +0930 -@@ -29,13 +29,13 @@ - passed=yes - # Don't do gr-usrp if usrp skipped - # There *has* to be a better way to check if a value is in a string -- for dir in $skipped_dirs -- do -- if test x$dir = xusrp; then -- AC_MSG_RESULT([Component gr-usrp requires usrp, which is not being built.]) -- passed=no -- fi -- done -+# for dir in $skipped_dirs -+# do -+# if test x$dir = xusrp; then -+# AC_MSG_RESULT([Component gr-usrp requires usrp, which is not being built.]) -+# passed=no -+# fi -+# done - - GRC_BUILD_CONDITIONAL([gr-usrp],[ - dnl run_tests is created from run_tests.in. Make it executable. diff --git a/ham/gnuradio-usrp/patches/patch-ad b/ham/gnuradio-usrp/patches/patch-ad new file mode 100644 index 00000000000..541334862ae --- /dev/null +++ b/ham/gnuradio-usrp/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.1 2009/08/12 12:21:41 markd Exp $ + +--- config/grc_usrp.m4.orig 2009-06-05 17:12:19.000000000 +1200 ++++ config/grc_usrp.m4 +@@ -19,6 +19,7 @@ dnl Boston, MA 02110-1301, USA. + + AC_DEFUN([GRC_USRP],[ + GRC_ENABLE(usrp) ++ GRC_WITH(usrp) + + dnl Don't do usrp if omnithread skipped + GRC_CHECK_DEPENDENCY(usrp, omnithread) -- cgit v1.2.3