summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/gnuradio/gnuradio/no-trellis-doc.patch11
-rw-r--r--packages/gnuradio/gnuradio_svn.bb26
2 files changed, 30 insertions, 7 deletions
diff --git a/packages/gnuradio/gnuradio/no-trellis-doc.patch b/packages/gnuradio/gnuradio/no-trellis-doc.patch
index 1e5148d3f9..039aed9c8e 100644
--- a/packages/gnuradio/gnuradio/no-trellis-doc.patch
+++ b/packages/gnuradio/gnuradio/no-trellis-doc.patch
@@ -7,3 +7,14 @@
-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_svn.bb b/packages/gnuradio/gnuradio_svn.bb
index 30fe6ba916..a773a36321 100644
--- a/packages/gnuradio/gnuradio_svn.bb
+++ b/packages/gnuradio/gnuradio_svn.bb
@@ -2,13 +2,12 @@ DESCRIPTION = "GNU Radio"
SECTION = "apps"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "fftwf python boost cppunit sdcc-native swig swig-native"
+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 swig"
+RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils"
PV = "3.0.4+svn${SRCDATE}"
-PR = "r1"
-
+PR = "r2"
SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \
file://no-trellis-doc.patch;patch=1 \
@@ -23,9 +22,22 @@ CXXFLAGS_powerpc += "-lstdc++"
export BUILD_SYS := "${BUILD_SYS}"
export HOST_SYS := "${HOST_SYS}"
-EXTRA_OECONF = "--disable-gr-atsc --disable-gr-video-sdl"
-
-PACKAGES =+ "libgromnithread libgnuradio-core libgnuradio-core-qa"
+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 =+ "libusrp libusrp-inband libgromnithread libgnuradio-core libgnuradio-core-qa"
+FILES_libusrp = "${libdir}/libusrp.so.*"
+FILES_libusrp-inband = "${libdir}/libusrp_inband.so.*"
FILES_libgnuradio-core = "${libdir}/libgnuradio-core.so.*"
FILES_libgnuradio-core-qa = "${libdir}/libgnuradio-core-qa.so.*"
FILES_libgromnithread = "${libdir}/libgromnithread.so*"