diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-02-27 22:05:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-02-27 22:05:11 +0000 |
| commit | 7b7b47957d41e75d51fe9c8bd47d970b6ca8f7c1 (patch) | |
| tree | 7ebebde2b543c829f53d64094691c56ce0ac35c2 /meta/conf | |
| parent | b10bd12a91722b60d63c310561279372e6871fa1 (diff) | |
| download | openembedded-core-7b7b47957d41e75d51fe9c8bd47d970b6ca8f7c1.tar.gz openembedded-core-7b7b47957d41e75d51fe9c8bd47d970b6ca8f7c1.tar.bz2 openembedded-core-7b7b47957d41e75d51fe9c8bd47d970b6ca8f7c1.zip | |
Various version cleanups
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1297 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/distro/include/preferred-xorg-versions.inc | 10 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 23 |
2 files changed, 10 insertions, 23 deletions
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 1a28a3f3b4..8ff64dbbed 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -3,7 +3,7 @@ PREFERRED_VERSION_bigreqsproto = "X11R7.0-1.0.2" PREFERRED_VERSION_bigreqsproto-native = "X11R7.0-1.0.2" PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1" PREFERRED_VERSION_damageproto = "X11R7.0-1.0.3" -PREFERRED_VERSION_diet-x11 = "X11R7.1-1.0.1" +PREFERRED_VERSION_diet-x11 = "X11R7.1-1.1.1" PREFERRED_VERSION_dmxproto = "X11R7.0-2.2.2" PREFERRED_VERSION_evieext = "X11R7.0-1.0.2" PREFERRED_VERSION_fixesproto = "X11R7.1-4.0" @@ -14,7 +14,7 @@ PREFERRED_VERSION_fontsproto-native = "X11R7.0-2.0.2" PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2" PREFERRED_VERSION_glproto = "X11R7.1-1.4.7" PREFERRED_VERSION_imake = "X11R7.1-1.0.2" -PREFERRED_VERSION_inputproto = "X11R7.0-1.3.2" +PREFERRED_VERSION_inputproto = "X11R7.1-1.4" PREFERRED_VERSION_inputproto-native = "X11R7.0-1.3.2" PREFERRED_VERSION_kbproto = "X11R7.1-1.0.3" PREFERRED_VERSION_kbproto-native = "X11R7.0-1.0.2" @@ -28,7 +28,7 @@ PREFERRED_VERSION_liblbxutil = "X11R7.1-1.0.1" PREFERRED_VERSION_liboldx = "X11R7.0-1.0.1" PREFERRED_VERSION_libsm = "X11R7.1-1.0.1" PREFERRED_VERSION_libwindowswm = "X11R7.0-1.0.0" -PREFERRED_VERSION_libx11 = "X11R7.1-1.0.1" +PREFERRED_VERSION_libx11 = "X11R7.1-1.1.1" PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1" PREFERRED_VERSION_libxau = "X11R7.1-1.0.1" PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1" @@ -76,7 +76,7 @@ PREFERRED_VERSION_renderproto = "X11R7.0-0.9.2" PREFERRED_VERSION_resourceproto = "X11R7.0-1.0.2" PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0" PREFERRED_VERSION_trapproto = "X11R7.0-3.4.3" -PREFERRED_VERSION_util-macros = "X11R7.1-1.0.2" +PREFERRED_VERSION_util-macros = "X11R7.1-1.1.5" PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2" PREFERRED_VERSION_videoproto = "X11R7.0-2.2.2" PREFERRED_VERSION_windowswmproto = "X11R7.0-1.0.3" @@ -97,7 +97,7 @@ PREFERRED_VERSION_xhost = "X11R7.1-1.0.1" PREFERRED_VERSION_xineramaproto = "X11R7.0-1.1.2" PREFERRED_VERSION_xmodmap = "X11R7.1-1.0.1" PREFERRED_VERSION_xorg-cf-files = "X11R7.1-1.0.2" -PREFERRED_VERSION_xproto = "X11R7.1-7.0.5" +PREFERRED_VERSION_xproto = "X11R7.1-7.0.8" PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5" PREFERRED_VERSION_xproxymanagementprotocol = "X11R7.0-1.0.2" PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2" diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index cc775022d0..d8e479f8c4 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -57,10 +57,11 @@ PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive PREFERRED_PROVIDER_virtual/update-alternatives ?= update-alternatives-cworth PREFERRED_PROVIDER_virtual/update-alternatives-native ?= update-alternatives-cworth-native +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" # Others: -PREFERRED_PROVIDER_libx11 ?= "diet-x11" PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" +PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -96,34 +97,20 @@ SRCDATE_matchbox-wm ?= "20061223" SRCDATE_libmatchbox ?= "20060729" SRCDATE_settings-daemon ?= "20070104" SRCDATE_screenshot ?= "20070125" -SRCDATE_tslib ?= "20051101" -SRCDATE_libxext ?= "20051101" -SRCDATE_renderext ?= "20051101" -SRCDATE_libxrender ?= "20051101" -SRCDATE_fixesext ?= "20051101" -SRCDATE_damageext ?= "20051101" -SRCDATE_compositeext ?= "20051101" SRCDATE_xcalibrateext ?= "20051101" -SRCDATE_recordext ?= "20051101" SRCDATE_libfakekey ?= "20051101" -SRCDATE_xmodmap ?= "20051101" -SRCDATE_libxrandr ?= "20051101" -SRCDATE_libxtst ?= "20051101" SRCDATE_xcalibrate ?= "20060312" -SRCDATE_libxmu ?= "20051115" -SRCDATE_xdpyinfo ?= "20051115" -SRCDATE_xauth ?= "20060120" -SRCDATE_xserver-kdrive = "20050207" SRCDATE_qemu ?= "20060723" SRCDATE_qemu-native ?= "20060723" SRCDATE_oprofile ?= "20070106" -SRCDATE_zaurusd ?= "20060729" -SRCDATE_owl-video-widget ?= "20060925" +SRCDATE_zaurusd ?= "20070201" +SRCDATE_owl-video-widget ?= "20070201" SRCDATE_psplash ?= "20061223" SRCDATE_maemo-mapper-nohildon ?= "20061114" SRCDATE_exmap-console = "20061220" SRCDATE_gtk-sato-engine = "20070203" SRCDATE_matchbox-theme-sato = "20061225" +SRCDATE_tasks = "20070228" SRCDATE_sato-icon-theme = "20070227" # |