diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-23 14:37:22 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-07-23 14:37:22 +0400 |
| commit | 922a5b21abe0bb42d1231fd75c9c41dee50f3170 (patch) | |
| tree | a88e16dabc60af7c9459036a0cb2de6f28bc83a0 /conf/distro | |
| parent | 527d3b71c92a047c1388b598892e31767ca341e0 (diff) | |
| parent | 948a769029c5195d6962f9ceb70f57918815bdb0 (diff) | |
Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 4 | ||||
| -rw-r--r-- | conf/distro/chinook-compat.conf | 3 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 3e2705a445..d5e09af068 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -161,8 +161,8 @@ PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" PREFERRED_PROVIDER_bluez-libs = "bluez4" PREFERRED_PROVIDER_bluez-utils = "bluez4" -ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez3 has been replace by bluez4" -ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez3 has been replace by bluez4" +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" # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index 8fefbbce8a..bc42ebc227 100644 --- a/conf/distro/chinook-compat.conf +++ b/conf/distro/chinook-compat.conf @@ -194,6 +194,9 @@ PREFERRED_VERSION_swt3.4-gtk-hildon = "3.4" # Does not build with later versions PREFERRED_VERSION_fakeroot-native = "1.9.6" +# newer Versions needs newer autotools we cant relay on +PREFERRED_VERSION_guile-native = "1.8.2" + # WARNING: If you change these values after the respective package has # been built the change will have no effect. Edit the package's file in # ${STAGING}/pkgdata/runtime then. diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 5bf5b30d4c..6c1963549c 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -13,7 +13,7 @@ PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.16.4" PREFERRED_VERSION_gtkmm = "2.14.1" -PREFERRED_VERSION_hal = "0.5.12" +PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" PREFERRED_VERSION_libsdl-x11 = "1.2.11" @@ -24,7 +24,7 @@ PREFERRED_VERSION_libtool-sdk = "2.2.4" PREFERRED_VERSION_libx11 = "1.2" PREFERRED_VERSION_mesa = "7.2" PREFERRED_VERSION_pango = "1.24.4" -PREFERRED_VERSION_pixman = "0.13.2" +#PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" |