summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-01-02 09:23:47 +0100
committerKoen Kooi <koen@openembedded.org>2010-01-02 16:50:47 +0100
commitb7d812a8fa631d0201edfeece0e17e1192267d77 (patch)
treee75b13ba2f92e4b7c070439bd4aaea5dcc6f8480
parent234dff3ab6f902084ea34eec1580da3073fa2657 (diff)
angstrom: update mplayer preferred version
-rw-r--r--conf/distro/angstrom-2008.1.conf3
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc1
2 files changed, 1 insertions, 3 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 01489b036e..85d6f3f48a 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 d61e0e258e..18df733fa1 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"