File n_xf86-video-intel-2.9.1_fix-compilation-on-xserver-1.10.patch of Package xorg-x11-driver-video-intel-legacy

Author: Stefan Dirsch <sndirsch@suse.com>
Subject: intellegacy: fix compilation on xserver >= 1.10

Fix the build the same way as it has been fixed for radeon driver
via git commit 0f18463.

--- xf86-video-intel-2.9.1/src/i830_driver.c.orig	2011-09-08 09:43:03.000000000 +0000
+++ xf86-video-intel-2.9.1/src/i830_driver.c	2011-09-08 09:50:17.000000000 +0000
@@ -904,10 +904,12 @@
 				   width, height, -1, -1, scrn->displayWidth * i830->cpp,
 				   i830->FbBase + scrn->fbOffset);
 
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,9,99,1,0)
 	/* ick. xf86EnableDisableFBAccess smashes the screen pixmap devPrivate,
 	 * so update the value it uses
 	 */
 	scrn->pixmapPrivate.ptr = i830->FbBase + scrn->fbOffset;
+#endif
 	xf86DrvMsg(scrn->scrnIndex, X_INFO, "New front buffer at 0x%lx\n",
 		   i830->front_buffer->offset);
 	i830_set_new_crtc_bo(scrn);
openSUSE Build Service is sponsored by