Add upstream's patch to allow building without dri support. This patch is

included in versions newer than 1.6.5 (1.7+).  (Bug #151347, Stan Behrens for
the report)
(Portage version: 2.1.2_pre3-r5)

3 files changed, 72 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index f3ca8b7dc270..2dfead1a3e72 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-i810
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.41 2006/10/14 18:25:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.42 2006/10/19 00:22:58 joshuabaergen Exp $
+
+  19 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.6.5-fix_no_dri.patch, xf86-video-i810-1.6.5.ebuild:
+  Add upstream's patch to allow building without dri support.  This patch is
+  included in versions newer than 1.6.5 (1.7+).  (Bug #151347, Stan Behrens for
+  the report)
 
   14 Oct 2006; Aron Griffis <agriffis@gentoo.org>
   xf86-video-i810-1.6.5.ebuild:
diff --git a/x11-drivers/xf86-video-i810/files/1.6.5-fix_no_dri.patch b/x11-drivers/xf86-video-i810/files/1.6.5-fix_no_dri.patch
new file mode 100644
index 000000000000..6d2b98955e33
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/1.6.5-fix_no_dri.patch
@@ -0,0 +1,62 @@
+--- src/i830_accel.c
++++ src/i830_accel.c
+@@ -395,6 +395,7 @@ I830AccelInit(ScreenPtr pScreen)
+    return XAAInit(pScreen, infoPtr);
+ }
+ 
++#ifdef XF86DRI
+ static unsigned int
+ CheckTiling(ScrnInfoPtr pScrn)
+ {
+@@ -416,6 +417,9 @@ CheckTiling(ScrnInfoPtr pScrn)
+ 
+    return tiled;
+ }
++#else
++#define CheckTiling(pScrn) 0
++#endif
+ 
+ void
+ I830SetupForSolidFill(ScrnInfoPtr pScrn, int color, int rop,
+--- src/i810_driver.c
++++ src/i810_driver.c
+@@ -333,6 +333,8 @@ const char *I810driSymbols[] = {
+    NULL
+ };
+ 
++#endif /* I830_ONLY */
++
+ const char *I810shadowSymbols[] = {
+     "shadowInit",
+     "shadowSetup",
+@@ -340,8 +342,6 @@ const char *I810shadowSymbols[] = {
+     NULL
+ };
+ 
+-#endif /* I830_ONLY */
+-
+ #ifndef I810_DEBUG
+ int I810_DEBUG = (0
+ /*                | DEBUG_ALWAYS_SYNC  */
+@@ -408,9 +408,9 @@ i810Setup(pointer module, pointer opts, 
+ #ifdef XF86DRI
+ 			I810drmSymbols,
+ 			I810driSymbols,
++#endif
+ 			I810shadowSymbols,
+ 			I810shadowFBSymbols,
+-#endif
+ 			I810vbeSymbols, vbeOptionalSymbols,
+ 			I810ddcSymbols, I810int10Symbols, NULL);
+ 
+--- src/brw_structs.h
++++ src/brw_structs.h
+@@ -28,6 +28,8 @@
+ #ifndef BRW_STRUCTS_H
+ #define BRW_STRUCTS_H
+
++#include <GL/gl.h>
++
+ /* Command packets:
+  */
+ struct header 
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.5.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.5.ebuild
index 8a6878de45e2..f791dd0e1d4a 100644
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.5.ebuild
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.5.ebuild,v 1.4 2006/10/14 20:41:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.5.ebuild,v 1.5 2006/10/19 00:22:58 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 
 CONFIGURE_OPTIONS="$(use_enable dri)"
 
+PATCHES="${FILESDIR}/1.6.5-fix_no_dri.patch"
+
 pkg_setup() {
 	if use dri && ! built_with_use x11-base/xorg-server dri; then
 		die "Build x11-base/xorg-server with USE=dri."