[oe-commits] org.oe.dev merge of '09c9ae46a929db4ad083caeb38025cd7068a7668'

[oe commit]

merge of '09c9ae46a929db4ad083caeb38025cd7068a7668'
     and 'b5af291fa9dc074af84727684ddae1efa9c1be0d'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: f0ec62cadbae3343a8a86690d39fcf38edf159d9
ViewMTN: http://monotone.openembedded.org/revision/info/f0ec62cadbae3343a8a86690d39fcf38edf159d9
Files:
1
packages/gnuradio/gnuradio.inc
packages/gnuradio/gnuradio_3.0.4.bb
packages/gnuradio/gnuradio_3.1.2.bb
packages/gnuradio/gnuradio_svn.bb
packages/hostap/hostap-daemon_0.3.7.bb
packages/hostap/hostap-modules_0.3.10.bb
packages/hostap/hostap-modules_0.3.7.bb
packages/hostap/hostap-modules_0.3.9.bb
packages/hostap/hostap-utils_0.3.7.bb
packages/madwifi/madwifi-ng_r.inc
Diffs:

#
# mt diff -r09c9ae46a929db4ad083caeb38025cd7068a7668 -rf0ec62cadbae3343a8a86690d39fcf38edf159d9
#
#
#
# patch "packages/gnuradio/gnuradio.inc"
#  from [f3784a8b6e3c9fcbccabd3014638b35285a1adba]
#    to [2b1aa21c076bc1d46a68628c02898068873279c0]
# 
# patch "packages/gnuradio/gnuradio_3.0.4.bb"
#  from [e935ec6d343e8fdb415db8992f198c118b3780af]
#    to [9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338]
# 
# patch "packages/gnuradio/gnuradio_3.1.2.bb"
#  from [e935ec6d343e8fdb415db8992f198c118b3780af]
#    to [9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338]
# 
# patch "packages/gnuradio/gnuradio_svn.bb"
#  from [c208d7c99e0267f8380bd0efe7d3d2bffdfb6247]
#    to [351ac3dd01f04c457e29330a4098d8cf3271cb1e]
#
============================================================
--- packages/gnuradio/gnuradio.inc	f3784a8b6e3c9fcbccabd3014638b35285a1adba
+++ packages/gnuradio/gnuradio.inc	2b1aa21c076bc1d46a68628c02898068873279c0
@@ -4,7 +4,7 @@ DEPENDS = " guile-native fftwf python li
 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_${PN} = "python-core python-audio python-threading python-codecs python-lang python-textutils"
 RDEPENDS_gnuradio-usrp = "python-core"
 
 inherit autotools pkgconfig
============================================================
--- packages/gnuradio/gnuradio_3.0.4.bb	e935ec6d343e8fdb415db8992f198c118b3780af
+++ packages/gnuradio/gnuradio_3.0.4.bb	9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338
@@ -1,6 +1,6 @@ require gnuradio.inc
 require gnuradio.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
 	   file://no-trellis-doc.patch;patch=1 \
============================================================
--- packages/gnuradio/gnuradio_3.1.2.bb	e935ec6d343e8fdb415db8992f198c118b3780af
+++ packages/gnuradio/gnuradio_3.1.2.bb	9f16e9d9d4673c6cb75c8bb01e3dfea2cb2da338
@@ -1,6 +1,6 @@ require gnuradio.inc
 require gnuradio.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
 	   file://no-trellis-doc.patch;patch=1 \
============================================================
--- packages/gnuradio/gnuradio_svn.bb	c208d7c99e0267f8380bd0efe7d3d2bffdfb6247
+++ packages/gnuradio/gnuradio_svn.bb	351ac3dd01f04c457e29330a4098d8cf3271cb1e
@@ -3,7 +3,7 @@ PV = "3.0.4+svnr${SRCREV}"
 DEFAULT_PREFERENCE = "-1"
 
 PV = "3.0.4+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \
 	   file://no-trellis-doc.patch;patch=1 \


#
# mt diff -rb5af291fa9dc074af84727684ddae1efa9c1be0d -rf0ec62cadbae3343a8a86690d39fcf38edf159d9
#
#
#
# delete "packages/hostap/hostap-daemon_0.3.7.bb"
# 
# delete "packages/hostap/hostap-modules_0.3.10.bb"
# 
# delete "packages/hostap/hostap-modules_0.3.7.bb"
# 
# delete "packages/hostap/hostap-modules_0.3.9.bb"
# 
# delete "packages/hostap/hostap-utils_0.3.7.bb"
# 
# patch "packages/madwifi/madwifi-ng_r.inc"
#  from [7aa1e42dc113764feb73fa14b6553a8b16aac0c1]
#    to [02bfd781ccdec369d0463597c718b93071e28e85]
#
============================================================
--- packages/madwifi/madwifi-ng_r.inc	7aa1e42dc113764feb73fa14b6553a8b16aac0c1
+++ packages/madwifi/madwifi-ng_r.inc	02bfd781ccdec369d0463597c718b93071e28e85
@@ -10,7 +10,7 @@ WACKELF_SRC_URI_compulab-pxa270 = " file
 WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch;patch=1"
 WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf.patch;patch=1"
 
-SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \
+SRC_URI = "http://snapshots.madwifi.org/madwifi-trunk/${PN}-${PV}.tar.gz \
 	   file://10-xscale-be-elf-copts.patch;patch=1 \
 	   file://10-xscale-le-elf-copts.patch;patch=1 \
            file://10-sh4-le-elf-copts.patch;patch=1 \