[oe-commits] Koen Kooi : angstrom: update mplayer preferred version

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: b7d812a8fa631d0201edfeece0e17e1192267d77
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b7d812a8fa631d0201edfeece0e17e1192267d77

Author: Koen Kooi <koen at openembedded.org>
Date:   Sat Jan  2 09:23:47 2010 +0100

angstrom: update mplayer preferred version

---

 conf/distro/angstrom-2008.1.conf                   |    3 ---
 .../include/angstrom-2008-preferred-versions.inc   |    1 +
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 01489b0..85d6f3f 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -134,9 +134,6 @@ PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_hotplug               = "udev"
 PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg-nocurl"
 
-# 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/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index d61e0e2..18df733 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -25,6 +25,7 @@ PREFERRED_VERSION_libtool-sdk	= "2.2.6a"
 PREFERRED_VERSION_mesa          = "7.6"
 PREFERRED_VERSION_mesa-dri      = "7.6"
 PREFERRED_VERSION_mesa-xlib     = "7.6"
+PREFERRED_VERSION_mplayer       = "0.0+1.0rc2+svnr30165"
 PREFERRED_VERSION_pango 	= "1.24.4"
 #PREFERRED_VERSION_pixman	= "0.13.2"
 PREFERRED_VERSION_pkgconfig	= "0.23"