summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-moblin/conf/distro/include/moblin-fixed-revisions.inc8
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc128
-rw-r--r--meta/packages/drm/libdrm-2.4.16/installtests.patch (renamed from meta/packages/drm/libdrm-2.4.15/installtests.patch)0
-rw-r--r--meta/packages/drm/libdrm_2.4.16.bb (renamed from meta/packages/drm/libdrm_2.4.15.bb)0
-rw-r--r--meta/packages/xorg-app/mkfontdir_1.0.5.bb9
-rw-r--r--meta/packages/xorg-app/mkfontscale_1.0.7.bb7
-rw-r--r--meta/packages/xorg-driver/xf86-input-evdev_2.3.2.bb (renamed from meta/packages/xorg-driver/xf86-input-evdev_2.2.1.bb)0
-rw-r--r--meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb (renamed from meta/packages/xorg-driver/xf86-input-keyboard_1.3.2.bb)0
-rw-r--r--meta/packages/xorg-driver/xf86-input-mouse_1.5.0.bb (renamed from meta/packages/xorg-driver/xf86-input-mouse_1.4.0.bb)0
-rw-r--r--meta/packages/xorg-driver/xf86-input-synaptics_1.2.1.bb (renamed from meta/packages/xorg-driver/xf86-input-synaptics_1.1.0.bb)1
-rw-r--r--meta/packages/xorg-driver/xf86-input-synaptics_git.bb1
-rw-r--r--meta/packages/xorg-driver/xf86-input-vmmouse_12.6.5.bb (renamed from meta/packages/xorg-driver/xf86-input-vmmouse_12.6.4.bb)0
-rw-r--r--meta/packages/xorg-driver/xf86-video-vmware_10.16.9.bb (renamed from meta/packages/xorg-driver/xf86-video-vmware_10.16.5.bb)0
-rw-r--r--meta/packages/xorg-font/encodings_1.0.3.bb5
-rw-r--r--meta/packages/xorg-font/font-alias_1.0.2.bb9
-rw-r--r--meta/packages/xorg-font/font-util_1.1.1.bb17
-rw-r--r--meta/packages/xorg-font/xorg-font-common.inc45
-rw-r--r--meta/packages/xorg-lib/libdmx_1.1.0.bb (renamed from meta/packages/xorg-lib/libdmx_1.0.2.bb)0
-rw-r--r--meta/packages/xorg-lib/libx11-diet_1.3.bb (renamed from meta/packages/xorg-lib/libx11-diet_1.2.1.bb)0
-rw-r--r--meta/packages/xorg-lib/libx11-trim_1.3.bb (renamed from meta/packages/xorg-lib/libx11-trim_1.2.1.bb)0
-rw-r--r--meta/packages/xorg-lib/libx11_1.3.bb (renamed from meta/packages/xorg-lib/libx11_1.2.1.bb)0
-rw-r--r--meta/packages/xorg-lib/libxext_1.1.1.bb (renamed from meta/packages/xorg-lib/libxext_1.0.5.bb)0
-rw-r--r--meta/packages/xorg-lib/libxi_1.3.bb (renamed from meta/packages/xorg-lib/libxi_1.2.1.bb)0
-rw-r--r--meta/packages/xorg-lib/libxi_git.bb2
-rw-r--r--meta/packages/xorg-lib/libxinerama_1.1.bb (renamed from meta/packages/xorg-lib/libxinerama_1.0.3.bb)0
-rw-r--r--meta/packages/xorg-lib/libxtst_1.1.0.bb (renamed from meta/packages/xorg-lib/libxtst_1.0.3.bb)0
-rw-r--r--meta/packages/xorg-lib/libxxf86dga_1.1.1.bb (renamed from meta/packages/xorg-lib/libxxf86dga_1.0.2.bb)0
-rw-r--r--meta/packages/xorg-lib/pixman_0.17.4.bb (renamed from meta/packages/xorg-lib/pixman_0.13.2.bb)0
-rw-r--r--meta/packages/xorg-proto/applewmproto_1.4.1.bb (renamed from meta/packages/xorg-proto/applewmproto_1.1.0.bb)0
-rw-r--r--meta/packages/xorg-proto/bigreqsproto_1.1.0.bb (renamed from meta/packages/xorg-proto/bigreqsproto_1.0.2.bb)0
-rw-r--r--meta/packages/xorg-proto/damageproto_1.2.0.bb (renamed from meta/packages/xorg-proto/damageproto_1.1.0.bb)0
-rw-r--r--meta/packages/xorg-proto/dmxproto_2.3.bb (renamed from meta/packages/xorg-proto/dmxproto_2.2.2.bb)0
-rw-r--r--meta/packages/xorg-proto/dri2proto_2.2.bb (renamed from meta/packages/xorg-proto/dri2proto_1.99.3.bb)0
-rw-r--r--meta/packages/xorg-proto/evieext_1.1.0.bb (renamed from meta/packages/xorg-proto/evieext_1.0.2.bb)0
-rw-r--r--meta/packages/xorg-proto/fixesproto_4.1.1.bb (renamed from meta/packages/xorg-proto/fixesproto_4.0.bb)0
-rw-r--r--meta/packages/xorg-proto/fontcacheproto_0.1.3.bb (renamed from meta/packages/xorg-proto/fontcacheproto_0.1.2.bb)0
-rw-r--r--meta/packages/xorg-proto/fontsproto_2.1.0.bb (renamed from meta/packages/xorg-proto/fontsproto_2.0.2.bb)0
-rw-r--r--meta/packages/xorg-proto/glproto_1.4.11.bb (renamed from meta/packages/xorg-proto/glproto_1.4.9.bb)0
-rw-r--r--meta/packages/xorg-proto/inputproto_2.0.bb (renamed from meta/packages/xorg-proto/inputproto_1.9.99.12.bb)0
-rw-r--r--meta/packages/xorg-proto/kbproto_1.0.4.bb (renamed from meta/packages/xorg-proto/kbproto_1.0.3.bb)0
-rw-r--r--meta/packages/xorg-proto/randrproto_1.3.1.bb (renamed from meta/packages/xorg-proto/randrproto_1.2.99.3.bb)0
-rw-r--r--meta/packages/xorg-proto/recordproto_1.14.bb (renamed from meta/packages/xorg-proto/recordproto_1.13.2.bb)0
-rw-r--r--meta/packages/xorg-proto/renderproto_0.11.bb (renamed from meta/packages/xorg-proto/renderproto_0.9.3.bb)0
-rw-r--r--meta/packages/xorg-proto/resourceproto_1.1.0.bb (renamed from meta/packages/xorg-proto/resourceproto_1.0.2.bb)0
-rw-r--r--meta/packages/xorg-proto/scrnsaverproto_1.2.0.bb (renamed from meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb)0
-rw-r--r--meta/packages/xorg-proto/videoproto_2.3.0.bb (renamed from meta/packages/xorg-proto/videoproto_2.2.2.bb)0
-rw-r--r--meta/packages/xorg-proto/windowswmproto_1.0.4.bb (renamed from meta/packages/xorg-proto/windowswmproto_1.0.3.bb)0
-rw-r--r--meta/packages/xorg-proto/xcmiscproto_1.2.0.bb (renamed from meta/packages/xorg-proto/xcmiscproto_1.1.2.bb)0
-rw-r--r--meta/packages/xorg-proto/xextproto_7.1.0.bb (renamed from meta/packages/xorg-proto/xextproto_7.0.5.bb)2
-rw-r--r--meta/packages/xorg-proto/xf86bigfontproto_1.2.0.bb (renamed from meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb)0
-rw-r--r--meta/packages/xorg-proto/xf86dgaproto_2.1.bb (renamed from meta/packages/xorg-proto/xf86dgaproto_2.0.3.bb)0
-rw-r--r--meta/packages/xorg-proto/xf86driproto_2.1.0.bb (renamed from meta/packages/xorg-proto/xf86driproto_2.0.4.bb)0
-rw-r--r--meta/packages/xorg-proto/xf86miscproto_0.9.3.bb (renamed from meta/packages/xorg-proto/xf86miscproto_0.9.2.bb)0
-rw-r--r--meta/packages/xorg-proto/xineramaproto_1.2.bb (renamed from meta/packages/xorg-proto/xineramaproto_1.1.2.bb)0
-rw-r--r--meta/packages/xorg-proto/xproto_7.0.16.bb (renamed from meta/packages/xorg-proto/xproto_7.0.14.bb)0
-rw-r--r--meta/packages/xorg-proto/xproxymanagementprotocol_1.0.3.bb (renamed from meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb)0
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch19
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb18
58 files changed, 201 insertions, 70 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index 4faecb6630..a721158196 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -10,13 +10,13 @@ PREFERRED_VERSION_pango = "1.26.0"
10PREFERRED_VERSION_udev ?= "145" 10PREFERRED_VERSION_udev ?= "145"
11 11
12PREFERRED_VERSION_mesa-dri ?= "7.7" 12PREFERRED_VERSION_mesa-dri ?= "7.7"
13PREFERRED_VERSION_xf86-video-intel ?= "2.7.1" 13PREFERRED_VERSION_xf86-video-intel ?= "2.10.0"
14PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.6.0" 14PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2"
15PREFERRED_VERSION_libxcb ?= "1.3" 15PREFERRED_VERSION_libxcb ?= "1.3"
16PREFERRED_VERSION_xcb-proto ?= "1.5" 16PREFERRED_VERSION_xcb-proto ?= "1.5"
17PREFERRED_VERSION_libx11-trim ?= "1.2.1" 17PREFERRED_VERSION_libx11-trim ?= "1.3"
18 18
19PREFERRED_VERSION_libdrm ?= "2.4.15" 19PREFERRED_VERSION_libdrm ?= "2.4.16"
20PREFERRED_VERSION_xf86-input-keyboard ?= "" 20PREFERRED_VERSION_xf86-input-keyboard ?= ""
21PREFERRED_VERSION_dri2proto ?= "" 21PREFERRED_VERSION_dri2proto ?= ""
22 22
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 7e269cd9cb..45a37a2d0f 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -2,30 +2,30 @@
2# The latest Xorg package versions 2# The latest Xorg package versions
3# 3#
4 4
5PREFERRED_VERSION_applewmproto ?= "1.1.0" 5PREFERRED_VERSION_applewmproto ?= "1.4.1"
6PREFERRED_VERSION_bigreqsproto ?= "1.0.2" 6PREFERRED_VERSION_bigreqsproto ?= "1.1.0"
7PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2" 7PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0"
8PREFERRED_VERSION_bigreqsproto-nativesdk ?= "1.0.2" 8PREFERRED_VERSION_bigreqsproto-nativesdk ?= "1.1.0"
9PREFERRED_VERSION_compositeproto ?= "0.4" 9PREFERRED_VERSION_compositeproto ?= "0.4"
10PREFERRED_VERSION_damageproto ?= "1.1.0" 10PREFERRED_VERSION_damageproto ?= "1.2.0"
11PREFERRED_VERSION_dmxproto ?= "2.2.2" 11PREFERRED_VERSION_dmxproto ?= "2.3"
12PREFERRED_VERSION_evieext ?= "1.0.2" 12PREFERRED_VERSION_evieext ?= "1.1.0"
13PREFERRED_VERSION_fixesproto ?= "4.0" 13PREFERRED_VERSION_fixesproto ?= "4.1.1"
14PREFERRED_VERSION_fontcacheproto ?= "0.1.2" 14PREFERRED_VERSION_fontcacheproto ?= "0.1.3"
15PREFERRED_VERSION_fontcacheproto-native ?= "0.1.2" 15PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3"
16PREFERRED_VERSION_fontsproto ?= "2.0.2" 16PREFERRED_VERSION_fontsproto ?= "2.1.0"
17PREFERRED_VERSION_fontsproto-native ?= "2.0.2" 17PREFERRED_VERSION_fontsproto-native ?= "2.1.0"
18PREFERRED_VERSION_gccmakedep ?= "1.0.2" 18PREFERRED_VERSION_gccmakedep ?= "1.0.2"
19PREFERRED_VERSION_glproto ?= "1.4.9" 19PREFERRED_VERSION_glproto ?= "1.4.11"
20PREFERRED_VERSION_imake ?= "1.0.2" 20PREFERRED_VERSION_imake ?= "1.0.2"
21#PREFERRED_VERSION_inputproto ?= "1.9.99.12" 21#PREFERRED_VERSION_inputproto ?= "2.0"
22#PREFERRED_VERSION_inputproto-native ?= "1.9.99.12" 22#PREFERRED_VERSION_inputproto-native ?= "2.0"
23#PREFERRED_VERSION_inputproto-nativesdk ?= "1.9.99.12" 23#PREFERRED_VERSION_inputproto-nativesdk ?= "2.0"
24PREFERRED_VERSION_kbproto ?= "1.0.3" 24PREFERRED_VERSION_kbproto ?= "1.0.4"
25PREFERRED_VERSION_kbproto-native ?= "1.0.3" 25PREFERRED_VERSION_kbproto-native ?= "1.0.4"
26PREFERRED_VERSION_kbproto-nativesdk ?= "1.0.3" 26PREFERRED_VERSION_kbproto-nativesdk ?= "1.0.4"
27PREFERRED_VERSION_libapplewm ?= "1.0.0" 27PREFERRED_VERSION_libapplewm ?= "1.0.0"
28PREFERRED_VERSION_libdmx ?= "1.0.2" 28PREFERRED_VERSION_libdmx ?= "1.1.0"
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.1" 31PREFERRED_VERSION_libfs ?= "1.0.1"
@@ -34,11 +34,11 @@ PREFERRED_VERSION_liblbxutil ?= "1.0.1"
34PREFERRED_VERSION_liboldx ?= "1.0.1" 34PREFERRED_VERSION_liboldx ?= "1.0.1"
35PREFERRED_VERSION_libsm ?= "1.1.0" 35PREFERRED_VERSION_libsm ?= "1.1.0"
36PREFERRED_VERSION_libwindowswm ?= "1.0.0" 36PREFERRED_VERSION_libwindowswm ?= "1.0.0"
37PREFERRED_VERSION_libx11 ?= "1.2.1" 37PREFERRED_VERSION_libx11 ?= "1.3"
38PREFERRED_VERSION_libx11-diet ?= "1.2.1" 38PREFERRED_VERSION_libx11-diet ?= "1.3"
39PREFERRED_VERSION_libx11-native ?= "1.2.1" 39PREFERRED_VERSION_libx11-native ?= "1.3"
40PREFERRED_VERSION_libx11-nativesdk ?= "1.2.1" 40PREFERRED_VERSION_libx11-nativesdk ?= "1.3"
41PREFERRED_VERSION_libx11-trim ?= "1.2.1" 41PREFERRED_VERSION_libx11-trim ?= "1.3"
42PREFERRED_VERSION_libxau ?= "1.0.4" 42PREFERRED_VERSION_libxau ?= "1.0.4"
43PREFERRED_VERSION_libxau-native ?= "1.0.4" 43PREFERRED_VERSION_libxau-native ?= "1.0.4"
44PREFERRED_VERSION_libxau-nativesdk ?= "1.0.4" 44PREFERRED_VERSION_libxau-nativesdk ?= "1.0.4"
@@ -50,15 +50,15 @@ PREFERRED_VERSION_libxdmcp ?= "1.0.2"
50PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" 50PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
51PREFERRED_VERSION_libxdmcp-nativesdk ?= "1.0.2" 51PREFERRED_VERSION_libxdmcp-nativesdk ?= "1.0.2"
52PREFERRED_VERSION_libxevie ?= "1.0.2" 52PREFERRED_VERSION_libxevie ?= "1.0.2"
53#PREFERRED_VERSION_libxext ?= "1.0.5" 53PREFERRED_VERSION_libxext ?= "1.1.1"
54PREFERRED_VERSION_libxext-nativesdk ?= "1.0.5" 54PREFERRED_VERSION_libxext-nativesdk ?= "1.1.1"
55PREFERRED_VERSION_libxfixes ?= "4.0.3" 55PREFERRED_VERSION_libxfixes ?= "4.0.3"
56PREFERRED_VERSION_libxfont ?= "1.3.4" 56PREFERRED_VERSION_libxfont ?= "1.3.4"
57PREFERRED_VERSION_libxfont-native ?= "1.3.4" 57PREFERRED_VERSION_libxfont-native ?= "1.3.4"
58PREFERRED_VERSION_libxfontcache ?= "1.0.4" 58PREFERRED_VERSION_libxfontcache ?= "1.0.4"
59PREFERRED_VERSION_libxft ?= "2.1.13" 59PREFERRED_VERSION_libxft ?= "2.1.13"
60#PREFERRED_VERSION_libxi ?= "1.2.1" 60PREFERRED_VERSION_libxi ?= "1.3"
61PREFERRED_VERSION_libxinerama ?= "1.0.3" 61PREFERRED_VERSION_libxinerama ?= "1.1"
62PREFERRED_VERSION_libxkbfile ?= "1.0.5" 62PREFERRED_VERSION_libxkbfile ?= "1.0.5"
63PREFERRED_VERSION_libxkbui ?= "1.0.2" 63PREFERRED_VERSION_libxkbui ?= "1.0.2"
64PREFERRED_VERSION_libxmu ?= "1.0.4" 64PREFERRED_VERSION_libxmu ?= "1.0.4"
@@ -74,58 +74,58 @@ PREFERRED_VERSION_libxres ?= "1.0.3"
74PREFERRED_VERSION_libxscrnsaver ?= "1.1.3" 74PREFERRED_VERSION_libxscrnsaver ?= "1.1.3"
75PREFERRED_VERSION_libxt ?= "1.0.5" 75PREFERRED_VERSION_libxt ?= "1.0.5"
76PREFERRED_VERSION_libxtrap ?= "1.0.0" 76PREFERRED_VERSION_libxtrap ?= "1.0.0"
77PREFERRED_VERSION_libxtst ?= "1.0.3" 77PREFERRED_VERSION_libxtst ?= "1.1.0"
78PREFERRED_VERSION_libxv ?= "1.0.4" 78PREFERRED_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.1.1"
81PREFERRED_VERSION_libxxf86misc ?= "1.0.1" 81PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
82PREFERRED_VERSION_libxxf86vm ?= "1.0.2" 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.13.2" 86PREFERRED_VERSION_pixman ?= "0.17.4"
87PREFERRED_VERSION_printproto ?= "1.0.4" 87PREFERRED_VERSION_printproto ?= "1.0.4"
88PREFERRED_VERSION_randrproto ?= "1.2.99.3" 88PREFERRED_VERSION_randrproto ?= "1.3.1"
89PREFERRED_VERSION_randrproto-nativesdk ?= "1.2.99.3" 89PREFERRED_VERSION_randrproto-nativesdk ?= "1.3.1"
90PREFERRED_VERSION_recordproto ?= "1.13.2" 90PREFERRED_VERSION_recordproto ?= "1.14"
91PREFERRED_VERSION_renderproto ?= "0.9.3" 91PREFERRED_VERSION_renderproto ?= "0.11"
92PREFERRED_VERSION_renderproto-nativesdk ?= "0.9.3" 92PREFERRED_VERSION_renderproto-nativesdk ?= "0.11"
93PREFERRED_VERSION_resourceproto ?= "1.0.2" 93PREFERRED_VERSION_resourceproto ?= "1.1.0"
94PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" 94PREFERRED_VERSION_scrnsaverproto ?= "1.2.0"
95PREFERRED_VERSION_trapproto ?= "3.4.3" 95PREFERRED_VERSION_trapproto ?= "3.4.3"
96PREFERRED_VERSION_util-macros ?= "1.4.1" 96PREFERRED_VERSION_util-macros ?= "1.4.1"
97PREFERRED_VERSION_util-macros-native ?= "1.4.1" 97PREFERRED_VERSION_util-macros-native ?= "1.4.1"
98PREFERRED_VERSION_videoproto ?= "2.2.2" 98PREFERRED_VERSION_videoproto ?= "2.3.0"
99PREFERRED_VERSION_windowswmproto ?= "1.0.3" 99PREFERRED_VERSION_windowswmproto ?= "1.0.4"
100PREFERRED_VERSION_x11perf ?= "1.5" 100PREFERRED_VERSION_x11perf ?= "1.5"
101PREFERRED_VERSION_xauth ?= "1.0.3" 101PREFERRED_VERSION_xauth ?= "1.0.3"
102PREFERRED_VERSION_xcmiscproto ?= "1.1.2" 102PREFERRED_VERSION_xcmiscproto ?= "1.2.0"
103PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2" 103PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0"
104PREFERRED_VERSION_xcmiscproto-nativesdk ?= "1.1.2" 104PREFERRED_VERSION_xcmiscproto-nativesdk ?= "1.2.0"
105PREFERRED_VERSION_xdpyinfo ?= "1.0.3" 105PREFERRED_VERSION_xdpyinfo ?= "1.0.3"
106PREFERRED_VERSION_xev ?= "1.0.3" 106PREFERRED_VERSION_xev ?= "1.0.3"
107PREFERRED_VERSION_xextproto ?= "7.0.5" 107PREFERRED_VERSION_xextproto ?= "7.1.0"
108PREFERRED_VERSION_xextproto-native ?= "7.0.5" 108PREFERRED_VERSION_xextproto-native ?= "7.1.0"
109PREFERRED_VERSION_xextproto-nativesdk ?= "7.0.5" 109PREFERRED_VERSION_xextproto-nativesdk ?= "7.1.0"
110PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2" 110PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0"
111PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2" 111PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0"
112PREFERRED_VERSION_xf86bigfontproto-nativesdk ?= "1.1.2" 112PREFERRED_VERSION_xf86bigfontproto-nativesdk ?= "1.2.0"
113PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" 113PREFERRED_VERSION_xf86dgaproto ?= "2.1"
114PREFERRED_VERSION_xf86driproto ?= "2.0.4" 114PREFERRED_VERSION_xf86driproto ?= "2.1.0"
115PREFERRED_VERSION_dri2proto ?= "1.99.3" 115PREFERRED_VERSION_dri2proto ?= "1.99.3"
116PREFERRED_VERSION_xf86miscproto ?= "0.9.2" 116PREFERRED_VERSION_xf86miscproto ?= "0.9.3"
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.1.1" 120PREFERRED_VERSION_xinit ?= "1.1.1"
121PREFERRED_VERSION_xineramaproto ?= "1.1.2" 121PREFERRED_VERSION_xineramaproto ?= "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"
124PREFERRED_VERSION_xprop ?= "1.0.4" 124PREFERRED_VERSION_xprop ?= "1.0.4"
125PREFERRED_VERSION_xproto ?= "7.0.14" 125PREFERRED_VERSION_xproto ?= "7.0.16"
126PREFERRED_VERSION_xproto-native ?= "7.0.14" 126PREFERRED_VERSION_xproto-native ?= "7.0.16"
127PREFERRED_VERSION_xproto-nativesdk ?= "7.0.14" 127PREFERRED_VERSION_xproto-nativesdk ?= "7.0.16"
128PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2" 128PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
129PREFERRED_VERSION_xrandr ?= "1.2.3" 129PREFERRED_VERSION_xrandr ?= "1.2.3"
130PREFERRED_VERSION_xrdb ?= "1.0.5" 130PREFERRED_VERSION_xrdb ?= "1.0.5"
131PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0" 131PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0"
@@ -137,15 +137,15 @@ PREFERRED_VERSION_xtrans-nativesdk ?= "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.4" 139PREFERRED_VERSION_mesa-dri ?= "7.4"
140PREFERRED_VERSION_libdrm ?= "2.4.7" 140PREFERRED_VERSION_libdrm ?= "2.4.16"
141PREFERRED_VERSION_xcb-proto ?= "1.5" 141PREFERRED_VERSION_xcb-proto ?= "1.5"
142PREFERRED_VERSION_libxcb ?= "1.3" 142PREFERRED_VERSION_libxcb ?= "1.3"
143PREFERRED_VERSION_libxcb-nativesdk ?= "1.3" 143PREFERRED_VERSION_libxcb-nativesdk ?= "1.3"
144PREFERRED_VERSION_libpciaccess ?= "0.10.5" 144PREFERRED_VERSION_libpciaccess ?= "0.10.5"
145PREFERRED_VERSION_xf86-input-evdev ?= "2.2.1" 145PREFERRED_VERSION_xf86-input-evdev ?= "2.3.2"
146PREFERRED_VERSION_xf86-input-mouse ?= "1.4.0" 146PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0"
147PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.2" 147PREFERRED_VERSION_xf86-input-keyboard ?= "1.4.0"
148PREFERRED_VERSION_xf86-input-synaptics ?= "1.1.0" 148PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1"
149PREFERRED_VERSION_xf86-video-intel ?= "2.7.1" 149PREFERRED_VERSION_xf86-video-intel ?= "2.10.0"
150 150
151 151
diff --git a/meta/packages/drm/libdrm-2.4.15/installtests.patch b/meta/packages/drm/libdrm-2.4.16/installtests.patch
index a16c8a738b..a16c8a738b 100644
--- a/meta/packages/drm/libdrm-2.4.15/installtests.patch
+++ b/meta/packages/drm/libdrm-2.4.16/installtests.patch
diff --git a/meta/packages/drm/libdrm_2.4.15.bb b/meta/packages/drm/libdrm_2.4.16.bb
index 7679035866..7679035866 100644
--- a/meta/packages/drm/libdrm_2.4.15.bb
+++ b/meta/packages/drm/libdrm_2.4.16.bb
diff --git a/meta/packages/xorg-app/mkfontdir_1.0.5.bb b/meta/packages/xorg-app/mkfontdir_1.0.5.bb
new file mode 100644
index 0000000000..98fcdd47c5
--- /dev/null
+++ b/meta/packages/xorg-app/mkfontdir_1.0.5.bb
@@ -0,0 +1,9 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "a program to create an index of X font files in a directory"
4
5PE = "1"
6
7RDEPENDS += "mkfontscale"
8
9BBCLASSEXTEND = "native"
diff --git a/meta/packages/xorg-app/mkfontscale_1.0.7.bb b/meta/packages/xorg-app/mkfontscale_1.0.7.bb
new file mode 100644
index 0000000000..e7cb66625a
--- /dev/null
+++ b/meta/packages/xorg-app/mkfontscale_1.0.7.bb
@@ -0,0 +1,7 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "a program to create an index of scalable font files for X"
4
5DEPENDS += " zlib libfontenc freetype virtual/libx11"
6
7BBCLASSEXTEND = "native" \ No newline at end of file
diff --git a/meta/packages/xorg-driver/xf86-input-evdev_2.2.1.bb b/meta/packages/xorg-driver/xf86-input-evdev_2.3.2.bb
index d1fb0f000d..d1fb0f000d 100644
--- a/meta/packages/xorg-driver/xf86-input-evdev_2.2.1.bb
+++ b/meta/packages/xorg-driver/xf86-input-evdev_2.3.2.bb
diff --git a/meta/packages/xorg-driver/xf86-input-keyboard_1.3.2.bb b/meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb
index f554141c97..f554141c97 100644
--- a/meta/packages/xorg-driver/xf86-input-keyboard_1.3.2.bb
+++ b/meta/packages/xorg-driver/xf86-input-keyboard_1.4.0.bb
diff --git a/meta/packages/xorg-driver/xf86-input-mouse_1.4.0.bb b/meta/packages/xorg-driver/xf86-input-mouse_1.5.0.bb
index 39c2e05daf..39c2e05daf 100644
--- a/meta/packages/xorg-driver/xf86-input-mouse_1.4.0.bb
+++ b/meta/packages/xorg-driver/xf86-input-mouse_1.5.0.bb
diff --git a/meta/packages/xorg-driver/xf86-input-synaptics_1.1.0.bb b/meta/packages/xorg-driver/xf86-input-synaptics_1.2.1.bb
index f554141c97..81128394c3 100644
--- a/meta/packages/xorg-driver/xf86-input-synaptics_1.1.0.bb
+++ b/meta/packages/xorg-driver/xf86-input-synaptics_1.2.1.bb
@@ -2,3 +2,4 @@ require xf86-input-common.inc
2 2
3DESCRIPTION = "X.Org X server -- keyboard input driver" 3DESCRIPTION = "X.Org X server -- keyboard input driver"
4 4
5DEPENDS += "libxi"
diff --git a/meta/packages/xorg-driver/xf86-input-synaptics_git.bb b/meta/packages/xorg-driver/xf86-input-synaptics_git.bb
index b4f13f6923..f7dc3b731c 100644
--- a/meta/packages/xorg-driver/xf86-input-synaptics_git.bb
+++ b/meta/packages/xorg-driver/xf86-input-synaptics_git.bb
@@ -7,3 +7,4 @@ PV = "0.15.2+git${SRCPV}"
7SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics;protocol=git" 7SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics;protocol=git"
8S = "${WORKDIR}/git" 8S = "${WORKDIR}/git"
9 9
10DEPENDS += "libxi"
diff --git a/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.4.bb b/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.5.bb
index c0297f1d55..c0297f1d55 100644
--- a/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.4.bb
+++ b/meta/packages/xorg-driver/xf86-input-vmmouse_12.6.5.bb
diff --git a/meta/packages/xorg-driver/xf86-video-vmware_10.16.5.bb b/meta/packages/xorg-driver/xf86-video-vmware_10.16.9.bb
index 74a8848637..74a8848637 100644
--- a/meta/packages/xorg-driver/xf86-video-vmware_10.16.5.bb
+++ b/meta/packages/xorg-driver/xf86-video-vmware_10.16.9.bb
diff --git a/meta/packages/xorg-font/encodings_1.0.3.bb b/meta/packages/xorg-font/encodings_1.0.3.bb
new file mode 100644
index 0000000000..ecc3eed540
--- /dev/null
+++ b/meta/packages/xorg-font/encodings_1.0.3.bb
@@ -0,0 +1,5 @@
1require xorg-font-common.inc
2PE = "1"
3PR = "${INC_PR}.0"
4
5DEPENDS = "mkfontscale-native font-util-native"
diff --git a/meta/packages/xorg-font/font-alias_1.0.2.bb b/meta/packages/xorg-font/font-alias_1.0.2.bb
new file mode 100644
index 0000000000..5314cbc5db
--- /dev/null
+++ b/meta/packages/xorg-font/font-alias_1.0.2.bb
@@ -0,0 +1,9 @@
1require xorg-font-common.inc
2
3DESCRIPTION = "X font aliases."
4
5DEPENDS = "virtual/xserver font-util"
6RDEPENDS = "encodings font-util"
7
8PE = "1"
9PR = "${INC_PR}.0"
diff --git a/meta/packages/xorg-font/font-util_1.1.1.bb b/meta/packages/xorg-font/font-util_1.1.1.bb
new file mode 100644
index 0000000000..b7819d1244
--- /dev/null
+++ b/meta/packages/xorg-font/font-util_1.1.1.bb
@@ -0,0 +1,17 @@
1require xorg-font-common.inc
2
3PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
4
5DESCRIPTION = "X font utils."
6
7DEPENDS = "encodings util-macros"
8DEPENDS_virtclass-native = "util-macros-native"
9RDEPENDS = "mkfontdir mkfontscale encodings"
10
11PR = "${INC_PR}.1"
12
13do_configure_prepend() {
14 sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" fontutil.m4.in
15}
16
17BBCLASSEXTEND = "native" \ No newline at end of file
diff --git a/meta/packages/xorg-font/xorg-font-common.inc b/meta/packages/xorg-font/xorg-font-common.inc
new file mode 100644
index 0000000000..52dc2208df
--- /dev/null
+++ b/meta/packages/xorg-font/xorg-font-common.inc
@@ -0,0 +1,45 @@
1HOMEPAGE = "http://www.x.org"
2SECTION = "x11/fonts"
3LICENSE = "MIT-X"
4
5DEPENDS = " encodings font-alias font-util-native mkfontdir-native mkfontscale-native"
6RDEPENDS = "encodings font-util font-alias"
7
8XORG_PN = "${BPN}"
9INC_PR = "r1"
10
11SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2"
12S = "${WORKDIR}/${XORG_PN}-${PV}"
13
14inherit autotools pkgconfig
15
16EXTRA_OEMAKE += "FCCACHE=/bin/true"
17
18do_configure_prepend() {
19 if [ -f "${S}"/configure.ac ] ; then
20 sed -i "s#^MAPFILES_PATH=.*#MAPFILES_PATH=\"${STAGING_DIR_TARGET}/\$(pkg-config --variable=mapdir fontutil)\"#g" "${S}"/configure.ac
21 fi
22}
23
24do_install_append() {
25 find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f
26 find ${D}${libdir}/X11/fonts -type f -name fonts.scale | xargs rm -f
27 find ${D}${datadir}/fonts/X11 -type f -name fonts.dir | xargs rm -f
28 find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f
29}
30
31PACKAGE_ARCH = "all"
32
33FILES_${PN} += " ${libdir}/X11/fonts ${datadir}"
34
35pkg_postinst_${PN} () {
36 set -x
37 for fontdir in `find $D/usr/lib/X11/fonts -type d`; do
38 mkfontdir $fontdir
39 mkfontscale $fontdir
40 done
41 for fontdir in `find $D/usr/share/fonts/X11 -type d`; do
42 mkfontdir $fontdir
43 mkfontscale $fontdir
44 done
45}
diff --git a/meta/packages/xorg-lib/libdmx_1.0.2.bb b/meta/packages/xorg-lib/libdmx_1.1.0.bb
index 9b66101563..9b66101563 100644
--- a/meta/packages/xorg-lib/libdmx_1.0.2.bb
+++ b/meta/packages/xorg-lib/libdmx_1.1.0.bb
diff --git a/meta/packages/xorg-lib/libx11-diet_1.2.1.bb b/meta/packages/xorg-lib/libx11-diet_1.3.bb
index a76aba16e4..a76aba16e4 100644
--- a/meta/packages/xorg-lib/libx11-diet_1.2.1.bb
+++ b/meta/packages/xorg-lib/libx11-diet_1.3.bb
diff --git a/meta/packages/xorg-lib/libx11-trim_1.2.1.bb b/meta/packages/xorg-lib/libx11-trim_1.3.bb
index 08c8b163ab..08c8b163ab 100644
--- a/meta/packages/xorg-lib/libx11-trim_1.2.1.bb
+++ b/meta/packages/xorg-lib/libx11-trim_1.3.bb
diff --git a/meta/packages/xorg-lib/libx11_1.2.1.bb b/meta/packages/xorg-lib/libx11_1.3.bb
index ff62d90464..ff62d90464 100644
--- a/meta/packages/xorg-lib/libx11_1.2.1.bb
+++ b/meta/packages/xorg-lib/libx11_1.3.bb
diff --git a/meta/packages/xorg-lib/libxext_1.0.5.bb b/meta/packages/xorg-lib/libxext_1.1.1.bb
index e1f13a1d1a..e1f13a1d1a 100644
--- a/meta/packages/xorg-lib/libxext_1.0.5.bb
+++ b/meta/packages/xorg-lib/libxext_1.1.1.bb
diff --git a/meta/packages/xorg-lib/libxi_1.2.1.bb b/meta/packages/xorg-lib/libxi_1.3.bb
index 0c0529d7fe..0c0529d7fe 100644
--- a/meta/packages/xorg-lib/libxi_1.2.1.bb
+++ b/meta/packages/xorg-lib/libxi_1.3.bb
diff --git a/meta/packages/xorg-lib/libxi_git.bb b/meta/packages/xorg-lib/libxi_git.bb
index 13e51f4378..30c1778c3e 100644
--- a/meta/packages/xorg-lib/libxi_git.bb
+++ b/meta/packages/xorg-lib/libxi_git.bb
@@ -3,7 +3,7 @@ require xorg-lib-common.inc
3DESCRIPTION = "X11 Input extension library" 3DESCRIPTION = "X11 Input extension library"
4DEPENDS += "libxext inputproto" 4DEPENDS += "libxext inputproto"
5PE = "1" 5PE = "1"
6PV = "1.9.99.5+gitr${SRCPV}" 6PV = "1.2.99.5+gitr${SRCPV}"
7 7
8XORG_PN = "libXi" 8XORG_PN = "libXi"
9 9
diff --git a/meta/packages/xorg-lib/libxinerama_1.0.3.bb b/meta/packages/xorg-lib/libxinerama_1.1.bb
index b7135bc28e..b7135bc28e 100644
--- a/meta/packages/xorg-lib/libxinerama_1.0.3.bb
+++ b/meta/packages/xorg-lib/libxinerama_1.1.bb
diff --git a/meta/packages/xorg-lib/libxtst_1.0.3.bb b/meta/packages/xorg-lib/libxtst_1.1.0.bb
index a83a69e591..a83a69e591 100644
--- a/meta/packages/xorg-lib/libxtst_1.0.3.bb
+++ b/meta/packages/xorg-lib/libxtst_1.1.0.bb
diff --git a/meta/packages/xorg-lib/libxxf86dga_1.0.2.bb b/meta/packages/xorg-lib/libxxf86dga_1.1.1.bb
index 47492d7108..47492d7108 100644
--- a/meta/packages/xorg-lib/libxxf86dga_1.0.2.bb
+++ b/meta/packages/xorg-lib/libxxf86dga_1.1.1.bb
diff --git a/meta/packages/xorg-lib/pixman_0.13.2.bb b/meta/packages/xorg-lib/pixman_0.17.4.bb
index e4132954ab..e4132954ab 100644
--- a/meta/packages/xorg-lib/pixman_0.13.2.bb
+++ b/meta/packages/xorg-lib/pixman_0.17.4.bb
diff --git a/meta/packages/xorg-proto/applewmproto_1.1.0.bb b/meta/packages/xorg-proto/applewmproto_1.4.1.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/applewmproto_1.1.0.bb
+++ b/meta/packages/xorg-proto/applewmproto_1.4.1.bb
diff --git a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto_1.1.0.bb
index 29c9f3fc34..29c9f3fc34 100644
--- a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
+++ b/meta/packages/xorg-proto/bigreqsproto_1.1.0.bb
diff --git a/meta/packages/xorg-proto/damageproto_1.1.0.bb b/meta/packages/xorg-proto/damageproto_1.2.0.bb
index 202ec2874f..202ec2874f 100644
--- a/meta/packages/xorg-proto/damageproto_1.1.0.bb
+++ b/meta/packages/xorg-proto/damageproto_1.2.0.bb
diff --git a/meta/packages/xorg-proto/dmxproto_2.2.2.bb b/meta/packages/xorg-proto/dmxproto_2.3.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/dmxproto_2.2.2.bb
+++ b/meta/packages/xorg-proto/dmxproto_2.3.bb
diff --git a/meta/packages/xorg-proto/dri2proto_1.99.3.bb b/meta/packages/xorg-proto/dri2proto_2.2.bb
index 8decda682f..8decda682f 100644
--- a/meta/packages/xorg-proto/dri2proto_1.99.3.bb
+++ b/meta/packages/xorg-proto/dri2proto_2.2.bb
diff --git a/meta/packages/xorg-proto/evieext_1.0.2.bb b/meta/packages/xorg-proto/evieext_1.1.0.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/evieext_1.0.2.bb
+++ b/meta/packages/xorg-proto/evieext_1.1.0.bb
diff --git a/meta/packages/xorg-proto/fixesproto_4.0.bb b/meta/packages/xorg-proto/fixesproto_4.1.1.bb
index 20f95282e5..20f95282e5 100644
--- a/meta/packages/xorg-proto/fixesproto_4.0.bb
+++ b/meta/packages/xorg-proto/fixesproto_4.1.1.bb
diff --git a/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto_0.1.3.bb
index 2a9b73adfc..2a9b73adfc 100644
--- a/meta/packages/xorg-proto/fontcacheproto_0.1.2.bb
+++ b/meta/packages/xorg-proto/fontcacheproto_0.1.3.bb
diff --git a/meta/packages/xorg-proto/fontsproto_2.0.2.bb b/meta/packages/xorg-proto/fontsproto_2.1.0.bb
index 2a9b73adfc..2a9b73adfc 100644
--- a/meta/packages/xorg-proto/fontsproto_2.0.2.bb
+++ b/meta/packages/xorg-proto/fontsproto_2.1.0.bb
diff --git a/meta/packages/xorg-proto/glproto_1.4.9.bb b/meta/packages/xorg-proto/glproto_1.4.11.bb
index 022bea1ee8..022bea1ee8 100644
--- a/meta/packages/xorg-proto/glproto_1.4.9.bb
+++ b/meta/packages/xorg-proto/glproto_1.4.11.bb
diff --git a/meta/packages/xorg-proto/inputproto_1.9.99.12.bb b/meta/packages/xorg-proto/inputproto_2.0.bb
index 392aef20f6..392aef20f6 100644
--- a/meta/packages/xorg-proto/inputproto_1.9.99.12.bb
+++ b/meta/packages/xorg-proto/inputproto_2.0.bb
diff --git a/meta/packages/xorg-proto/kbproto_1.0.3.bb b/meta/packages/xorg-proto/kbproto_1.0.4.bb
index 29c9f3fc34..29c9f3fc34 100644
--- a/meta/packages/xorg-proto/kbproto_1.0.3.bb
+++ b/meta/packages/xorg-proto/kbproto_1.0.4.bb
diff --git a/meta/packages/xorg-proto/randrproto_1.2.99.3.bb b/meta/packages/xorg-proto/randrproto_1.3.1.bb
index 42d33fb674..42d33fb674 100644
--- a/meta/packages/xorg-proto/randrproto_1.2.99.3.bb
+++ b/meta/packages/xorg-proto/randrproto_1.3.1.bb
diff --git a/meta/packages/xorg-proto/recordproto_1.13.2.bb b/meta/packages/xorg-proto/recordproto_1.14.bb
index af63403600..af63403600 100644
--- a/meta/packages/xorg-proto/recordproto_1.13.2.bb
+++ b/meta/packages/xorg-proto/recordproto_1.14.bb
diff --git a/meta/packages/xorg-proto/renderproto_0.9.3.bb b/meta/packages/xorg-proto/renderproto_0.11.bb
index 0168b9227c..0168b9227c 100644
--- a/meta/packages/xorg-proto/renderproto_0.9.3.bb
+++ b/meta/packages/xorg-proto/renderproto_0.11.bb
diff --git a/meta/packages/xorg-proto/resourceproto_1.0.2.bb b/meta/packages/xorg-proto/resourceproto_1.1.0.bb
index 1fb8aa7f12..1fb8aa7f12 100644
--- a/meta/packages/xorg-proto/resourceproto_1.0.2.bb
+++ b/meta/packages/xorg-proto/resourceproto_1.1.0.bb
diff --git a/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb b/meta/packages/xorg-proto/scrnsaverproto_1.2.0.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/scrnsaverproto_1.1.0.bb
+++ b/meta/packages/xorg-proto/scrnsaverproto_1.2.0.bb
diff --git a/meta/packages/xorg-proto/videoproto_2.2.2.bb b/meta/packages/xorg-proto/videoproto_2.3.0.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/videoproto_2.2.2.bb
+++ b/meta/packages/xorg-proto/videoproto_2.3.0.bb
diff --git a/meta/packages/xorg-proto/windowswmproto_1.0.3.bb b/meta/packages/xorg-proto/windowswmproto_1.0.4.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/windowswmproto_1.0.3.bb
+++ b/meta/packages/xorg-proto/windowswmproto_1.0.4.bb
diff --git a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto_1.2.0.bb
index 29c9f3fc34..29c9f3fc34 100644
--- a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xcmiscproto_1.2.0.bb
diff --git a/meta/packages/xorg-proto/xextproto_7.0.5.bb b/meta/packages/xorg-proto/xextproto_7.1.0.bb
index b37de80bf6..e357188ec8 100644
--- a/meta/packages/xorg-proto/xextproto_7.0.5.bb
+++ b/meta/packages/xorg-proto/xextproto_7.1.0.bb
@@ -1,6 +1,6 @@
1require xorg-proto-common.inc 1require xorg-proto-common.inc
2 2
3PR = "r3" 3PR = "r4"
4PE = "1" 4PE = "1"
5 5
6DEPENDS += "util-macros gettext" 6DEPENDS += "util-macros gettext"
diff --git a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto_1.2.0.bb
index d54c9011a0..d54c9011a0 100644
--- a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xf86bigfontproto_1.2.0.bb
diff --git a/meta/packages/xorg-proto/xf86dgaproto_2.0.3.bb b/meta/packages/xorg-proto/xf86dgaproto_2.1.bb
index 2e0e734858..2e0e734858 100644
--- a/meta/packages/xorg-proto/xf86dgaproto_2.0.3.bb
+++ b/meta/packages/xorg-proto/xf86dgaproto_2.1.bb
diff --git a/meta/packages/xorg-proto/xf86driproto_2.0.4.bb b/meta/packages/xorg-proto/xf86driproto_2.1.0.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xf86driproto_2.0.4.bb
+++ b/meta/packages/xorg-proto/xf86driproto_2.1.0.bb
diff --git a/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb b/meta/packages/xorg-proto/xf86miscproto_0.9.3.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xf86miscproto_0.9.2.bb
+++ b/meta/packages/xorg-proto/xf86miscproto_0.9.3.bb
diff --git a/meta/packages/xorg-proto/xineramaproto_1.1.2.bb b/meta/packages/xorg-proto/xineramaproto_1.2.bb
index 9f09fff7b7..9f09fff7b7 100644
--- a/meta/packages/xorg-proto/xineramaproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xineramaproto_1.2.bb
diff --git a/meta/packages/xorg-proto/xproto_7.0.14.bb b/meta/packages/xorg-proto/xproto_7.0.16.bb
index 4a9bc806b5..4a9bc806b5 100644
--- a/meta/packages/xorg-proto/xproto_7.0.14.bb
+++ b/meta/packages/xorg-proto/xproto_7.0.16.bb
diff --git a/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb b/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.3.bb
index 9c3d9efa71..9c3d9efa71 100644
--- a/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.2.bb
+++ b/meta/packages/xorg-proto/xproxymanagementprotocol_1.0.3.bb
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
new file mode 100644
index 0000000000..2341e40bca
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
@@ -0,0 +1,19 @@
1Index: xorg-server-1.7.99.2/configure.ac
2===================================================================
3--- xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.000000000 +0000
4+++ xorg-server-1.7.99.2/configure.ac 2010-01-29 16:42:39.000000000 +0000
5@@ -503,14 +503,10 @@
6
7 dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
8 dnl otherwise uses standard subdirectories of FONTROOTDIR
9-AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
10- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
11- [
12 DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
13 case $host_os in
14 darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
15 esac
16- ])
17 AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
18 [ FONTPATH="$withval" ],
19 [ FONTPATH="${DEFAULT_FONT_PATH}" ])
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb
new file mode 100644
index 0000000000..cde1712992
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.7.99.2.bb
@@ -0,0 +1,18 @@
1require xserver-xf86-dri-lite.inc
2
3PE = "1"
4PR = "r3"
5
6PROTO_DEPS += "xf86driproto dri2proto"
7
8DEPENDS += "font-util"
9
10SRC_URI += "file://nodolt.patch;patch=1 \
11 file://crosscompile.patch;patch=1"
12# file://libdri-xinerama-symbol.patch;patch=1 \
13# file://xserver-boottime.patch;patch=1"
14
15# Misc build failure for master HEAD
16SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"
17
18EXTRA_OECONF += "--enable-dri --enable-dri2"