x11-drivers/xf86-video-intel: add patch to fix bug on DRI1-only servers (fdo bug #20325)

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 35 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index e9f0ffcb93f8..b99bcb65683b 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.13 2009/02/26 23:22:30 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.14 2009/02/28 10:38:34 remi Exp $
+
+  28 Feb 2009; Rémi Cardona <remi@gentoo.org>
+  +files/2.6.2-0002-Disable-fb-resizing-for-DRI1-only-server-so-that-DRI.pat
+  ch, xf86-video-intel-2.6.2.ebuild:
+  add patch to fix bug on DRI1-only servers (fdo bug #20325)
 
 *xf86-video-intel-2.6.2 (26 Feb 2009)
 
diff --git a/x11-drivers/xf86-video-intel/files/2.6.2-0002-Disable-fb-resizing-for-DRI1-only-server-so-that-DRI.patch b/x11-drivers/xf86-video-intel/files/2.6.2-0002-Disable-fb-resizing-for-DRI1-only-server-so-that-DRI.patch
new file mode 100644
index 000000000000..c1a9b3941060
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.6.2-0002-Disable-fb-resizing-for-DRI1-only-server-so-that-DRI.patch
@@ -0,0 +1,27 @@
+From 70e0261208654c6c875ad462da2734c6aa9eeb96 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Tue, 24 Feb 2009 20:54:05 -0800
+Subject: [PATCH] Disable fb resizing for DRI1-only server so that DRI1 can initialize.
+
+---
+ src/i830_driver.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/i830_driver.c b/src/i830_driver.c
+index 2461e8a..1506ea7 100644
+--- a/src/i830_driver.c
++++ b/src/i830_driver.c
+@@ -1684,6 +1684,10 @@ I830AccelMethodInit(ScrnInfoPtr pScrn)
+     pI830->can_resize = FALSE;
+     if (pI830->accel == ACCEL_UXA && pI830->directRenderingType != DRI_XF86DRI)
+ 	pI830->can_resize = TRUE;
++#if !defined(DRI2) && defined(XF86DRI)
++    /* Disable resizing so that DRI1 can initialize and give us GEM support. */
++    pI830->can_resize = FALSE;
++#endif
+ 
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ 	       "Resizable framebuffer: %s (%d %d)\n",
+-- 
+1.6.1.3
+
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.2.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.2.ebuild
index eb1168d3914b..2e923168569c 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.2.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.2.ebuild,v 1.1 2009/02/26 23:22:30 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.6.2.ebuild,v 1.2 2009/02/28 10:38:34 remi Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -31,4 +31,5 @@ CONFIGURE_OPTIONS="$(use_enable dri)"
 
 PATCHES=(
 "${FILESDIR}/${PV}-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch"
+"${FILESDIR}/${PV}-0002-Disable-fb-resizing-for-DRI1-only-server-so-that-DRI.patch"
 )