5 files changed, 33 insertions, 8 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7ccbd3248e..16753863b5 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -48,7 +48,7 @@ SRCREV_pn-fso-gpsd ?= "fd1cd578d6ba9fa13aadceb59a9b46345108583b"
 SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
-SRCREV_pn-gnuradio ?= "6377"
+SRCREV_pn-gnuradio ?= "9721"
 SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gsm0710muxd ?= "3ff86b129640b647ccba3d86eb243d864671b039"
 SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
diff --git a/packages/boost/boost-jam-native_3.1.16.bb b/packages/boost/boost-jam-native_3.1.16.bb
index 955f7bfac8..2e92146a83 100644
--- a/packages/boost/boost-jam-native_3.1.16.bb
+++ b/packages/boost/boost-jam-native_3.1.16.bb
@@ -1,6 +1,4 @@
 include boost-jam-native.inc
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/boost/boost-jam-${PV}.tgz"
 
diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc
index 9cb936a105..a084b1cae0 100644
--- a/packages/gnuradio/gnuradio.inc
+++ b/packages/gnuradio/gnuradio.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "GNU Radio"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = " guile-native fftwf python libusb-compat virtual/libsdl alsa-lib jack boost cppunit sdcc-native 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-threading python-codecs python-lang python-textutils"
 RDEPENDS_gnuradio-usrp = "python-core"
@@ -22,6 +22,7 @@ EXTRA_OECONF = " \
                 --enable-gr-audio-oss \
                 --enable-mblock \
 	        --disable-html-docs \
+                PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/python2.5 \
 		"
 
 do_configure_append() {
@@ -55,7 +56,7 @@ FILES_${PN}-dbg += "${libdir}/python*/site-packages/gnuradio/.debug \
 		   "
 
 FILES_gnuradio-usrp = "${libdir}/python*/site-packages/usrpm/* \
-                       ${datadir}/usrp"
+                       ${datadir}/usrp/*/*"
 FILES_gnuradio-usrp-dbg = "${libdir}/python*/site-packages/usrpm/.debug"
 
 
diff --git a/packages/gnuradio/gnuradio/no-usrp2.patch b/packages/gnuradio/gnuradio/no-usrp2.patch
new file mode 100644
index 0000000000..fc9e2a736f
--- /dev/null
+++ b/packages/gnuradio/gnuradio/no-usrp2.patch
@@ -0,0 +1,12 @@
+--- gnuradio-trunk-work/configure.ac.orig	2008-10-06 13:38:45.000000000 -0400
++++ gnuradio-trunk-work/configure.ac	2008-10-06 13:39:02.000000000 -0400
+@@ -272,9 +272,7 @@
+ GRC_PMT
+ GRC_MBLOCK			dnl this must come after GRC_PMT
+ GRC_USRP
+-GRC_USRP2
+ GRC_GR_USRP			dnl this must come after GRC_USRP
+-GRC_GR_USRP2
+ GRC_GR_GCELL			dnl this must come after GRC_GCELL and GRC_GNURADIO_CORE
+ GRC_GR_MSDD6000	
+ GRC_GR_AUDIO_ALSA
diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb
index f72cf2fb9a..3d4f12aa7d 100644
--- a/packages/gnuradio/gnuradio_svn.bb
+++ b/packages/gnuradio/gnuradio_svn.bb
@@ -2,13 +2,27 @@ require gnuradio.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PV = "3.0.4+svnr${SRCREV}"
+PV = "3.1.3+svnr${SRCREV}"
 PR = "r4"
 
-SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \
-	   file://no-trellis-doc.patch;patch=1 \
+EXTRA_OECONF += "--with-boost=${STAGING_DIR_TARGET}/usr CXXFLAGS=-DBOOST_SP_USE_PTHREADS --disable-usrp1 --disable--usrp2"
+
+SRC_URI = "svn://gnuradio.org/svn/gnuradio/;module=trunk;proto=http \
+    file://no-usrp2.patch;patch=1 \
+#   file://no-trellis-doc.patch;patch=1 \
+#           file://gnuradio-neon.patch;patch=1;pnum=0 \
 	   "
 
 S="${WORKDIR}/trunk"
 
+#do_configure() {
+#        ./bootstrap
+#        oe_runconf
+#}
+
+do_compile_append() {
+        sed -i -e s:${STAGING_DIR_TARGET}::g \
+               -e s:/${TARGET_SYS}::g \
+                  gnuradio-core/gnuradio-core.pc
+}