diff options
author | markd <markd> | 2009-08-12 12:20:04 +0000 |
---|---|---|
committer | markd <markd> | 2009-08-12 12:20:04 +0000 |
commit | 3669bf0ec54aaf318c17a202c4cbe34b4594b7ce (patch) | |
tree | 0d3c87ac3824ede4714f07ff2be4d1cadb4fa5b9 /ham/usrp | |
parent | 535b07d13c7912627de7f5d0dfc38b67110b9f91 (diff) | |
download | pkgsrc-3669bf0ec54aaf318c17a202c4cbe34b4594b7ce.tar.gz |
Update to gnuradio 3.2
many new features and bugfixes.
Diffstat (limited to 'ham/usrp')
-rw-r--r-- | ham/usrp/Makefile | 4 | ||||
-rw-r--r-- | ham/usrp/PLIST | 48 | ||||
-rw-r--r-- | ham/usrp/buildlink3.mk | 3 | ||||
-rw-r--r-- | ham/usrp/distinfo | 10 | ||||
-rw-r--r-- | ham/usrp/patches/patch-aa | 51 |
5 files changed, 67 insertions, 49 deletions
diff --git a/ham/usrp/Makefile b/ham/usrp/Makefile index 89a775ba1a1..29e58da4e5b 100644 --- a/ham/usrp/Makefile +++ b/ham/usrp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2008/07/14 12:56:06 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2009/08/12 12:21:41 markd Exp $ PKGNAME= usrp-${VERSION} COMMENT= Non GNU Radio specific part of the USRP code base @@ -8,6 +8,7 @@ PKG_DESTDIR_SUPPORT= user-destdir .include "../../meta-pkgs/gnuradio/Makefile.common" CONFIGURE_ARGS+= --enable-usrp +CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel BUILD_DEPENDS+= sdcc>=2.4.0:../../devel/sdcc @@ -26,4 +27,5 @@ PYTHON_PATCH_SCRIPTS+= usrp/host/lib/usrp_dbid.py .include "../../ham/gnuradio-core/buildlink3.mk" .include "../../devel/libusb/buildlink3.mk" +.include "../../lang/guile/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/ham/usrp/PLIST b/ham/usrp/PLIST index f58099b9ffd..641cbf9bb7b 100644 --- a/ham/usrp/PLIST +++ b/ham/usrp/PLIST @@ -1,6 +1,20 @@ -@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:00:35 joerg Exp $ +@comment $NetBSD: PLIST,v 1.10 2009/08/12 12:21:41 markd Exp $ bin/usrp_cal_dc_offset bin/usrper +include/db_base.h +include/db_basic.h +include/db_dbs_rx.h +include/db_dtt754.h +include/db_dtt768.h +include/db_flexrf.h +include/db_flexrf_mimo.h +include/db_tv_rx.h +include/db_util.h +include/db_xcvr2450.h +include/fpga_regs_common.h +include/fpga_regs_standard.h +include/gnuradio/swig/db_base.i +include/gnuradio/swig/usrp_prims.i include/usrp_basic.h include/usrp_bytesex.h include/usrp_config.h @@ -10,25 +24,31 @@ include/usrp_prims.h include/usrp_slots.h include/usrp_spi_defs.h include/usrp_standard.h +include/usrp_subdev_spec.h +include/usrp_tune_result.h lib/libusrp.la lib/pkgconfig/usrp.pc -${PYSITELIB}/__init__.py -${PYSITELIB}/__init__.pyc -${PYSITELIB}/__init__.pyo -${PYSITELIB}/_usrp_prims.la -${PYSITELIB}/usrp_dbid.py -${PYSITELIB}/usrp_dbid.pyc -${PYSITELIB}/usrp_dbid.pyo -${PYSITELIB}/usrp_fpga_regs.py -${PYSITELIB}/usrp_fpga_regs.pyc -${PYSITELIB}/usrp_fpga_regs.pyo -${PYSITELIB}/usrp_prims.py -${PYSITELIB}/usrp_prims.pyc -${PYSITELIB}/usrp_prims.pyo +${PYSITELIB}/usrpm/__init__.py +${PYSITELIB}/usrpm/__init__.pyc +${PYSITELIB}/usrpm/__init__.pyo +${PYSITELIB}/usrpm/_usrp_prims.la +${PYSITELIB}/usrpm/usrp_dbid.py +${PYSITELIB}/usrpm/usrp_dbid.pyc +${PYSITELIB}/usrpm/usrp_dbid.pyo +${PYSITELIB}/usrpm/usrp_fpga_regs.py +${PYSITELIB}/usrpm/usrp_fpga_regs.pyc +${PYSITELIB}/usrpm/usrp_fpga_regs.pyo +${PYSITELIB}/usrpm/usrp_prims.py +${PYSITELIB}/usrpm/usrp_prims.pyc +${PYSITELIB}/usrpm/usrp_prims.pyo +share/usrp/rev2/inband_1rxhb_1tx.rbf +share/usrp/rev2/inband_2rxhb_2tx.rbf share/usrp/rev2/multi_2rxhb_2tx.rbf share/usrp/rev2/std.ihx share/usrp/rev2/std_2rxhb_2tx.rbf share/usrp/rev2/std_4rx_0tx.rbf +share/usrp/rev4/inband_1rxhb_1tx.rbf +share/usrp/rev4/inband_2rxhb_2tx.rbf share/usrp/rev4/multi_2rxhb_2tx.rbf share/usrp/rev4/std.ihx share/usrp/rev4/std_2rxhb_2tx.rbf diff --git a/ham/usrp/buildlink3.mk b/ham/usrp/buildlink3.mk index d5493f4a490..ed90e5e3dca 100644 --- a/ham/usrp/buildlink3.mk +++ b/ham/usrp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/08/12 12:21:41 markd Exp $ BUILDLINK_TREE+= usrp @@ -10,6 +10,7 @@ BUILDLINK_PKGSRCDIR.usrp?= ../../ham/usrp .include "../../ham/gnuradio-core/buildlink3.mk" .include "../../devel/libusb/buildlink3.mk" +.include "../../lang/guile/buildlink3.mk" .endif # USRP_BUILDLINK3_MK BUILDLINK_TREE+= -usrp diff --git a/ham/usrp/distinfo b/ham/usrp/distinfo index 863324fb97c..5660d9a9eb1 100644 --- a/ham/usrp/distinfo +++ b/ham/usrp/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2007/08/08 03:24:47 wulf Exp $ +$NetBSD: distinfo,v 1.8 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) = 69322bf8cdfb18fb6d84dda21afb81dc40ad330e +SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba +RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8 +Size (gnuradio-3.2.tar.gz) = 6864952 bytes +SHA1 (patch-aa) = bfd82ea0e6dd7ed0fc5194d0027323a4adbb306b diff --git a/ham/usrp/patches/patch-aa b/ham/usrp/patches/patch-aa index 5391198e9e7..b1e8734ea86 100644 --- a/ham/usrp/patches/patch-aa +++ b/ham/usrp/patches/patch-aa @@ -1,39 +1,34 @@ -$NetBSD: patch-aa,v 1.3 2007/08/08 03:24:47 wulf Exp $ +$NetBSD: patch-aa,v 1.4 2009/08/12 12:21:41 markd Exp $ ---- usrp/doc/Makefile.am.orig 2007-07-31 12:30:37.000000000 +0930 -+++ usrp/doc/Makefile.am 2007-07-31 12:31:37.000000000 +0930 -@@ -54,20 +54,20 @@ +--- usrp/doc/Makefile.am.orig 2009-03-16 07:44:27.000000000 +1300 ++++ usrp/doc/Makefile.am +@@ -44,7 +44,7 @@ DOCBOOK_HTML_FILES= + all-local: dox + endif + +-dist_usrp_doc_DATA = $(top_srcdir)/usrp/README ++# dist_usrp_doc_DATA = $(top_srcdir)/usrp/README + + dox: html/index.html + html/index.html: +@@ -56,13 +56,13 @@ docbook-html: usrp_guide.html usrp_guide.html: usrp_guide.xml xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml -install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(docdir) -- @for i in $(top_srcdir)/usrp/README $(top_srcdir)/usrp/ChangeLog; do \ -- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \ -- done -- -- mkdir -p $(DESTDIR)$(docdir)/html +- $(MKDIR_P) $(DESTDIR)$(usrp_docdir)/html - @for i in $(DOCBOOK_HTML_FILES); do \ -- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html"; \ -- $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html; \ +- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html"; \ +- $(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html; \ - done -- cp -r html $(DESTDIR)$(docdir) -- +- cp -r html $(DESTDIR)$(usrp_docdir) +#install-data-local: -+# $(mkinstalldirs) $(DESTDIR)$(docdir) -+# @for i in $(top_srcdir)/usrp/README $(top_srcdir)/usrp/ChangeLog; do \ -+# echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ -+# $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \ -+# done -+# -+# mkdir -p $(DESTDIR)$(docdir)/html ++# $(MKDIR_P) $(DESTDIR)$(usrp_docdir)/html +# @for i in $(DOCBOOK_HTML_FILES); do \ -+# echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html"; \ -+# $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html; \ ++# echo "$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html"; \ ++# $(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html; \ +# done -+# cp -r html $(DESTDIR)$(docdir) -+# ++# cp -r html $(DESTDIR)$(usrp_docdir) + uninstall-local: - @for i in README ChangeLog; do \ - echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \ + $(RM) -fr $(DESTDIR)$(usrp_docdir)/html |