diff options
Diffstat (limited to 'ham')
-rw-r--r-- | ham/gnuradio-core/Makefile | 7 | ||||
-rw-r--r-- | ham/gnuradio-core/buildlink3.mk | 4 | ||||
-rw-r--r-- | ham/gnuradio-core/distinfo | 11 | ||||
-rw-r--r-- | ham/gnuradio-core/patches/patch-af | 15 | ||||
-rw-r--r-- | ham/gnuradio-core/patches/patch-ag | 13 |
5 files changed, 19 insertions, 31 deletions
diff --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile index f69e29c4520..05ba58441eb 100644 --- a/ham/gnuradio-core/Makefile +++ b/ham/gnuradio-core/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.14 2006/12/01 09:30:58 wulf Exp $ +# $NetBSD: Makefile,v 1.15 2007/08/08 03:05:05 wulf Exp $ PKGNAME= gnuradio-core-${VERSION} -PKGREVISION= 1 COMMENT= Runtime system and DSP blocks for GNU Radio .include "../../meta-pkgs/gnuradio/Makefile.common" +PATCHDIR= ${.CURDIR}/../../ham/gnuradio-core/patches + CONF_FILES+= ${EGDIR}/gnuradio-core.conf ${PKG_SYSCONFDIR}/gnuradio-core.conf CONFIGURE_ARGS+=--enable-gnuradio-core @@ -63,7 +64,6 @@ PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gruimpl/gnuplot_freqz.p PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gruimpl/freqz.py PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gruimpl/lmx2306.py PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr_unittest.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/bin/microtune.py PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/tests/test_buffers.py .include "../../devel/swig/buildlink3.mk" @@ -71,7 +71,6 @@ PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/tests/test_buffers.py .include "../../devel/cppunit/buildlink3.mk" .include "../../math/fftwf/buildlink3.mk" .include "../../math/py-Numeric/buildlink3.mk" -.include "../../math/py-numarray/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-core/buildlink3.mk b/ham/gnuradio-core/buildlink3.mk index d8b9719b09b..5c342c75eb6 100644 --- a/ham/gnuradio-core/buildlink3.mk +++ b/ham/gnuradio-core/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2006/11/13 16:59:22 wulf Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2007/08/08 03:05:05 wulf Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GNURADIO_CORE_BUILDLINK3_MK:= ${GNURADIO_CORE_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= gnuradio-core BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnuradio-core .if ${GNURADIO_CORE_BUILDLINK3_MK} == "+" -BUILDLINK_API_DEPENDS.gnuradio-core+= gnuradio-core>=3.0.2 +BUILDLINK_API_DEPENDS.gnuradio-core+= gnuradio-core>=3.0.4 BUILDLINK_PKGSRCDIR.gnuradio-core?= ../../ham/gnuradio-core BUILDLINK_CPPFLAGS.gnuradio-core+= -I${BUILDLINK_PREFIX.gnuradio-core}/include/gnuradio .endif # GNURADIO_CORE_BUILDLINK3_MK diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo index f8ec9f81194..98c28540cc9 100644 --- a/ham/gnuradio-core/distinfo +++ b/ham/gnuradio-core/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.8 2006/12/01 09:30:58 wulf Exp $ +$NetBSD: distinfo,v 1.9 2007/08/08 03:05:05 wulf Exp $ -SHA1 (gnuradio-3.0.2.tar.gz) = 9d9a0e22c9e4fd9735f62c0145b9ceb61a33f9c2 -RMD160 (gnuradio-3.0.2.tar.gz) = 3ff771c2d13d680fb76d7ca82a6a11678c7069ae -Size (gnuradio-3.0.2.tar.gz) = 3190212 bytes +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) = b2fa027df5a42628db84c553cfa61f37dc7886c1 SHA1 (patch-ab) = bacede2ccdbd1142b5fcd729963248a01977eaec SHA1 (patch-ac) = 348898e1e0d58c03295183ce8ce0ee4baf91bddb SHA1 (patch-ad) = af8bc66ee7c9856e31673e765a52a2fc56e35ebb SHA1 (patch-ae) = 63e3c4d08162c023efc4c0c97f2141366abc21d5 -SHA1 (patch-af) = 5c5c08d1eb3af7f7e8ef7345424914053428069b -SHA1 (patch-ag) = e7405038bfc2da960659e00f95b3be2a01e9f64b +SHA1 (patch-af) = c65df8f0d4ace5a5d5acb1450940aebdf896b00b diff --git a/ham/gnuradio-core/patches/patch-af b/ham/gnuradio-core/patches/patch-af index 9ea2f232148..0d7d70ecb64 100644 --- a/ham/gnuradio-core/patches/patch-af +++ b/ham/gnuradio-core/patches/patch-af @@ -1,17 +1,19 @@ -$NetBSD: patch-af,v 1.2 2006/11/13 16:59:22 wulf Exp $ +$NetBSD: patch-af,v 1.3 2007/08/08 03:05:05 wulf Exp $ ---- gnuradio-core/doc/Makefile.in.orig 2006-11-11 22:57:15.000000000 +1030 -+++ gnuradio-core/doc/Makefile.in 2006-11-11 22:56:32.000000000 +1030 -@@ -743,19 +743,19 @@ +--- gnuradio-core/doc/Makefile.am.orig 2007-07-29 23:41:53.000000000 +0930 ++++ gnuradio-core/doc/Makefile.am 2007-07-31 10:44:22.000000000 +0930 +@@ -52,20 +52,20 @@ + ## done # cp -r html $(docdir) - install-data-local: +-install-data-local: - $(mkinstalldirs) $(DESTDIR)$(docdir) - @for i in $(top_srcdir)/README $(top_srcdir)/README.hacking; do \ - echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \ - done - cp -r html $(DESTDIR)$(docdir) ++#install-data-local: +# $(mkinstalldirs) $(DESTDIR)$(docdir) +# @for i in $(top_srcdir)/README $(top_srcdir)/README.hacking; do \ +# echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ @@ -19,12 +21,13 @@ $NetBSD: patch-af,v 1.2 2006/11/13 16:59:22 wulf Exp $ +# done +# cp -r html $(DESTDIR)$(docdir) - uninstall-local: +-uninstall-local: - @for i in README README.hacking; do \ - echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \ - $(RM) $(DESTDIR)$(docdir)/$$i; \ - done - $(RM) -fr $(DESTDIR)$(docdir)/html ++#uninstall-local: +# @for i in README README.hacking; do \ +# echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \ +# $(RM) $(DESTDIR)$(docdir)/$$i; \ diff --git a/ham/gnuradio-core/patches/patch-ag b/ham/gnuradio-core/patches/patch-ag deleted file mode 100644 index 499c0f599ec..00000000000 --- a/ham/gnuradio-core/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2006/12/01 09:28:41 wulf Exp $ - ---- gnuradio-core/src/lib/general/gr_firdes.cc.orig 2006-12-01 12:50:37.000000000 +1030 -+++ gnuradio-core/src/lib/general/gr_firdes.cc 2006-12-01 12:52:01.000000000 +1030 -@@ -272,7 +272,7 @@ - - for (int n = -M; n <= M; n++){ - if (n == 0) -- taps[n + M] = (1.0 + (fwT0 - fwT1)) / M_PI * w[n + M]; -+ taps[n + M] = 1.0 + ((fwT0 - fwT1) / M_PI * w[n + M]); - else { - taps[n + M] = (sin (n * fwT0) - sin (n * fwT1)) / (n * M_PI) * w[n + M]; - } |