summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc6
-rw-r--r--meta/conf/distro/include/preferred-xorg-versions.inc23
-rw-r--r--meta/conf/distro/poky.conf1
-rw-r--r--meta/conf/machine/eee901.conf2
-rw-r--r--meta/packages/drm/libdrm_git.bb17
-rw-r--r--meta/packages/mesa/mesa-dri_7.2.bb1
-rw-r--r--meta/packages/mesa/mesa-dri_git.bb10
-rw-r--r--meta/packages/xorg-driver/xf86-input-keyboard_git.bb9
-rw-r--r--meta/packages/xorg-driver/xf86-input-mouse_git.bb9
-rw-r--r--meta/packages/xorg-driver/xf86-input-synaptics_git.bb9
-rwxr-xr-xmeta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch12
-rwxr-xr-xmeta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch95
-rwxr-xr-xmeta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch31
-rwxr-xr-xmeta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch29
-rwxr-xr-xmeta/packages/xorg-driver/xf86-video-intel-dri2/007_disable_tiling_and_enable_UXA.patch28
-rw-r--r--meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb24
-rw-r--r--meta/packages/xorg-proto/dri2proto_1.99.1git.bb9
-rw-r--r--meta/packages/xorg-proto/inputproto-native_1.9.99.5git.bb (renamed from meta/packages/xorg-proto/inputproto-native_1.4.4.bb)0
-rw-r--r--meta/packages/xorg-proto/inputproto-sdk_1.9.99.5git.bb (renamed from meta/packages/xorg-proto/inputproto-sdk_1.4.4.bb)0
-rw-r--r--meta/packages/xorg-proto/inputproto_1.9.99.5git.bb10
-rw-r--r--meta/packages/xorg-proto/renderproto-sdk_0.9.3.bb3
-rw-r--r--meta/packages/xorg-proto/renderproto_0.9.3.bb7
-rw-r--r--meta/packages/xorg-proto/xextproto-native_7.0.3.bb3
-rw-r--r--meta/packages/xorg-proto/xextproto-sdk_7.0.3.bb3
-rw-r--r--meta/packages/xorg-proto/xextproto_7.0.3.bb (renamed from meta/packages/xorg-proto/inputproto_1.4.4.bb)2
-rw-r--r--meta/packages/xorg-proto/xproto-native_7.0.13.bb3
-rw-r--r--meta/packages/xorg-proto/xproto-sdk_7.0.13.bb3
-rw-r--r--meta/packages/xorg-proto/xproto_7.0.13.bb6
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc16
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch13
-rwxr-xr-xmeta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg-server-disable-dri_sarea.patch12
-rwxr-xr-xmeta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg-server-enable-dri2.patch23
-rwxr-xr-xmeta/packages/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch37
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb4
-rw-r--r--meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb9
35 files changed, 445 insertions, 24 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index d7e0a5a453..eb9f60913f 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -154,7 +154,11 @@ SRCREV_pn-usbpath = "3172"
154SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f" 154SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
155SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d" 155SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
156SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" 156SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
157SRCREV_pn-metacity-clutter ?= "389ce295417bdd99bf583026f7f1dedae29650da" 157SRCREV_pn-metacity-clutter ?= "b52f1df75af8216b13539431283fd1cfaa33cf51"
158SRCREV_pn-dri2proto ?= "abb1edc487543c26856afdbe6a7e2c088a1e82ee"
159SRCREV_pn-inputproto ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07"
160SRCREV_pn-inputproto-native ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07"
161SRCREV_pn-inputproto-sdk ?= "2166b77ea60bd9cd87f1311a2e7d461db071cb07"
158 162
159# 163#
160# Preferred Versions: 164# Preferred Versions:
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 29fa815686..887cc31bbc 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -18,9 +18,9 @@ PREFERRED_VERSION_fontsproto-native ?= "2.0.2"
18PREFERRED_VERSION_gccmakedep ?= "1.0.2" 18PREFERRED_VERSION_gccmakedep ?= "1.0.2"
19PREFERRED_VERSION_glproto ?= "1.4.9" 19PREFERRED_VERSION_glproto ?= "1.4.9"
20PREFERRED_VERSION_imake ?= "1.0.2" 20PREFERRED_VERSION_imake ?= "1.0.2"
21PREFERRED_VERSION_inputproto ?= "1.4.4" 21PREFERRED_VERSION_inputproto ?= "1.9.99.5+git${SRCREV}"
22PREFERRED_VERSION_inputproto-native ?= "1.4.4" 22PREFERRED_VERSION_inputproto-native ?= "1.9.99.5+git${SRCREV}"
23PREFERRED_VERSION_inputproto-sdk ?= "1.4.3" 23PREFERRED_VERSION_inputproto-sdk ?= "1.9.99.5+git${SRCREV}"
24PREFERRED_VERSION_kbproto ?= "1.0.3" 24PREFERRED_VERSION_kbproto ?= "1.0.3"
25PREFERRED_VERSION_kbproto-native ?= "1.0.3" 25PREFERRED_VERSION_kbproto-native ?= "1.0.3"
26PREFERRED_VERSION_kbproto-sdk ?= "1.0.3" 26PREFERRED_VERSION_kbproto-sdk ?= "1.0.3"
@@ -88,8 +88,8 @@ PREFERRED_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"
90PREFERRED_VERSION_recordproto ?= "1.13.2" 90PREFERRED_VERSION_recordproto ?= "1.13.2"
91PREFERRED_VERSION_renderproto ?= "0.9.2" 91PREFERRED_VERSION_renderproto ?= "0.9.3"
92PREFERRED_VERSION_renderproto-sdk ?= "0.9.2" 92PREFERRED_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"
@@ -104,14 +104,15 @@ PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2"
104PREFERRED_VERSION_xcmiscproto-sdk ?= "1.1.2" 104PREFERRED_VERSION_xcmiscproto-sdk ?= "1.1.2"
105PREFERRED_VERSION_xdpyinfo ?= "1.0.2" 105PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
106PREFERRED_VERSION_xev ?= "1.0.3" 106PREFERRED_VERSION_xev ?= "1.0.3"
107PREFERRED_VERSION_xextproto ?= "7.0.2" 107PREFERRED_VERSION_xextproto ?= "7.0.3"
108PREFERRED_VERSION_xextproto-native ?= "7.0.2" 108PREFERRED_VERSION_xextproto-native ?= "7.0.3"
109PREFERRED_VERSION_xextproto-sdk ?= "7.0.2" 109PREFERRED_VERSION_xextproto-sdk ?= "7.0.3"
110PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2" 110PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2"
111PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2" 111PREFERRED_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.3" 114PREFERRED_VERSION_xf86driproto ?= "2.0.3"
115PREFERRED_VERSION_dri2proto ?= "1.99.1+git${SRCREV}"
115PREFERRED_VERSION_xf86miscproto ?= "0.9.2" 116PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
116PREFERRED_VERSION_xf86rushproto ?= "1.1.2" 117PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
117PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2" 118PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
@@ -121,9 +122,9 @@ PREFERRED_VERSION_xineramaproto ?= "1.1.2"
121PREFERRED_VERSION_xmodmap ?= "1.0.3" 122PREFERRED_VERSION_xmodmap ?= "1.0.3"
122PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" 123PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
123PREFERRED_VERSION_xprop ?= "1.0.4" 124PREFERRED_VERSION_xprop ?= "1.0.4"
124PREFERRED_VERSION_xproto ?= "7.0.12" 125PREFERRED_VERSION_xproto ?= "7.0.13"
125PREFERRED_VERSION_xproto-native ?= "7.0.12" 126PREFERRED_VERSION_xproto-native ?= "7.0.13"
126PREFERRED_VERSION_xproto-sdk ?= "7.0.12" 127PREFERRED_VERSION_xproto-sdk ?= "7.0.13"
127PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2" 128PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2"
128PREFERRED_VERSION_xrandr ?= "1.2.3" 129PREFERRED_VERSION_xrandr ?= "1.2.3"
129PREFERRED_VERSION_xrdb ?= "1.0.5" 130PREFERRED_VERSION_xrdb ?= "1.0.5"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index efa6845dfc..09d86f1d2e 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -79,6 +79,7 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
79PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" 79PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
80PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" 80PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
81PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" 81PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
82PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel
82 83
83VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" 84VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
84 85
diff --git a/meta/conf/machine/eee901.conf b/meta/conf/machine/eee901.conf
index f6dbe333aa..54f630d56c 100644
--- a/meta/conf/machine/eee901.conf
+++ b/meta/conf/machine/eee901.conf
@@ -17,7 +17,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-moblin"
17PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" 17PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
18PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" 18PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
19PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite" 19PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-dri-lite"
20XSERVER = "xserver-xf86-dri-lite \ 20XSERVER ?= "xserver-xf86-dri-lite \
21 xf86-input-mouse \ 21 xf86-input-mouse \
22 xf86-input-keyboard \ 22 xf86-input-keyboard \
23 xf86-input-synaptics \ 23 xf86-input-synaptics \
diff --git a/meta/packages/drm/libdrm_git.bb b/meta/packages/drm/libdrm_git.bb
new file mode 100644
index 0000000000..e05e16bb04
--- /dev/null
+++ b/meta/packages/drm/libdrm_git.bb
@@ -0,0 +1,17 @@
1SECTION = "x11/base"
2LICENSE = "MIT"
3SRC_URI = "git://anongit.freedesktop.org/git/mesa/drm;protocol=git"
4PROVIDES = "drm"
5
6S = ${WORKDIR}/git
7
8PR = "r0"
9PV = "2.4.0+git${SRCREV}"
10
11LEAD_SONAME = "libdrm.so"
12
13inherit autotools pkgconfig
14
15do_stage() {
16 autotools_stage_all
17}
diff --git a/meta/packages/mesa/mesa-dri_7.2.bb b/meta/packages/mesa/mesa-dri_7.2.bb
index 76a51da382..c96863fd7a 100644
--- a/meta/packages/mesa/mesa-dri_7.2.bb
+++ b/meta/packages/mesa/mesa-dri_7.2.bb
@@ -5,7 +5,6 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
5 5
6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
7 7
8PE = "1"
9PR = "r4" 8PR = "r4"
10 9
11# most of our targets do not have DRI so will use mesa-xlib 10# most of our targets do not have DRI so will use mesa-xlib
diff --git a/meta/packages/mesa/mesa-dri_git.bb b/meta/packages/mesa/mesa-dri_git.bb
index 6aedeaa1c0..5bd5c7ad71 100644
--- a/meta/packages/mesa/mesa-dri_git.bb
+++ b/meta/packages/mesa/mesa-dri_git.bb
@@ -5,14 +5,20 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
5 5
6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" 6DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
7 7
8PV = "7.2+git${SRCREV}" 8PV = "7.3.0+git${SRCREV}"
9PR = "r2" 9PR = "r0"
10 10
11# most of our targets do not have DRI so will use mesa-xlib
11DEFAULT_PREFERENCE = "-1" 12DEFAULT_PREFERENCE = "-1"
12 13
14# ASUS EeePC 901 has DRI support so use mesa-dri by default
15DEFAULT_PREFERENCE_eee901 = "1"
16
13SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git" 17SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
14S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
15 19
20PACKAGES =+ "${PN}-xprogs"
21
16FILES_${PN} += "${libdir}/dri/*.so" 22FILES_${PN} += "${libdir}/dri/*.so"
17FILES_${PN}-dbg += "${libdir}/dri/.debug/*" 23FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
18 24
diff --git a/meta/packages/xorg-driver/xf86-input-keyboard_git.bb b/meta/packages/xorg-driver/xf86-input-keyboard_git.bb
new file mode 100644
index 0000000000..d17437db82
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-input-keyboard_git.bb
@@ -0,0 +1,9 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- keyboard input driver"
4
5PV = "1.3.1+git${SRCREV}"
6
7SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-keyboard;protocol=git"
8S = "${WORKDIR}/git"
9
diff --git a/meta/packages/xorg-driver/xf86-input-mouse_git.bb b/meta/packages/xorg-driver/xf86-input-mouse_git.bb
new file mode 100644
index 0000000000..e1b16788e8
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-input-mouse_git.bb
@@ -0,0 +1,9 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- mouse input driver"
4
5PV = "1.3.0+git${SRCREV}"
6
7SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-mouse;protocol=git"
8S = "${WORKDIR}/git"
9
diff --git a/meta/packages/xorg-driver/xf86-input-synaptics_git.bb b/meta/packages/xorg-driver/xf86-input-synaptics_git.bb
new file mode 100644
index 0000000000..0bd90eaa4f
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-input-synaptics_git.bb
@@ -0,0 +1,9 @@
1require xf86-input-common.inc
2
3DESCRIPTION = "X.Org X server -- keyboard input driver"
4
5PV = "0.15.2+git${SRCREV}"
6
7SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-input-synaptics;protocol=git"
8S = "${WORKDIR}/git"
9
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch b/meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch
new file mode 100755
index 0000000000..87c2a873eb
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-video-intel-dri2/002_avoid_duplicate_SaveHWState.patch
@@ -0,0 +1,12 @@
1diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c
2--- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-13 06:58:45.000000000 +0800
3+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c 2008-09-25 21:22:08.000000000 +0800
4@@ -1782,7 +1782,7 @@
5 return FALSE;
6
7 pI830 = I830PTR(pScrn);
8- pI830->SaveGeneration = -1;
9+ pI830->SaveGeneration = serverGeneration;
10 pI830->pEnt = pEnt;
11 pI830->use_drm_mode = drm_mode_setting;
12
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch b/meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch
new file mode 100755
index 0000000000..f8c214931e
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-video-intel-dri2/004_reduce_driver_boottime.patch
@@ -0,0 +1,95 @@
1diff -urN xf86-video-intel-2.5.96.0/src/i830_display.c xf86-video-intel-2.5.96.0.new/src/i830_display.c
2--- xf86-video-intel-2.5.96.0/src/i830_display.c 2008-09-11 05:10:10.000000000 +0800
3+++ xf86-video-intel-2.5.96.0.new/src/i830_display.c 2008-09-25 21:27:42.000000000 +0800
4@@ -376,7 +376,7 @@
5 i830WaitForVblank(ScrnInfoPtr pScreen)
6 {
7 /* Wait for 20ms, i.e. one cycle at 50hz. */
8- usleep(30000);
9+ usleep(21000);
10 }
11
12 void
13diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c
14--- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-25 21:23:52.000000000 +0800
15+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c 2008-09-25 21:30:13.000000000 +0800
16@@ -2293,7 +2293,7 @@
17 static void
18 i830_dpll_settle(void)
19 {
20- usleep(10000); /* 10 ms *should* be plenty */
21+ usleep(150); /* 10 ms *should* be plenty */
22 }
23
24 static Bool
25@@ -2315,14 +2315,12 @@
26 xf86OutputPtr output = xf86_config->output[i];
27 output->funcs->dpms(output, DPMSModeOff);
28 }
29- i830WaitForVblank(pScrn);
30
31 /* Disable pipes */
32 for (i = 0; i < xf86_config->num_crtc; i++) {
33 xf86CrtcPtr crtc = xf86_config->crtc[i];
34 crtc->funcs->dpms(crtc, DPMSModeOff);
35 }
36- i830WaitForVblank(pScrn);
37
38 if (IS_MOBILE(pI830) && !IS_I830(pI830))
39 OUTREG(LVDS, pI830->saveLVDS);
40@@ -2369,11 +2367,13 @@
41 OUTREG(FPA0, pI830->saveFPA0);
42 OUTREG(FPA1, pI830->saveFPA1);
43 OUTREG(DPLL_A, pI830->saveDPLL_A);
44+ POSTING_READ(DPLL_A);
45 i830_dpll_settle();
46 if (IS_I965G(pI830))
47 OUTREG(DPLL_A_MD, pI830->saveDPLL_A_MD);
48 else
49 OUTREG(DPLL_A, pI830->saveDPLL_A);
50+ POSTING_READ(DPLL_A);
51 i830_dpll_settle();
52
53 /* Restore mode config */
54@@ -2409,13 +2409,11 @@
55 DISPPLANE_SEL_PIPE_A) {
56 OUTREG(DSPACNTR, pI830->saveDSPACNTR);
57 OUTREG(DSPABASE, INREG(DSPABASE));
58- i830WaitForVblank(pScrn);
59 }
60 if ((pI830->saveDSPBCNTR & DISPPLANE_SEL_PIPE_MASK) ==
61 DISPPLANE_SEL_PIPE_A) {
62 OUTREG(DSPBCNTR, pI830->saveDSPBCNTR);
63 OUTREG(DSPBBASE, INREG(DSPBBASE));
64- i830WaitForVblank(pScrn);
65 }
66
67 /* See note about pipe programming above */
68@@ -2430,11 +2428,13 @@
69 OUTREG(FPB0, pI830->saveFPB0);
70 OUTREG(FPB1, pI830->saveFPB1);
71 OUTREG(DPLL_B, pI830->saveDPLL_B);
72+ POSTING_READ(DPLL_B);
73 i830_dpll_settle();
74 if (IS_I965G(pI830))
75 OUTREG(DPLL_B_MD, pI830->saveDPLL_B_MD);
76 else
77 OUTREG(DPLL_B, pI830->saveDPLL_B);
78+ POSTING_READ(DPLL_B);
79 i830_dpll_settle();
80
81 /* Restore mode config */
82@@ -2468,13 +2468,11 @@
83 DISPPLANE_SEL_PIPE_B) {
84 OUTREG(DSPACNTR, pI830->saveDSPACNTR);
85 OUTREG(DSPABASE, INREG(DSPABASE));
86- i830WaitForVblank(pScrn);
87 }
88 if ((pI830->saveDSPBCNTR & DISPPLANE_SEL_PIPE_MASK) ==
89 DISPPLANE_SEL_PIPE_B) {
90 OUTREG(DSPBCNTR, pI830->saveDSPBCNTR);
91 OUTREG(DSPBBASE, INREG(DSPBBASE));
92- i830WaitForVblank(pScrn);
93 }
94 }
95
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch b/meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch
new file mode 100755
index 0000000000..6cdeb3e70f
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-video-intel-dri2/005_disable_sdvo_TV_port_restoreHW.patch
@@ -0,0 +1,31 @@
1diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c
2--- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-25 21:32:45.000000000 +0800
3+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c 2008-09-25 21:34:19.000000000 +0800
4@@ -912,6 +912,7 @@
5 if (IS_MOBILE(pI830) && !IS_I830(pI830))
6 i830_lvds_init(pScrn);
7
8+#if 0
9 if (IS_I9XX(pI830)) {
10 if (INREG(SDVOB) & SDVO_DETECTED) {
11 Bool found = i830_sdvo_init(pScrn, SDVOB);
12@@ -931,7 +932,8 @@
13 }
14 if (IS_I9XX(pI830) && IS_MOBILE(pI830))
15 i830_tv_init(pScrn);
16-
17+#endif
18+
19 for (o = 0; o < config->num_output; o++)
20 {
21 xf86OutputPtr output = config->output[o];
22@@ -1612,7 +1614,9 @@
23 PreInitCleanup(pScrn);
24 return FALSE;
25 }
26+#if 0
27 RestoreHWState(pScrn);
28+#endif
29
30 /* XXX This should go away, replaced by xf86Crtc.c support for it */
31 pI830->rotation = RR_Rotate_0;
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch b/meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch
new file mode 100755
index 0000000000..b35e43f6ae
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-video-intel-dri2/006_disable_check_lvds_panelpower_status.patch
@@ -0,0 +1,29 @@
1diff -urN xf86-video-intel-2.5.96.0/src/i830_lvds.c xf86-video-intel-2.5.96.0.new/src/i830_lvds.c
2--- xf86-video-intel-2.5.96.0/src/i830_lvds.c 2008-09-01 05:27:39.000000000 +0800
3+++ xf86-video-intel-2.5.96.0.new/src/i830_lvds.c 2008-09-25 21:36:13.000000000 +0800
4@@ -404,10 +404,11 @@
5 dev_priv->backlight_duty_cycle = dev_priv->backlight_max;
6
7 OUTREG(PP_CONTROL, INREG(PP_CONTROL) | POWER_TARGET_ON);
8+#if 0
9 do {
10 pp_status = INREG(PP_STATUS);
11 } while ((pp_status & PP_ON) == 0);
12-
13+#endif
14 dev_priv->set_backlight(output, dev_priv->backlight_duty_cycle);
15 dev_priv->dpmsoff = FALSE;
16 } else {
17@@ -420,10 +421,11 @@
18 dev_priv->set_backlight(output, 0);
19
20 OUTREG(PP_CONTROL, INREG(PP_CONTROL) & ~POWER_TARGET_ON);
21+#if 0
22 do {
23 pp_status = INREG(PP_STATUS);
24 } while (pp_status & PP_ON);
25-
26+#endif
27 dev_priv->dpmsoff = TRUE;
28 }
29 }
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2/007_disable_tiling_and_enable_UXA.patch b/meta/packages/xorg-driver/xf86-video-intel-dri2/007_disable_tiling_and_enable_UXA.patch
new file mode 100755
index 0000000000..7f60295db2
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-video-intel-dri2/007_disable_tiling_and_enable_UXA.patch
@@ -0,0 +1,28 @@
1diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c
2--- xf86-video-intel-2.5.96.0/src/i830_driver.c 2008-09-27 18:19:07.000000000 +0800
3+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c 2008-09-27 18:20:13.000000000 +0800
4@@ -1511,12 +1511,12 @@
5 * for example. :)
6 */
7 if (!(pI830->accel == ACCEL_NONE)) {
8-#ifdef I830_USE_UXA
9- pI830->accel = ACCEL_UXA;
10-#endif
11 #ifdef I830_USE_EXA
12 pI830->accel = ACCEL_EXA;
13 #endif
14+#ifdef I830_USE_UXA
15+ pI830->accel = ACCEL_UXA;
16+#endif
17 #if I830_USE_XAA + I830_USE_EXA + I830_USE_UXA >= 2
18 from = X_DEFAULT;
19 if ((s = (char *)xf86GetOptValString(pI830->Options,
20@@ -3106,7 +3106,7 @@
21 #endif
22
23 /* Enable tiling by default */
24- pI830->tiling = TRUE;
25+ pI830->tiling = FALSE;
26
27 /* Allow user override if they set a value */
28 if (xf86IsOptionSet(pI830->Options, OPTION_TILING)) {
diff --git a/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb b/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb
new file mode 100644
index 0000000000..4df2b1cb08
--- /dev/null
+++ b/meta/packages/xorg-driver/xf86-video-intel-dri2_git.bb
@@ -0,0 +1,24 @@
1require xf86-video-common.inc
2
3DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
4DEPENDS += "virtual/libx11 libxvmc drm dri2proto glproto \
5 virtual/libgl xineramaproto libpciaccess"
6PROVIDES = "xf86-video-intel"
7
8PE = "1"
9PR = "r0"
10PV = "1.5.0+git${SRCREV}"
11
12SRC_URI = "git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel;protocol=git;branch=dri2 \
13 file://002_avoid_duplicate_SaveHWState.patch;patch=1 \
14 file://004_reduce_driver_boottime.patch;patch=1 \
15 file://005_disable_sdvo_TV_port_restoreHW.patch;patch=1 \
16 file://006_disable_check_lvds_panelpower_status.patch;patch=1 \
17 file://007_disable_tiling_and_enable_UXA.patch;patch=1"
18
19S = "${WORKDIR}/git"
20
21COMPATIBLE_HOST = '(i.86.*-linux)'
22
23EXTRA_OECONF = "--enable-dri --disable-static"
24
diff --git a/meta/packages/xorg-proto/dri2proto_1.99.1git.bb b/meta/packages/xorg-proto/dri2proto_1.99.1git.bb
new file mode 100644
index 0000000000..35b4e1f149
--- /dev/null
+++ b/meta/packages/xorg-proto/dri2proto_1.99.1git.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "DRI2 extension headers"
2
3require xorg-proto-common.inc
4
5PV = "1.99.1+git${SRCREV}"
6
7SRC_URI = "git://git.freedesktop.org/git/xorg/proto/dri2proto;protocol=git"
8S = "${WORKDIR}/git"
9
diff --git a/meta/packages/xorg-proto/inputproto-native_1.4.4.bb b/meta/packages/xorg-proto/inputproto-native_1.9.99.5git.bb
index b6ce61142f..b6ce61142f 100644
--- a/meta/packages/xorg-proto/inputproto-native_1.4.4.bb
+++ b/meta/packages/xorg-proto/inputproto-native_1.9.99.5git.bb
diff --git a/meta/packages/xorg-proto/inputproto-sdk_1.4.4.bb b/meta/packages/xorg-proto/inputproto-sdk_1.9.99.5git.bb
index f0e1985bf9..f0e1985bf9 100644
--- a/meta/packages/xorg-proto/inputproto-sdk_1.4.4.bb
+++ b/meta/packages/xorg-proto/inputproto-sdk_1.9.99.5git.bb
diff --git a/meta/packages/xorg-proto/inputproto_1.9.99.5git.bb b/meta/packages/xorg-proto/inputproto_1.9.99.5git.bb
new file mode 100644
index 0000000000..5c62eb44da
--- /dev/null
+++ b/meta/packages/xorg-proto/inputproto_1.9.99.5git.bb
@@ -0,0 +1,10 @@
1require xorg-proto-common.inc
2
3PR = "r1"
4PE = "1"
5PV = "1.9.99.5+git${SRCREV}"
6
7SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto;protocol=git"
8S = "${WORKDIR}/git"
9
10XORG_PN = "inputproto"
diff --git a/meta/packages/xorg-proto/renderproto-sdk_0.9.3.bb b/meta/packages/xorg-proto/renderproto-sdk_0.9.3.bb
new file mode 100644
index 0000000000..25ab90827f
--- /dev/null
+++ b/meta/packages/xorg-proto/renderproto-sdk_0.9.3.bb
@@ -0,0 +1,3 @@
1require renderproto_${PV}.bb
2
3inherit sdk
diff --git a/meta/packages/xorg-proto/renderproto_0.9.3.bb b/meta/packages/xorg-proto/renderproto_0.9.3.bb
new file mode 100644
index 0000000000..d4e0983a8b
--- /dev/null
+++ b/meta/packages/xorg-proto/renderproto_0.9.3.bb
@@ -0,0 +1,7 @@
1require xorg-proto-common.inc
2
3CONFLICTS = "renderext"
4PR = "r1"
5PE = "1"
6
7XORG_PN = "renderproto"
diff --git a/meta/packages/xorg-proto/xextproto-native_7.0.3.bb b/meta/packages/xorg-proto/xextproto-native_7.0.3.bb
new file mode 100644
index 0000000000..2529e62ca2
--- /dev/null
+++ b/meta/packages/xorg-proto/xextproto-native_7.0.3.bb
@@ -0,0 +1,3 @@
1require xextproto_${PV}.bb
2
3inherit native
diff --git a/meta/packages/xorg-proto/xextproto-sdk_7.0.3.bb b/meta/packages/xorg-proto/xextproto-sdk_7.0.3.bb
new file mode 100644
index 0000000000..3b182a02ff
--- /dev/null
+++ b/meta/packages/xorg-proto/xextproto-sdk_7.0.3.bb
@@ -0,0 +1,3 @@
1require xextproto_${PV}.bb
2
3inherit sdk
diff --git a/meta/packages/xorg-proto/inputproto_1.4.4.bb b/meta/packages/xorg-proto/xextproto_7.0.3.bb
index e3a8b09f2b..829d3cbe1e 100644
--- a/meta/packages/xorg-proto/inputproto_1.4.4.bb
+++ b/meta/packages/xorg-proto/xextproto_7.0.3.bb
@@ -3,4 +3,4 @@ require xorg-proto-common.inc
3PR = "r1" 3PR = "r1"
4PE = "1" 4PE = "1"
5 5
6XORG_PN = "inputproto" 6XORG_PN = "xextproto"
diff --git a/meta/packages/xorg-proto/xproto-native_7.0.13.bb b/meta/packages/xorg-proto/xproto-native_7.0.13.bb
new file mode 100644
index 0000000000..5dde8a7d4a
--- /dev/null
+++ b/meta/packages/xorg-proto/xproto-native_7.0.13.bb
@@ -0,0 +1,3 @@
1require xproto_${PV}.bb
2
3inherit native
diff --git a/meta/packages/xorg-proto/xproto-sdk_7.0.13.bb b/meta/packages/xorg-proto/xproto-sdk_7.0.13.bb
new file mode 100644
index 0000000000..1c1a934bb0
--- /dev/null
+++ b/meta/packages/xorg-proto/xproto-sdk_7.0.13.bb
@@ -0,0 +1,3 @@
1require xproto_${PV}.bb
2
3inherit sdk
diff --git a/meta/packages/xorg-proto/xproto_7.0.13.bb b/meta/packages/xorg-proto/xproto_7.0.13.bb
new file mode 100644
index 0000000000..1adf55d97a
--- /dev/null
+++ b/meta/packages/xorg-proto/xproto_7.0.13.bb
@@ -0,0 +1,6 @@
1require xorg-proto-common.inc
2
3PR = "r1"
4PE = "1"
5
6XORG_PN = "xproto"
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc
index 6caf889d1d..227be4ec0c 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite.inc
@@ -1,8 +1,6 @@
1require xserver-xf86-common.inc 1require xserver-xf86-common.inc
2 2
3PROVIDES += "xserver-xf86-dri-lite" 3PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
4
5PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto xf86driproto dri2proto"
6 4
7LIB_DEPS = "pixman mesa-dri libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl" 5LIB_DEPS = "pixman mesa-dri libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
8 6
@@ -12,24 +10,28 @@ RDEPENDS = "hal xorg-minimal-fonts"
12 10
13FILES_${PN} += "${bindir}/Xorg " 11FILES_${PN} += "${bindir}/Xorg "
14 12
15EXTRA_OECONF += "--disable-cfb \ 13EXTRA_OECONF += "--disable-static \
16 --disable-afb \ 14 --disable-acfb \
17 --disable-mfb \ 15 --disable-ccfb \
16 --disable-mcfb \
18 --disable-dga \ 17 --disable-dga \
19 --disable-xinerama \ 18 --disable-xinerama \
20 --disable-xf86misc \ 19 --disable-xf86misc \
21 --disable-xorgcfg \ 20 --disable-xorgcfg \
21 --disable-record \
22 --disable-dmx \ 22 --disable-dmx \
23 --disable-xnest \ 23 --disable-xnest \
24 --disable-xvfb \ 24 --disable-xvfb \
25 --enable-composite \ 25 --enable-composite \
26 --enable-dri \
27 --enable-glx-tls \ 26 --enable-glx-tls \
28 --sysconfdir=/etc/X11 \ 27 --sysconfdir=/etc/X11 \
29 --localstatedir=/var \ 28 --localstatedir=/var \
29 --with-pic \
30 --with-int10=x86emu \
30 --with-fontdir=/usr/share/fonts/X11 \ 31 --with-fontdir=/usr/share/fonts/X11 \
31 --with-xkb-output=/var/lib/xkb \ 32 --with-xkb-output=/var/lib/xkb \
32 ac_cv_file__usr_share_sgml_X11_defs_ent=no" 33 ac_cv_file__usr_share_sgml_X11_defs_ent=no"
33 34
34# Due to mesa-dri 35# Due to mesa-dri
35COMPATIBLE_HOST = '(i.86.*-linux)' 36COMPATIBLE_HOST = '(i.86.*-linux)'
37
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
new file mode 100644
index 0000000000..565832eed8
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
@@ -0,0 +1,13 @@
1Index: git/os/osdep.h
2===================================================================
3--- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100
4+++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100
5@@ -92,7 +92,7 @@
6 * like sysconf(_SC_OPEN_MAX) is not supported.
7 */
8
9-#if OPEN_MAX <= 256
10+#if 0
11 #define MAXSOCKS (OPEN_MAX - 1)
12 #else
13 #define MAXSOCKS 256
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg-server-disable-dri_sarea.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg-server-disable-dri_sarea.patch
new file mode 100755
index 0000000000..3d2fa1669a
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg-server-disable-dri_sarea.patch
@@ -0,0 +1,12 @@
1diff -urN xorg-server-1.5.99.1/hw/xfree86/dri2/dri2.c xorg-server-1.5.99.1.new/hw/xfree86/dri2/dri2.c
2--- xorg-server-1.5.99.1/hw/xfree86/dri2/dri2.c 2008-09-01 03:26:37.000000000 +0800
3+++ xorg-server-1.5.99.1.new/hw/xfree86/dri2/dri2.c 2008-09-18 00:28:16.000000000 +0800
4@@ -39,7 +39,7 @@
5 #include "scrnintstr.h"
6 #include "windowstr.h"
7 #include "dri2.h"
8-#include <GL/internal/dri_sarea.h>
9+//#include <GL/internal/dri_sarea.h>
10
11 #include "xf86.h"
12
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg-server-enable-dri2.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg-server-enable-dri2.patch
new file mode 100755
index 0000000000..7ff3658d0c
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xorg-server-enable-dri2.patch
@@ -0,0 +1,23 @@
1commit 67b9b3a77a8b86eef03af36a0f4be3a07411efee
2Author: Eric Anholt <eric@anholt.net>
3Date: Thu Sep 11 16:18:17 2008 -0700
4
5 Enable DRI2 build.
6
7diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
8index eff2c31..98d7ec8 100644
9--- a/hw/xfree86/Makefile.am
10+++ b/hw/xfree86/Makefile.am
11@@ -4,9 +4,9 @@ if DRI
12 DRI_SUBDIR = dri
13 endif
14
15-#if DRI2
16-#DRI2_SUBDIR = dri2
17-#endif
18+if DRI2
19+DRI2_SUBDIR = dri2
20+endif
21
22 if XF86UTILS
23 XF86UTILS_SUBDIR = utils
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch
new file mode 100755
index 0000000000..8e4033e9a3
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite/xserver-boottime.patch
@@ -0,0 +1,37 @@
1diff --git a/os/log.c b/os/log.c
2index 0860847..2c46f1a 100644
3--- a/os/log.c
4+++ b/os/log.c
5@@ -255,6 +255,32 @@ LogVWrite(int verb, const char *f, va_list args)
6 static char tmpBuffer[1024];
7 int len = 0;
8
9+ struct timeval time;
10+ time_t tv_sec;
11+ suseconds_t tv_usec;
12+ static Bool first = TRUE;
13+ static time_t start_tv_sec;
14+ static suseconds_t start_usec;
15+ int diff_sec, diff_usec;
16+
17+ gettimeofday(&time, NULL);
18+ tv_sec = time.tv_sec;
19+ tv_usec = time.tv_usec;
20+ if (first == TRUE) {
21+ start_tv_sec = tv_sec;
22+ start_usec = tv_usec;
23+ first = FALSE;
24+ }
25+ diff_sec = (int)difftime(tv_sec, start_tv_sec);
26+ diff_usec = (tv_usec - start_usec);
27+ if (diff_usec < 0) {
28+ diff_sec--;
29+ diff_usec += 1000000;
30+ }
31+ sprintf(tmpBuffer, "[%d sec: %06d usec]", diff_sec , diff_usec);
32+ len = strlen(tmpBuffer);
33+ fwrite(tmpBuffer, len, 1, logFile);
34+
35 /*
36 * Since a va_list can only be processed once, write the string to a
37 * buffer, and then write the buffer out to the appropriate output
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
index bc5aa493e5..c9bd3f9fbe 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.5.0.bb
@@ -3,6 +3,10 @@ require xserver-xf86-dri-lite.inc
3PE = "1" 3PE = "1"
4PR = "r3" 4PR = "r3"
5 5
6PROTO_DEPS += "xf86driproto"
7
6SRC_URI += "file://drmfix.patch;patch=1 \ 8SRC_URI += "file://drmfix.patch;patch=1 \
7 file://libdri-xinerama-symbol.patch;patch=1 " 9 file://libdri-xinerama-symbol.patch;patch=1 "
8 10
11EXTRA_OECONF += "--enable-dri"
12
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
index e45702664b..39e286570e 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -4,8 +4,17 @@ PE = "1"
4PR = "r2" 4PR = "r2"
5PV = "1.5.0+git${SRCREV}" 5PV = "1.5.0+git${SRCREV}"
6 6
7PROTO_DEPS += "xf86driproto"
8
7DEFAULT_PREFERENCE = "-1" 9DEFAULT_PREFERENCE = "-1"
8 10
9SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git \ 11SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git \
12 file://xorg.conf \
10 file://libdri-xinerama-symbol.patch;patch=1" 13 file://libdri-xinerama-symbol.patch;patch=1"
11 14
15# Misc build failure for master HEAD
16SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"
17
18EXTRA_OECONF += "--enable-dri"
19
20S = "${WORKDIR}/git"