merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

6 files changed, 103 insertions, 0 deletions

diff --git a/packages/gnuradio/.mtn2git_empty b/packages/gnuradio/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnuradio/.mtn2git_empty
diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc
new file mode 100644
index 0000000000..4916411f0a
--- /dev/null
+++ b/packages/gnuradio/gnuradio.inc
@@ -0,0 +1,61 @@
+DESCRIPTION = "GNU Radio"
+SECTION =  "apps"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native"
+
+RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils"
+RDEPENDS_gnuradio-usrp = "python-core"
+
+inherit autotools pkgconfig
+
+CXXFLAGS_powerpc += "-lstdc++"
+
+export BUILD_SYS := "${BUILD_SYS}"
+export HOST_SYS := "${HOST_SYS}"
+
+EXTRA_OECONF = " \
+                --disable-gr-atsc \
+		--enable-gr-video-sdl \
+		--enable-gr-audio-alsa  \
+                --enable-gr-audio-jack \
+                --enable-gr-audio-oss \
+                --enable-mblock \
+	        "
+
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+}
+
+PACKAGES =+ "libpmt libpmt-qa \
+             libmblock libmblock-qa \
+	     libgr-audio-alsa \
+	     libusrp libusrp-inband libusrp-inband-qa \
+	     libgromnithread \
+	     libgnuradio-core libgnuradio-core-qa \
+	     gnuradio-usrp-dbg gnuradio-usrp"
+
+FILES_libpmt = "${libdir}/libpmt.so"
+FILES_libpmt-qa = "${libdir}/libpmt-qa.so"
+FILES_libmblock = "${libdir}/libmblock.so"
+FILES_libmblock-qa = "${libdir}/libmblock-qa.so"
+FILES_libgr-audio-alsa = "${libdir}/libgr_audio_alsa.so"
+
+FILES_libusrp = "${libdir}/libusrp.so.*"
+FILES_libusrp-inband = "${libdir}/libusrp_inband.so.*"
+FILES_libusrp-inband-qa = "${libdir}/libusrp_inband-qa.so"
+FILES_libgnuradio-core = "${libdir}/libgnuradio-core.so.*"
+FILES_libgnuradio-core-qa = "${libdir}/libgnuradio-core-qa.so.*"
+FILES_libgromnithread = "${libdir}/libgromnithread.so*"
+
+FILES_${PN} += "${libdir}/python*/site-packages/gnuradio/*"
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/gnuradio/.debug \
+                   ${libdir}/python*/site-packages/gnuradio/*/.debug \
+		   "
+
+FILES_gnuradio-usrp = "${libdir}/python*/site-packages/usrpm/* \
+                       ${datadir}/usrp"
+FILES_gnuradio-usrp-dbg = "${libdir}/python*/site-packages/usrpm/.debug"
+
+
+
diff --git a/packages/gnuradio/gnuradio/.mtn2git_empty b/packages/gnuradio/gnuradio/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnuradio/gnuradio/.mtn2git_empty
diff --git a/packages/gnuradio/gnuradio/no-trellis-doc.patch b/packages/gnuradio/gnuradio/no-trellis-doc.patch
new file mode 100644
index 0000000000..039aed9c8e
--- /dev/null
+++ b/packages/gnuradio/gnuradio/no-trellis-doc.patch
@@ -0,0 +1,20 @@
+--- /tmp/Makefile.am	2007-07-27 13:44:31.000000000 +0200
++++ trunk/gr-trellis/Makefile.am	2007-07-27 13:50:06.795215000 +0200
+@@ -21,5 +21,5 @@
+ 
+ include $(top_srcdir)/Makefile.common
+ 
+-SUBDIRS = src doc
++SUBDIRS = src
+ 
+--- /tmp/Makefile.am	2007-07-27 19:18:00.000000000 +0200
++++ trunk/usrp/Makefile.am	2007-07-27 19:18:20.995215000 +0200
+@@ -20,7 +20,7 @@
+ # 
+ 
+ EXTRA_DIST = usrp.pc.in usrp.iss.in usrp.inf
+-SUBDIRS = host firmware fpga doc
++SUBDIRS = host firmware fpga 
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = usrp.pc
diff --git a/packages/gnuradio/gnuradio_3.0.4.bb b/packages/gnuradio/gnuradio_3.0.4.bb
new file mode 100644
index 0000000000..30a6d0ab5e
--- /dev/null
+++ b/packages/gnuradio/gnuradio_3.0.4.bb
@@ -0,0 +1,8 @@
+require gnuradio.inc
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
+	   file://no-trellis-doc.patch;patch=1 \
+	   "
+
diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb
new file mode 100644
index 0000000000..e40d151acb
--- /dev/null
+++ b/packages/gnuradio/gnuradio_svn.bb
@@ -0,0 +1,14 @@
+require gnuradio.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PV = "3.0.4+svn${SRCDATE}"
+PR = "r2"
+
+SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \
+	   file://no-trellis-doc.patch;patch=1 \
+	   "
+
+S="${WORKDIR}/trunk"
+
+