summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-17 15:21:22 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-17 15:21:22 +0000
commitde44ac88937411ae6d49e39b88cf0d952720861f (patch)
tree66cd30182dd8a0b2c76a8c57b1ad95e95bf1a7b4 /meta
parent2db29599357d0df5fde1cf99a3bd412989b7d71e (diff)
downloadpoky-de44ac88937411ae6d49e39b88cf0d952720861f.tar.gz
conf/distro/include: Update PREFERRED_VERSIONS after various recent changes
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc8
-rw-r--r--meta/conf/distro/include/poky-floating-revisions.inc19
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc24
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"
200PREFERRED_VERSION_pango ?= "1.22.2" 200PREFERRED_VERSION_pango ?= "1.22.2"
201PREFERRED_VERSION_gtk+ ?= "2.12.7" 201PREFERRED_VERSION_gtk+ ?= "2.12.7"
202 202
203PREFERRED_VERSION_dbus ?= "1.1.20" 203PREFERRED_VERSION_dbus ?= "1.2.4"
204PREFERRED_VERSION_dbus-native ?= "1.1.20" 204PREFERRED_VERSION_dbus-native ?= "1.2.4"
205PREFERRED_VERSION_dbus-glib ?= "0.76" 205PREFERRED_VERSION_dbus-glib ?= "0.78"
206PREFERRED_VERSION_dbus-glib-native ?= "0.76" 206PREFERRED_VERSION_dbus-glib-native ?= "0.78"
207PREFERRED_VERSION_gnome-vfs ?= "2.22.0" 207PREFERRED_VERSION_gnome-vfs ?= "2.22.0"
208PREFERRED_VERSION_libgnomecanvas ?= "2.20.0" 208PREFERRED_VERSION_libgnomecanvas ?= "2.20.0"
209PREFERRED_VERSION_gnome-keyring ?= "2.20" 209PREFERRED_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}"
58SRCREV_pn-libjana = "${AUTOREV}" 58SRCREV_pn-libjana = "${AUTOREV}"
59SRCREV_pn-metacity-clutter = "${AUTOREV}" 59SRCREV_pn-metacity-clutter = "${AUTOREV}"
60 60
61SRCREV_pn-dri2proto = "${AUTOREV}"
62PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}"
63SRCREV_pn-libdrm = "${AUTOREV}"
64PREFERRED_VERSION_libdrm ?= "2.4.0+git${SRCREV}"
65SRCREV_pn-libxcb = "${AUTOREV}"
66PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr${SRCREV}"
67SRCREV_pn-lib-proto = "${AUTOREV}"
68PREFERRED_VERSION_xcb-proto ?= "1.2+gitr${SRCREV}"
69SRCREV_pn-libxcb-sdk = "${AUTOREV}"
70PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr${SRCREV}"
71SRCREV_pn-xf86-input-evdev = "${AUTOREV}"
72PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
73SRCREV_pn-xf86-input-mouse = "${AUTOREV}"
74PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git${SRCREV}"
75SRCREV_pn-xf86-input-keyboard = "${AUTOREV}"
76PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git${SRCREV}"
77SRCREV_pn-xf86-input-synaptics = "${AUTOREV}"
78PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git${SRCREV}"
79
61#SRCDATE_oprofile ?= "${DATE}" 80#SRCDATE_oprofile ?= "${DATE}"
62 81
63PREFERRED_VERSION_oprofile ?= "0.9.4+cvs${SRCDATE_oprofile}" 82PREFERRED_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"
66PREFERRED_VERSION_libxpm ?= "3.5.7" 66PREFERRED_VERSION_libxpm ?= "3.5.7"
67PREFERRED_VERSION_libxprintapputil ?= "1.0.1" 67PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
68PREFERRED_VERSION_libxprintutil ?= "1.0.1" 68PREFERRED_VERSION_libxprintutil ?= "1.0.1"
69PREFERRED_VERSION_libxrandr ?= "1.2.3" 69PREFERRED_VERSION_libxrandr ?= "1.2.99.4"
70PREFERRED_VERSION_libxrandr-sdk ?= "1.2.3" 70PREFERRED_VERSION_libxrandr-sdk ?= "1.2.99.4"
71PREFERRED_VERSION_libxrender ?= "0.9.4" 71PREFERRED_VERSION_libxrender ?= "0.9.4"
72PREFERRED_VERSION_libxrender-sdk ?= "0.9.4" 72PREFERRED_VERSION_libxrender-sdk ?= "0.9.4"
73PREFERRED_VERSION_libxres ?= "1.0.3" 73PREFERRED_VERSION_libxres ?= "1.0.3"
@@ -85,7 +85,7 @@ PREFERRED_VERSION_makedepend ?= "1.0.1"
85PREFERRED_VERSION_makedepend-native ?= "1.0.1" 85PREFERRED_VERSION_makedepend-native ?= "1.0.1"
86PREFERRED_VERSION_pixman ?= "0.13.2" 86PREFERRED_VERSION_pixman ?= "0.13.2"
87PREFERRED_VERSION_printproto ?= "1.0.4" 87PREFERRED_VERSION_printproto ?= "1.0.4"
88PREFERRED_VERSION_randrproto ?= "1.2.2" 88PREFERRED_VERSION_randrproto ?= "1.2.99.3"
89PREFERRED_VERSION_randrproto-sdk ?= "1.2.2" 89PREFERRED_VERSION_randrproto-sdk ?= "1.2.2"
90PREFERRED_VERSION_recordproto ?= "1.13.2" 90PREFERRED_VERSION_recordproto ?= "1.13.2"
91PREFERRED_VERSION_renderproto ?= "0.9.3" 91PREFERRED_VERSION_renderproto ?= "0.9.3"
@@ -112,7 +112,7 @@ PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2"
112PREFERRED_VERSION_xf86bigfontproto-sdk ?= "1.1.2" 112PREFERRED_VERSION_xf86bigfontproto-sdk ?= "1.1.2"
113PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" 113PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
114PREFERRED_VERSION_xf86driproto ?= "2.0.4" 114PREFERRED_VERSION_xf86driproto ?= "2.0.4"
115PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}" 115PREFERRED_VERSION_dri2proto ?= "1.99.3"
116PREFERRED_VERSION_xf86miscproto ?= "0.9.2" 116PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
117PREFERRED_VERSION_xf86rushproto ?= "1.1.2" 117PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
118PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2" 118PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
@@ -137,15 +137,15 @@ PREFERRED_VERSION_xtrans-sdk ?= "1.2.2"
137PREFERRED_VERSION_xvinfo ?= "1.0.2" 137PREFERRED_VERSION_xvinfo ?= "1.0.2"
138PREFERRED_VERSION_xwininfo ?= "1.0.4" 138PREFERRED_VERSION_xwininfo ?= "1.0.4"
139PREFERRED_VERSION_mesa-dri ?= "7.3.0+git${SRCREV}" 139PREFERRED_VERSION_mesa-dri ?= "7.3.0+git${SRCREV}"
140PREFERRED_VERSION_libdrm ?= "2.4.0+git${SRCREV}" 140PREFERRED_VERSION_libdrm ?= "2.4.4"
141PREFERRED_VERSION_xcb-proto ?= "1.2+gitr${SRCREV}" 141PREFERRED_VERSION_xcb-proto ?= "1.2"
142PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr${SRCREV}" 142PREFERRED_VERSION_libxcb ?= "1.1.91"
143PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr${SRCREV}" 143PREFERRED_VERSION_libxcb-sdk ?= "1.1.91"
144PREFERRED_VERSION_libpciaccess ?= "0.10.5" 144PREFERRED_VERSION_libpciaccess ?= "0.10.5"
145PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" 145PREFERRED_VERSION_xf86-input-evdev ?= "2.1.1"
146PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git${SRCREV}" 146PREFERRED_VERSION_xf86-input-mouse ?= "1.4.0"
147PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git${SRCREV}" 147PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.2"
148PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git${SRCREV}" 148PREFERRED_VERSION_xf86-input-synaptics ?= "0.99.3"
149PREFERRED_VERSION_xf86-video-intel ?= "2.4.97.0+git${SRCREV}" 149PREFERRED_VERSION_xf86-video-intel ?= "2.4.97.0+git${SRCREV}"
150PREFERRED_VERSION_xf86-video-intel-dri2 ?= "2.4.97.0+git${SRCREV}" 150PREFERRED_VERSION_xf86-video-intel-dri2 ?= "2.4.97.0+git${SRCREV}"
151 151