[oe-commits] org.oe.dev gnuradio: add 3.1.2 release and make that the default over svn

[koen commit]

gnuradio: add 3.1.2 release and make that the default over svn

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 4fec7547828d90c8b430bc08cb12a80b9091750b
ViewMTN: http://monotone.openembedded.org/revision/info/4fec7547828d90c8b430bc08cb12a80b9091750b
Files:
1
packages/gnuradio/gnuradio-3.1.2
packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch
packages/gnuradio/gnuradio_3.1.2.bb
packages/gnuradio/gnuradio.inc
packages/gnuradio/gnuradio_svn.bb
Diffs:

#
# mt diff -rdf86a907b6c11b2ec3906d52af214c6d520bc624 -r4fec7547828d90c8b430bc08cb12a80b9091750b
#
#
#
# add_dir "packages/gnuradio/gnuradio-3.1.2"
# 
# add_file "packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch"
#  content [072034ad536d8d56f377a4eaf7757fddbc7f86fc]
# 
# add_file "packages/gnuradio/gnuradio_3.1.2.bb"
#  content [e935ec6d343e8fdb415db8992f198c118b3780af]
# 
# patch "packages/gnuradio/gnuradio.inc"
#  from [3f1b2b5f3c69879f89afcc926dccabf8d0e5d5fe]
#    to [f3784a8b6e3c9fcbccabd3014638b35285a1adba]
# 
# patch "packages/gnuradio/gnuradio_svn.bb"
#  from [60afef07fd78cf20eec7eaec38e79318fa6ec205]
#    to [c208d7c99e0267f8380bd0efe7d3d2bffdfb6247]
#
============================================================
--- packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch	072034ad536d8d56f377a4eaf7757fddbc7f86fc
+++ packages/gnuradio/gnuradio-3.1.2/no-trellis-doc.patch	072034ad536d8d56f377a4eaf7757fddbc7f86fc
@@ -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 
+ 
============================================================
--- packages/gnuradio/gnuradio_3.1.2.bb	e935ec6d343e8fdb415db8992f198c118b3780af
+++ packages/gnuradio/gnuradio_3.1.2.bb	e935ec6d343e8fdb415db8992f198c118b3780af
@@ -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 \
+	   "
+
============================================================
--- packages/gnuradio/gnuradio.inc	3f1b2b5f3c69879f89afcc926dccabf8d0e5d5fe
+++ packages/gnuradio/gnuradio.inc	f3784a8b6e3c9fcbccabd3014638b35285a1adba
@@ -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
============================================================
--- packages/gnuradio/gnuradio_svn.bb	60afef07fd78cf20eec7eaec38e79318fa6ec205
+++ packages/gnuradio/gnuradio_svn.bb	c208d7c99e0267f8380bd0efe7d3d2bffdfb6247
@@ -1,6 +1,6 @@ require gnuradio.inc
 require gnuradio.inc
 
-DEFAULT_PREFERENCE = "1"
+DEFAULT_PREFERENCE = "-1"
 
 PV = "3.0.4+svnr${SRCREV}"
 PR = "r2"