gnuradio: packaging fixes:

* package all libs seperately
* make the usrp python stuff have its own package
* add 3.0.4 tarball release
* create a .inc for common stuff

3 files changed, 70 insertions, 38 deletions

diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc
new file mode 100644
index 0000000000..fff5331ce0
--- /dev/null
+++ b/packages/gnuradio/gnuradio.inc
@@ -0,0 +1,60 @@
+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"
+
+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_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
index a773a36321..e40d151acb 100644
--- a/packages/gnuradio/gnuradio_svn.bb
+++ b/packages/gnuradio/gnuradio_svn.bb
@@ -1,10 +1,6 @@
-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"
+require gnuradio.inc
 
-RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils"
+DEFAULT_PREFERENCE = "-1"
 
 PV = "3.0.4+svn${SRCDATE}"
 PR = "r2"
@@ -13,38 +9,6 @@ SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \
 	   file://no-trellis-doc.patch;patch=1 \
 	   "
 
-inherit autotools pkgconfig
-
 S="${WORKDIR}/trunk"
 
-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 =+ "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*"
-
-FILES_${PN} += "${libdir}/python*/site-packages/gnuradio/*"
-FILES_${PN}-dbg += "${libdir}/python*/site-packages/gnuradio/.debug \
-                   ${libdir}/python*/site-packages/gnuradio/*/.debug \
-		   "
-