From 4e2dba920549b2881b2c69e1d4746f997dcb4336 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Thu, 26 Jul 2007 15:50:04 +0000 Subject: gnuradio_svn.bb : First pass at adding support for GNU Radio. Still needs debugging. --- packages/gnuradio/.mtn2git_empty | 0 packages/gnuradio/gnuradio_svn.bb | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 packages/gnuradio/.mtn2git_empty create mode 100644 packages/gnuradio/gnuradio_svn.bb (limited to 'packages/gnuradio') diff --git a/packages/gnuradio/.mtn2git_empty b/packages/gnuradio/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb new file mode 100644 index 0000000000..1e313b0b6c --- /dev/null +++ b/packages/gnuradio/gnuradio_svn.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "GNU Radio" +SECTION = "apps" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "fftw python boost cppunit sdcc-native swig swig-native" +RDEPENDS = "fftw python swig" +PR = "r0" + +SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http" + +inherit autotools pkgconfig + +S="${WORKDIR}/trunk" + +CXXFLAGS_powerpc += "-lstdc++" + +export BUILD_SYS := "${BUILD_SYS}" +export HOST_SYS := "${HOST_SYS}" + +EXTRA_OECONF = "--disable-gr-atsc --disable-gr-video-sdl" + -- cgit v1.2.3 From 12e9dd26696aaa5b1ffbc48b8d8eff9afc2c6102 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 27 Jul 2007 10:29:18 +0000 Subject: gnuradio: set PV --- packages/gnuradio/gnuradio_svn.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages/gnuradio') diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb index 1e313b0b6c..f3d4873e5a 100644 --- a/packages/gnuradio/gnuradio_svn.bb +++ b/packages/gnuradio/gnuradio_svn.bb @@ -2,10 +2,13 @@ DESCRIPTION = "GNU Radio" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "fftw python boost cppunit sdcc-native swig swig-native" -RDEPENDS = "fftw python swig" +DEPENDS = "fftwf python boost cppunit sdcc-native swig swig-native" +RDEPENDS = "libfftwf python swig" + +PV = "0.0+svn${SRCDATE}" PR = "r0" + SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http" inherit autotools pkgconfig -- cgit v1.2.3 From 40d3de312d7892436cb00b8bdb77eda0746564b1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 27 Jul 2007 12:19:58 +0000 Subject: gnuradio: fixes * update PV to 3.0.4 * patch out doc generation for gr-trellis subdir * packages all libs seperately * package python files as well --- packages/gnuradio/gnuradio/.mtn2git_empty | 0 packages/gnuradio/gnuradio/no-trellis-doc.patch | 9 +++++++++ packages/gnuradio/gnuradio_svn.bb | 20 +++++++++++++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 packages/gnuradio/gnuradio/.mtn2git_empty create mode 100644 packages/gnuradio/gnuradio/no-trellis-doc.patch (limited to 'packages/gnuradio') diff --git a/packages/gnuradio/gnuradio/.mtn2git_empty b/packages/gnuradio/gnuradio/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuradio/gnuradio/no-trellis-doc.patch b/packages/gnuradio/gnuradio/no-trellis-doc.patch new file mode 100644 index 0000000000..1e5148d3f9 --- /dev/null +++ b/packages/gnuradio/gnuradio/no-trellis-doc.patch @@ -0,0 +1,9 @@ +--- /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 + diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb index f3d4873e5a..0eed243618 100644 --- a/packages/gnuradio/gnuradio_svn.bb +++ b/packages/gnuradio/gnuradio_svn.bb @@ -3,13 +3,16 @@ SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "fftwf python boost cppunit sdcc-native swig swig-native" -RDEPENDS = "libfftwf python swig" -PV = "0.0+svn${SRCDATE}" +RDEPENDS_${PN} = "python-core swig" + +PV = "3.0.4+svn${SRCDATE}" PR = "r0" -SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http" +SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \ + file://no-trellis-doc.patch;patch=1 \ + " inherit autotools pkgconfig @@ -22,3 +25,14 @@ export HOST_SYS := "${HOST_SYS}" EXTRA_OECONF = "--disable-gr-atsc --disable-gr-video-sdl" +PACKAGES =+ "libgromnithread libgnuradio-core libgnuradio-core-qa" +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 \ + " + + -- cgit v1.2.3 From d9fcc52a43dfde71cdded97290c751cf63a6d1dc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 27 Jul 2007 14:13:03 +0000 Subject: gnuradio: add enough python stuff to silence dial_tone.py --- packages/gnuradio/gnuradio_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/gnuradio') diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb index 0eed243618..30fe6ba916 100644 --- a/packages/gnuradio/gnuradio_svn.bb +++ b/packages/gnuradio/gnuradio_svn.bb @@ -4,10 +4,10 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "fftwf python boost cppunit sdcc-native swig swig-native" -RDEPENDS_${PN} = "python-core swig" +RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils swig" PV = "3.0.4+svn${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \ -- cgit v1.2.3 From 9e59a4d34711a3c8e1f673ccb10dea0445e1a74b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 27 Jul 2007 21:49:38 +0000 Subject: gnuradio: enable usrp and package its lib seperately --- packages/gnuradio/gnuradio/no-trellis-doc.patch | 11 +++++++++++ packages/gnuradio/gnuradio_svn.bb | 26 ++++++++++++++++++------- 2 files changed, 30 insertions(+), 7 deletions(-) (limited to 'packages/gnuradio') 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*" -- cgit v1.2.3 From 2a84ad5c196c6a0dc3ba43c89624bc45d0d06dd3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 28 Jul 2007 08:09:17 +0000 Subject: 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 --- packages/gnuradio/gnuradio.inc | 60 +++++++++++++++++++++++++++++++++++++ packages/gnuradio/gnuradio_3.0.4.bb | 8 +++++ packages/gnuradio/gnuradio_svn.bb | 40 ++----------------------- 3 files changed, 70 insertions(+), 38 deletions(-) create mode 100644 packages/gnuradio/gnuradio.inc create mode 100644 packages/gnuradio/gnuradio_3.0.4.bb (limited to 'packages/gnuradio') 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 \ - " - -- cgit v1.2.3 From 8112a34e6415059b234b13f25c483d25e34f0353 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 28 Jul 2007 09:10:58 +0000 Subject: gnuradio: gnuradio-usrp also needs python-core --- packages/gnuradio/gnuradio.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/gnuradio') diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc index fff5331ce0..b5642deb09 100644 --- a/packages/gnuradio/gnuradio.inc +++ b/packages/gnuradio/gnuradio.inc @@ -5,6 +5,7 @@ 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 -- cgit v1.2.3 From bd9c9ba97300474375809d784277b7cbfac55c15 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 28 Jul 2007 19:00:56 +0000 Subject: gnuradio.inc: fix quoting --- packages/gnuradio/gnuradio.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/gnuradio') diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc index b5642deb09..4916411f0a 100644 --- a/packages/gnuradio/gnuradio.inc +++ b/packages/gnuradio/gnuradio.inc @@ -54,8 +54,8 @@ FILES_${PN}-dbg += "${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" + ${datadir}/usrp" +FILES_gnuradio-usrp-dbg = "${libdir}/python*/site-packages/usrpm/.debug" -- cgit v1.2.3