From de44ac88937411ae6d49e39b88cf0d952720861f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 17 Jan 2009 15:21:22 +0000 Subject: [PATCH] conf/distro/include: Update PREFERRED_VERSIONS after various recent changes --- .../distro/include/poky-fixed-revisions.inc | 8 +++---- .../include/poky-floating-revisions.inc | 19 +++++++++++++++ .../include/preferred-xorg-versions.inc | 24 +++++++++---------- 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index 92fb6ddc28..772525ce94 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc @@ -200,10 +200,10 @@ PREFERRED_VERSION_cairo ?= "1.8.2" PREFERRED_VERSION_pango ?= "1.22.2" PREFERRED_VERSION_gtk+ ?= "2.12.7" -PREFERRED_VERSION_dbus ?= "1.1.20" -PREFERRED_VERSION_dbus-native ?= "1.1.20" -PREFERRED_VERSION_dbus-glib ?= "0.76" -PREFERRED_VERSION_dbus-glib-native ?= "0.76" +PREFERRED_VERSION_dbus ?= "1.2.4" +PREFERRED_VERSION_dbus-native ?= "1.2.4" +PREFERRED_VERSION_dbus-glib ?= "0.78" +PREFERRED_VERSION_dbus-glib-native ?= "0.78" PREFERRED_VERSION_gnome-vfs ?= "2.22.0" PREFERRED_VERSION_libgnomecanvas ?= "2.20.0" PREFERRED_VERSION_gnome-keyring ?= "2.20" diff --git a/meta/conf/distro/include/poky-floating-revisions.inc b/meta/conf/distro/include/poky-floating-revisions.inc index 4694d99e0b..958bc693dd 100644 --- a/meta/conf/distro/include/poky-floating-revisions.inc +++ b/meta/conf/distro/include/poky-floating-revisions.inc @@ -58,6 +58,25 @@ SRCREV_pn-tasks ?= "${AUTOREV}" SRCREV_pn-libjana = "${AUTOREV}" SRCREV_pn-metacity-clutter = "${AUTOREV}" +SRCREV_pn-dri2proto = "${AUTOREV}" +PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}" +SRCREV_pn-libdrm = "${AUTOREV}" +PREFERRED_VERSION_libdrm ?= "2.4.0+git${SRCREV}" +SRCREV_pn-libxcb = "${AUTOREV}" +PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr${SRCREV}" +SRCREV_pn-lib-proto = "${AUTOREV}" +PREFERRED_VERSION_xcb-proto ?= "1.2+gitr${SRCREV}" +SRCREV_pn-libxcb-sdk = "${AUTOREV}" +PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr${SRCREV}" +SRCREV_pn-xf86-input-evdev = "${AUTOREV}" +PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" +SRCREV_pn-xf86-input-mouse = "${AUTOREV}" +PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git${SRCREV}" +SRCREV_pn-xf86-input-keyboard = "${AUTOREV}" +PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git${SRCREV}" +SRCREV_pn-xf86-input-synaptics = "${AUTOREV}" +PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git${SRCREV}" + #SRCDATE_oprofile ?= "${DATE}" PREFERRED_VERSION_oprofile ?= "0.9.4+cvs${SRCDATE_oprofile}" diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 157c2d9e69..f50f2b19a7 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -66,8 +66,8 @@ PREFERRED_VERSION_libxp ?= "1.0.0" PREFERRED_VERSION_libxpm ?= "3.5.7" PREFERRED_VERSION_libxprintapputil ?= "1.0.1" PREFERRED_VERSION_libxprintutil ?= "1.0.1" -PREFERRED_VERSION_libxrandr ?= "1.2.3" -PREFERRED_VERSION_libxrandr-sdk ?= "1.2.3" +PREFERRED_VERSION_libxrandr ?= "1.2.99.4" +PREFERRED_VERSION_libxrandr-sdk ?= "1.2.99.4" PREFERRED_VERSION_libxrender ?= "0.9.4" PREFERRED_VERSION_libxrender-sdk ?= "0.9.4" PREFERRED_VERSION_libxres ?= "1.0.3" @@ -85,7 +85,7 @@ PREFERRED_VERSION_makedepend ?= "1.0.1" PREFERRED_VERSION_makedepend-native ?= "1.0.1" PREFERRED_VERSION_pixman ?= "0.13.2" PREFERRED_VERSION_printproto ?= "1.0.4" -PREFERRED_VERSION_randrproto ?= "1.2.2" +PREFERRED_VERSION_randrproto ?= "1.2.99.3" PREFERRED_VERSION_randrproto-sdk ?= "1.2.2" PREFERRED_VERSION_recordproto ?= "1.13.2" PREFERRED_VERSION_renderproto ?= "0.9.3" @@ -112,7 +112,7 @@ PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2" PREFERRED_VERSION_xf86bigfontproto-sdk ?= "1.1.2" PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" PREFERRED_VERSION_xf86driproto ?= "2.0.4" -PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}" +PREFERRED_VERSION_dri2proto ?= "1.99.3" PREFERRED_VERSION_xf86miscproto ?= "0.9.2" PREFERRED_VERSION_xf86rushproto ?= "1.1.2" PREFERRED_VERSION_xf86vidmodeproto ?= "2.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.3.0+git${SRCREV}" -PREFERRED_VERSION_libdrm ?= "2.4.0+git${SRCREV}" -PREFERRED_VERSION_xcb-proto ?= "1.2+gitr${SRCREV}" -PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr${SRCREV}" -PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr${SRCREV}" +PREFERRED_VERSION_libdrm ?= "2.4.4" +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.0.4" -PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git${SRCREV}" -PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git${SRCREV}" -PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git${SRCREV}" +PREFERRED_VERSION_xf86-input-evdev ?= "2.1.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-video-intel ?= "2.4.97.0+git${SRCREV}" PREFERRED_VERSION_xf86-video-intel-dri2 ?= "2.4.97.0+git${SRCREV}"