Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev

6 files changed, 18 insertions, 4 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b12faee8e7..d72c2d50a7 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13078,6 +13078,10 @@ sha256=f4f093e371c999a2a079607b74582a8ef5c1c3c9b322e3e997a47c1ea2afe2a5
 md5=e1206c46a5e276feca11a7149e2fc6ac
 sha256=f4f093e371c999a2a079607b74582a8ef5c1c3c9b322e3e997a47c1ea2afe2a5
 
+[http://downloads.sourceforge.net/lame/lame-398-2.tar.gz]
+md5=719dae0ee675d0c16e0e89952930ed35
+sha256=a17a28569d8ed1e514915c1f12bdf4eedac506e5fbdf9a429ba97d5d42c9af32
+
 [http://lasertraq.googlecode.com/files/lasertraq-0.8-r213.tar.bz2]
 md5=c24cc9ba196b32134186843324bfe784
 sha256=7a2162c783f98a2de9658a217cd0409a7bd16d40040c34a6077df376a2135aea
@@ -25510,6 +25514,10 @@ sha256=edd775e06e66dc775ca8272bbd2e47ac4fef6fcb884ccc1001589343fd9d0866
 md5=ec09b76ca941f5c389d8dd4f469f1fa6
 sha256=a01bcf7718876d96eeb423a58247b89158bf0bc5d2bed414009e5fb83ff76c9e
 
+[http://mirrors.m0k.org/transmission/files/transmission-1.76.tar.bz2]
+md5=ac44511ba4c203998be3079626126ede
+sha256=b221d6ecec0c5ca9908f17ae7d56ce139d317faaa0c106e99fb321130280f151
+
 [http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2]
 md5=3b713239e5e6b269b31cb665563358df
 sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1
@@ -26326,6 +26334,10 @@ sha256=16971189b3cb95648b9574eb7c4c7cc0dff9978458aff7f3f7c54ab823ada721
 md5=7d11fcddb2bd30b9ecbdacfaa20f2769
 sha256=ebb1afbb0a61dd8f5f8ef13512e789697e98d5ad5f98739120f3b3cc02d46d8f
 
+[http://ftp.acc.umu.se/pub/GNOME/sources/vala/0.7/vala-0.7.8.tar.bz2]
+md5=accd0d350c6d6de7527a0a65c40f8be2
+sha256=b2daf636d95ef66ffd5132eacf18335073b71bfaa18f7ad06f25bcf9673aa747
+
 [http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2]
 md5=9407d33961186814cef0e6ecedfd6318
 sha256=7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 1429fa0d65..5f6ef768ad 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -167,6 +167,8 @@ PREFERRED_PROVIDER_bluez-utils-dbus      = "bluez-utils"
 PREFERRED_PROVIDER_bluez-libs            = "bluez4"
 PREFERRED_PROVIDER_bluez-utils           = "bluez4"
 PREFERRED_PROVIDER_util-linux            = "util-linux-ng"
+# The default is too old for linux-libc-headers-2.6.31:
+PREFERRED_VERSION_mplayer                = "0.0+1.0rc2+svnr29789"
 
 ANGSTROM_BLACKLIST_pn-bluez-libs	= "bluez-libs 3.x has been replaced by bluez4"
 ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez-utils 3.x has been replaced by bluez4"
diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
index 10b298c0f0..e116e611ad 100644
--- a/conf/machine/alix.conf
+++ b/conf/machine/alix.conf
@@ -4,7 +4,7 @@
 #
 # http://pcengines.ch/alix1c.htm
 
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
 TARGET_ARCH = "i586"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index f17451556f..dd21c1ecc2 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -2,7 +2,7 @@
 #@NAME: Guinness
 #@DESCRIPTION: Machine configuration for Linux running on a tyan 2462 mainboard (codenamed guinness)
 
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
 TARGET_ARCH = "i686"
 
 PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index 60716f6153..627bbc1c69 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -2,7 +2,7 @@
 #@NAME: Progear
 #@DESCRIPTION: Machine configuration for Progear 1050HX+ webpad
 
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
 TARGET_ARCH = "i586"
 
 require conf/machine/include/tune-pentiummmx.inc
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index 30eb943cc6..5e43102fb3 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -4,7 +4,7 @@
 #@NAME: X86
 #@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines
 
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
 TARGET_ARCH = "i486"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"