diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-02 17:00:07 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-02 17:00:07 +0100 |
| commit | c498cc5981b1cc3c9a2c224dea688ca0995f9780 (patch) | |
| tree | ff86489687439880c59e4e7979dc2914ea9e0a5e /conf/distro | |
| parent | b028448b8add42f9bfdb87e71ec1c2679f5c4646 (diff) | |
| parent | 3a3cfc7e061bca6e83850e52082aaf6c26e1a2e2 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 3 | ||||
| -rw-r--r-- | conf/distro/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 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" |