summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-04-22 17:35:09 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-04-22 17:35:09 +0100
commitef5600cf10bc3d2cd2748deb5b532524ad1fa2e1 (patch)
treeb61339072fffed6517a53bb81ee3ebe3d40b1095
parent912a522e2bdb9e4c15efbde89f5915c192247782 (diff)
downloadopenembedded-core-ef5600cf10bc3d2cd2748deb5b532524ad1fa2e1.tar.gz
openembedded-core-ef5600cf10bc3d2cd2748deb5b532524ad1fa2e1.tar.bz2
openembedded-core-ef5600cf10bc3d2cd2748deb5b532524ad1fa2e1.zip
conf/distro/include: Update various versions after recent changes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc6
-rw-r--r--meta/conf/distro/include/poky-floating-revisions.inc2
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc8
3 files changed, 8 insertions, 8 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index f1b26c09e4..97c8da6897 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -33,7 +33,7 @@ SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd"
SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e"
SRCREV_pn-clutter-0.6 ?= "62e852a51e29dd42c84d6b34fe23b80b2542be59"
SRCREV_pn-clutter-0.8 ?= "3ba37ff115ed3fbe6c94195775941091a3ac2b30"
-SRCREV_pn-clutter ?= "4e0073cd508ad55c8d6b6d031f060ae9644620c2"
+SRCREV_pn-clutter ?= "269598a2cfa147b4d8361789356aba8318bde434"
SRCREV_pn-connman ?= "e952851502277cc41cd2a54ef5386cca7a8843dd"
SRCREV_pn-connman-gnome ?= "b589f4f89bff20d54682cc6b49efa86feac8adb4"
SRCREV_pn-dialer ?= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93"
@@ -157,7 +157,7 @@ SRCREV_pn-xserver-xf86-dri-lite ?= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
SRCREV_pn-xserver-xf86-dri2-lite ?= "251d0d8090322b2c9dc0c8b7bef001f338d19433"
SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
-SRCREV_pn-metacity-clutter ?= "69a57bc1e7324dc7b129eafa6b396ba34bc2fe9f"
+SRCREV_pn-mutter ?= "69a57bc1e7324dc7b129eafa6b396ba34bc2fe9f"
SRCREV_pn-dri2proto ?= "8cab3f0e6f551220bd11074779f4ccec1e948e00"
SRCREV_pn-inputproto ?= "7203036522ba9d4b224d282d6afc2d0b947711ee"
SRCREV_pn-inputproto-native ?= "7203036522ba9d4b224d282d6afc2d0b947711ee"
@@ -199,7 +199,7 @@ PREFERRED_VERSION_glib-2.0-native ?= "2.18.1"
PREFERRED_VERSION_atk ?= "1.24.0"
PREFERRED_VERSION_cairo ?= "1.8.2"
PREFERRED_VERSION_pango ?= "1.22.2"
-PREFERRED_VERSION_gtk+ ?= "2.12.7"
+PREFERRED_VERSION_gtk+ ?= "2.14.2"
PREFERRED_VERSION_dbus ?= "1.2.4"
PREFERRED_VERSION_dbus-native ?= "1.2.4"
diff --git a/meta/conf/distro/include/poky-floating-revisions.inc b/meta/conf/distro/include/poky-floating-revisions.inc
index 89e5c7a10a..99907c539c 100644
--- a/meta/conf/distro/include/poky-floating-revisions.inc
+++ b/meta/conf/distro/include/poky-floating-revisions.inc
@@ -56,7 +56,7 @@ SRCREV_pn-table ?= "${AUTOREV}"
SRCREV_pn-libmatchbox ?= "${AUTOREV}"
SRCREV_pn-tasks ?= "${AUTOREV}"
SRCREV_pn-libjana = "${AUTOREV}"
-SRCREV_pn-metacity-clutter = "${AUTOREV}"
+SRCREV_pn-mutter = "${AUTOREV}"
SRCREV_pn-dri2proto = "${AUTOREV}"
#PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}"
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 141d98364e..d076aca26f 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -129,7 +129,7 @@ PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2"
PREFERRED_VERSION_xrandr ?= "1.2.3"
PREFERRED_VERSION_xrdb ?= "1.0.5"
PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.5.99.1+git${SRCREV}"
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6.0"
PREFERRED_VERSION_xset ?= "1.0.4"
PREFERRED_VERSION_xtrans ?= "1.2.2"
PREFERRED_VERSION_xtrans-native ?= "1.2.2"
@@ -137,15 +137,15 @@ PREFERRED_VERSION_xtrans-sdk ?= "1.2.2"
PREFERRED_VERSION_xvinfo ?= "1.0.2"
PREFERRED_VERSION_xwininfo ?= "1.0.4"
PREFERRED_VERSION_mesa-dri ?= "7.4"
-PREFERRED_VERSION_libdrm ?= "2.4.4"
+PREFERRED_VERSION_libdrm ?= "2.4.7"
PREFERRED_VERSION_xcb-proto ?= "1.2"
PREFERRED_VERSION_libxcb ?= "1.1.91"
PREFERRED_VERSION_libxcb-sdk ?= "1.1.91"
PREFERRED_VERSION_libpciaccess ?= "0.10.5"
-PREFERRED_VERSION_xf86-input-evdev ?= "2.1.1"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.2.1"
PREFERRED_VERSION_xf86-input-mouse ?= "1.4.0"
PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.2"
-PREFERRED_VERSION_xf86-input-synaptics ?= "0.99.3"
+PREFERRED_VERSION_xf86-input-synaptics ?= "1.1.0"
PREFERRED_VERSION_xf86-video-intel ?= "2.4.97.0+git${SRCREV}"
PREFERRED_VERSION_xf86-video-intel-dri2 ?= "2.4.97.0+git${SRCREV}"