summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc6
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc42
2 files changed, 24 insertions, 24 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index a056c9678e..e835e66e46 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -195,9 +195,9 @@ PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
195 195
196PREFERRED_VERSION_glib-2.0 ?= "2.18.1" 196PREFERRED_VERSION_glib-2.0 ?= "2.18.1"
197PREFERRED_VERSION_glib-2.0-native ?= "2.18.1" 197PREFERRED_VERSION_glib-2.0-native ?= "2.18.1"
198PREFERRED_VERSION_atk ?= "1.20.0" 198PREFERRED_VERSION_atk ?= "1.24.0"
199PREFERRED_VERSION_cairo ?= "1.6.4" 199PREFERRED_VERSION_cairo ?= "1.8.2"
200PREFERRED_VERSION_pango ?= "1.18.3" 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.1.20"
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 2bec394f4c..e3e2cad384 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -28,21 +28,21 @@ PREFERRED_VERSION_libapplewm ?= "1.0.0"
28PREFERRED_VERSION_libdmx ?= "1.0.2" 28PREFERRED_VERSION_libdmx ?= "1.0.2"
29PREFERRED_VERSION_libfontenc ?= "1.0.4" 29PREFERRED_VERSION_libfontenc ?= "1.0.4"
30PREFERRED_VERSION_libfontenc-native ?= "1.0.4" 30PREFERRED_VERSION_libfontenc-native ?= "1.0.4"
31PREFERRED_VERSION_libfs ?= "1.0.0" 31PREFERRED_VERSION_libfs ?= "1.0.1"
32PREFERRED_VERSION_libice ?= "1.0.4" 32PREFERRED_VERSION_libice ?= "1.0.4"
33PREFERRED_VERSION_liblbxutil ?= "1.0.1" 33PREFERRED_VERSION_liblbxutil ?= "1.0.1"
34PREFERRED_VERSION_liboldx ?= "1.0.1" 34PREFERRED_VERSION_liboldx ?= "1.0.1"
35PREFERRED_VERSION_libsm ?= "1.0.3" 35PREFERRED_VERSION_libsm ?= "1.1.0"
36PREFERRED_VERSION_libwindowswm ?= "1.0.0" 36PREFERRED_VERSION_libwindowswm ?= "1.0.0"
37PREFERRED_VERSION_libx11 ?= "1.1.99.1+gitr${SRCREV}" 37PREFERRED_VERSION_libx11 ?= "1.1.99.1+gitr${SRCREV}"
38PREFERRED_VERSION_libx11-diet ?= "1.1.99.1+gitr${SRCREV}" 38PREFERRED_VERSION_libx11-diet ?= "1.1.99.1+gitr${SRCREV}"
39PREFERRED_VERSION_libx11-native ?= "1.1.99.1+gitr${SRCREV}" 39PREFERRED_VERSION_libx11-native ?= "1.1.5"
40PREFERRED_VERSION_libx11-sdk ?= "1.1.99.1+gitr${SRCREV}" 40PREFERRED_VERSION_libx11-sdk ?= "1.1.99.1+gitr${SRCREV}"
41PREFERRED_VERSION_libx11-trim ?= "1.1.99.1+gitr${SRCREV}" 41PREFERRED_VERSION_libx11-trim ?= "1.1.99.1+gitr${SRCREV}"
42PREFERRED_VERSION_libxau ?= "1.0.4" 42PREFERRED_VERSION_libxau ?= "1.0.4"
43PREFERRED_VERSION_libxau-native ?= "1.0.3" 43PREFERRED_VERSION_libxau-native ?= "1.0.4"
44PREFERRED_VERSION_libxau-sdk ?= "1.0.3" 44PREFERRED_VERSION_libxau-sdk ?= "1.0.4"
45PREFERRED_VERSION_libxaw ?= "1.0.4" 45PREFERRED_VERSION_libxaw ?= "1.0.5"
46PREFERRED_VERSION_libxcomposite ?= "0.4.0" 46PREFERRED_VERSION_libxcomposite ?= "0.4.0"
47PREFERRED_VERSION_libxcursor ?= "1.1.9" 47PREFERRED_VERSION_libxcursor ?= "1.1.9"
48PREFERRED_VERSION_libxdamage ?= "1.1.1" 48PREFERRED_VERSION_libxdamage ?= "1.1.1"
@@ -51,12 +51,12 @@ PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
51PREFERRED_VERSION_libxdmcp-sdk ?= "1.0.2" 51PREFERRED_VERSION_libxdmcp-sdk ?= "1.0.2"
52PREFERRED_VERSION_libxevie ?= "1.0.2" 52PREFERRED_VERSION_libxevie ?= "1.0.2"
53PREFERRED_VERSION_libxext ?= "1.0.99.1+gitr${SRCREV}" 53PREFERRED_VERSION_libxext ?= "1.0.99.1+gitr${SRCREV}"
54PREFERRED_VERSION_libxext-sdk ?= "1.0.99.1+gitr${SRCREV}"" 54PREFERRED_VERSION_libxext-sdk ?= "1.0.99.1+gitr${SRCREV}"
55PREFERRED_VERSION_libxfixes ?= "4.0.3" 55PREFERRED_VERSION_libxfixes ?= "4.0.3"
56PREFERRED_VERSION_libxfont ?= "1.3.3" 56PREFERRED_VERSION_libxfont ?= "1.3.4"
57PREFERRED_VERSION_libxfont-native ?= "1.3.2" 57PREFERRED_VERSION_libxfont-native ?= "1.3.4"
58PREFERRED_VERSION_libxfontcache ?= "1.0.4" 58PREFERRED_VERSION_libxfontcache ?= "1.0.4"
59PREFERRED_VERSION_libxft ?= "2.1.12" 59PREFERRED_VERSION_libxft ?= "2.1.13"
60PREFERRED_VERSION_libxi ?= "1.9.99.5+gitr${SRCREV}" 60PREFERRED_VERSION_libxi ?= "1.9.99.5+gitr${SRCREV}"
61PREFERRED_VERSION_libxinerama ?= "1.0.3" 61PREFERRED_VERSION_libxinerama ?= "1.0.3"
62PREFERRED_VERSION_libxkbfile ?= "1.0.5" 62PREFERRED_VERSION_libxkbfile ?= "1.0.5"
@@ -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.2" 69PREFERRED_VERSION_libxrandr ?= "1.2.3"
70PREFERRED_VERSION_libxrandr-sdk ?= "1.2.2" 70PREFERRED_VERSION_libxrandr-sdk ?= "1.2.3"
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"
@@ -79,11 +79,11 @@ PREFERRED_VERSION_libxv ?= "1.0.4"
79PREFERRED_VERSION_libxvmc ?= "1.0.4" 79PREFERRED_VERSION_libxvmc ?= "1.0.4"
80PREFERRED_VERSION_libxxf86dga ?= "1.0.2" 80PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
81PREFERRED_VERSION_libxxf86misc ?= "1.0.1" 81PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
82PREFERRED_VERSION_libxxf86vm ?= "1.0.1" 82PREFERRED_VERSION_libxxf86vm ?= "1.0.2"
83PREFERRED_VERSION_lndir ?= "1.0.1" 83PREFERRED_VERSION_lndir ?= "1.0.1"
84PREFERRED_VERSION_makedepend ?= "1.0.1" 84PREFERRED_VERSION_makedepend ?= "1.0.1"
85PREFERRED_VERSION_makedepend-native ?= "1.0.1" 85PREFERRED_VERSION_makedepend-native ?= "1.0.1"
86PREFERRED_VERSION_pixman ?= "0.10.0" 86PREFERRED_VERSION_pixman ?= "0.13.2"
87PREFERRED_VERSION_printproto ?= "1.0.4" 87PREFERRED_VERSION_printproto ?= "1.0.4"
88PREFERRED_VERSION_randrproto ?= "1.2.1" 88PREFERRED_VERSION_randrproto ?= "1.2.1"
89PREFERRED_VERSION_randrproto-sdk ?= "1.2.1" 89PREFERRED_VERSION_randrproto-sdk ?= "1.2.1"
@@ -93,8 +93,8 @@ PREFERRED_VERSION_renderproto-sdk ?= "0.9.3"
93PREFERRED_VERSION_resourceproto ?= "1.0.2" 93PREFERRED_VERSION_resourceproto ?= "1.0.2"
94PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" 94PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
95PREFERRED_VERSION_trapproto ?= "3.4.3" 95PREFERRED_VERSION_trapproto ?= "3.4.3"
96PREFERRED_VERSION_util-macros ?= "1.1.6" 96PREFERRED_VERSION_util-macros ?= "1.2.1"
97PREFERRED_VERSION_util-macros-native ?= "1.1.6" 97PREFERRED_VERSION_util-macros-native ?= "1.2.1"
98PREFERRED_VERSION_videoproto ?= "2.2.2" 98PREFERRED_VERSION_videoproto ?= "2.2.2"
99PREFERRED_VERSION_windowswmproto ?= "1.0.3" 99PREFERRED_VERSION_windowswmproto ?= "1.0.3"
100PREFERRED_VERSION_x11perf ?= "1.5" 100PREFERRED_VERSION_x11perf ?= "1.5"
@@ -117,7 +117,7 @@ PREFERRED_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"
119PREFERRED_VERSION_xhost ?= "1.0.2" 119PREFERRED_VERSION_xhost ?= "1.0.2"
120PREFERRED_VERSION_xinit ?= "1.0.8" 120PREFERRED_VERSION_xinit ?= "1.1.1"
121PREFERRED_VERSION_xineramaproto ?= "1.1.2" 121PREFERRED_VERSION_xineramaproto ?= "1.1.2"
122PREFERRED_VERSION_xmodmap ?= "1.0.3" 122PREFERRED_VERSION_xmodmap ?= "1.0.3"
123PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" 123PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
@@ -132,16 +132,16 @@ PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0"
132PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.5.99.1+git${SRCREV}" 132PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.5.99.1+git${SRCREV}"
133PREFERRED_VERSION_xset ?= "1.0.4" 133PREFERRED_VERSION_xset ?= "1.0.4"
134PREFERRED_VERSION_xtrans ?= "1.2.2" 134PREFERRED_VERSION_xtrans ?= "1.2.2"
135PREFERRED_VERSION_xtrans-native ?= "1.0.4" 135PREFERRED_VERSION_xtrans-native ?= "1.2.2"
136PREFERRED_VERSION_xtrans-sdk ?= "1.0.4" 136PREFERRED_VERSION_xtrans-sdk ?= "1.2.2"
137PREFERRED_VERSION_xvinfo ?= "1.0.2" 137PREFERRED_VERSION_xvinfo ?= "1.0.2"
138PREFERRED_VERSION_xwininfo ?= "1.0.3" 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.0+git${SRCREV}"
141PREFERRED_VERSION_xcb-proto ?= "1.2+gitr${SRCREV}" 141PREFERRED_VERSION_xcb-proto ?= "1.2+gitr${SRCREV}"
142PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr${SRCREV}" 142PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr${SRCREV}"
143PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr${SRCREV}" 143PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr${SRCREV}"
144PREFERRED_VERSION_libpciaccess ?= "0.10.3" 144PREFERRED_VERSION_libpciaccess ?= "0.10.5"
145PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" 145PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
146PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git${SRCREV}" 146PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git${SRCREV}"
147PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git${SRCREV}" 147PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git${SRCREV}"