From b20afb77bb543b90474ff3c94c820751c296c140 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 1 Apr 2008 09:11:11 +0000
Subject: gnuradio: add 3.1.2 release and make that the default over svn

---
 packages/gnuradio/gnuradio-3.1.2/.mtn2git_empty      |  0
 .../gnuradio/gnuradio-3.1.2/no-trellis-doc.patch     | 20 ++++++++++++++++++++
 packages/gnuradio/gnuradio.inc                       |  3 ++-
 packages/gnuradio/gnuradio_3.1.2.bb                  |  8 ++++++++
 packages/gnuradio/gnuradio_svn.bb                    |  2 +-
 5 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 packages/gnuradio/gnuradio-3.1.2/.mtn2git_empty
 create mode 100644 packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch
 create mode 100644 packages/gnuradio/gnuradio_3.1.2.bb

(limited to 'packages')

diff --git a/packages/gnuradio/gnuradio-3.1.2/.mtn2git_empty b/packages/gnuradio/gnuradio-3.1.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch b/packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch
new file mode 100644
index 0000000000..a5c1b90bd2
--- /dev/null
+++ b/packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch
@@ -0,0 +1,20 @@
+--- /tmp/Makefile.am	2008-04-01 10:50:58.848945668 +0200
++++ gnuradio-3.1.2/usrp/Makefile.am	2008-04-01 10:51:06.095612812 +0200
+@@ -24,7 +24,7 @@
+ 	usrp.iss.in \
+ 	usrp.inf
+ 
+-SUBDIRS = host firmware fpga doc
++SUBDIRS = host firmware fpga 
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = \
+--- /tmp/Makefile.am	2008-04-01 10:52:10.615605452 +0200
++++ gnuradio-3.1.2/gr-trellis/Makefile.am	2008-04-01 10:52:19.807923018 +0200
+@@ -21,5 +21,5 @@
+ 
+ include $(top_srcdir)/Makefile.common
+ 
+-SUBDIRS = src doc
++SUBDIRS = src 
+ 
diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc
index 4916411f0a..79b1fcefa5 100644
--- a/packages/gnuradio/gnuradio.inc
+++ b/packages/gnuradio/gnuradio.inc
@@ -21,7 +21,8 @@ EXTRA_OECONF = " \
                 --enable-gr-audio-jack \
                 --enable-gr-audio-oss \
                 --enable-mblock \
-	        "
+	        --disable-html-docs \
+		"
 
 do_configure_append() {
         find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
diff --git a/packages/gnuradio/gnuradio_3.1.2.bb b/packages/gnuradio/gnuradio_3.1.2.bb
new file mode 100644
index 0000000000..30a6d0ab5e
--- /dev/null
+++ b/packages/gnuradio/gnuradio_3.1.2.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 c84a8a2121..00d3a04056 100644
--- a/packages/gnuradio/gnuradio_svn.bb
+++ b/packages/gnuradio/gnuradio_svn.bb
@@ -1,6 +1,6 @@
 require gnuradio.inc
 
-DEFAULT_PREFERENCE = "1"
+DEFAULT_PREFERENCE = "-1"
 
 PV = "3.0.4+svnr${SRCREV}"
 PR = "r2"
-- 
cgit v1.2.3