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)
Package-Manager: portage-2.1.2_pre3-r5

4 files changed, 84 insertions, 20 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/Manifest b/x11-drivers/xf86-video-i810/Manifest
index b8aba199010f..e9ae8f87206f 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 1.6.5-fix_no_dri.patch 1236 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1 SHA1 60f13aad5aa5f2a199ebc4b38ff468df9728ce5d SHA256 5b560f31a70b1998749e6cbcbfb6d7a94d3f9caf9ca4dad147662bc6eeb344da
+MD5 2208ca768eace896ac5d3a762c3045c8 files/1.6.5-fix_no_dri.patch 1236
+RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1 files/1.6.5-fix_no_dri.patch 1236
+SHA256 5b560f31a70b1998749e6cbcbfb6d7a94d3f9caf9ca4dad147662bc6eeb344da files/1.6.5-fix_no_dri.patch 1236
 AUX 1.7.0-fix_vt_switch.patch 848 RMD160 8511bc7ceaf2875f71f04d260dda7d19dd8d5f76 SHA1 8c9764a1e1e47962948c931bb13d9470621bc56b SHA256 dbd1cf7b7ee7708c87bc4530a532e42afb4ecd463e9360c19a23468b8c26fa66
 MD5 6165a88de78a474999380c4f0ee4b4a8 files/1.7.0-fix_vt_switch.patch 848
 RMD160 8511bc7ceaf2875f71f04d260dda7d19dd8d5f76 files/1.7.0-fix_vt_switch.patch 848
@@ -24,10 +25,10 @@ EBUILD xf86-video-i810-1.6.0.ebuild 849 RMD160 5b9f8b9700b241350297286e7e19ffcfe
 MD5 f20143caa9be8cd1a7f0b17d762672fe xf86-video-i810-1.6.0.ebuild 849
 RMD160 5b9f8b9700b241350297286e7e19ffcfe7f7c0f1 xf86-video-i810-1.6.0.ebuild 849
 SHA256 2752bca66ef053b9a56737704a39b0bfeaebd949a09356c52d20f569ec8ffd6d xf86-video-i810-1.6.0.ebuild 849
-EBUILD xf86-video-i810-1.6.5.ebuild 850 RMD160 d253dcf3a6c039030a58649891b5b58452b30233 SHA1 b7320996b519c53705ef36d67a7274a8d96f6c8d SHA256 92cd76de634855d7f647991496cf82bd167742a6bb131b3146b3fd8969db7d61
-MD5 131cc540557faef73072504dfa321c30 xf86-video-i810-1.6.5.ebuild 850
-RMD160 d253dcf3a6c039030a58649891b5b58452b30233 xf86-video-i810-1.6.5.ebuild 850
-SHA256 92cd76de634855d7f647991496cf82bd167742a6bb131b3146b3fd8969db7d61 xf86-video-i810-1.6.5.ebuild 850
+EBUILD xf86-video-i810-1.6.5.ebuild 903 RMD160 b0f667881f34ec0aaf6c84c4722343aa80e8357c SHA1 f6cdec5ac5fb797f1bf20850d279762a4c450a65 SHA256 b67b560d633cfc290a494b0f0e277f81d063e6319c8f38fa0fd41aca67ab3c2a
+MD5 35d476c58747ff01769dc65ecd1264d2 xf86-video-i810-1.6.5.ebuild 903
+RMD160 b0f667881f34ec0aaf6c84c4722343aa80e8357c xf86-video-i810-1.6.5.ebuild 903
+SHA256 b67b560d633cfc290a494b0f0e277f81d063e6319c8f38fa0fd41aca67ab3c2a xf86-video-i810-1.6.5.ebuild 903
 EBUILD xf86-video-i810-1.7.0-r1.ebuild 916 RMD160 bb6f1d322b748033c3fe0f718979fe73bebe8467 SHA1 c68c88243982883f6203a1dd214e59cb8d44bab6 SHA256 6a248679b5e53e3db146b20476d2d9f41c5d7606f62fa32577a84c7f502fe0a1
 MD5 5c37f590426865462d7a2f7c3174fe3c xf86-video-i810-1.7.0-r1.ebuild 916
 RMD160 bb6f1d322b748033c3fe0f718979fe73bebe8467 xf86-video-i810-1.7.0-r1.ebuild 916
@@ -36,10 +37,10 @@ EBUILD xf86-video-i810-1.7.2.ebuild 866 RMD160 5fa3cc0da63b7591af92e34b630219aee
 MD5 f71186581906cfee7991c69d5cd6c64c xf86-video-i810-1.7.2.ebuild 866
 RMD160 5fa3cc0da63b7591af92e34b630219aee71bac66 xf86-video-i810-1.7.2.ebuild 866
 SHA256 a356bb7d8046bd9489eb787f0dbe0f0144d1a0a56df9ac1e2e22e2f9f33ff873 xf86-video-i810-1.7.2.ebuild 866
-MISC ChangeLog 7271 RMD160 479efc0e8a48df0202b67c4b9fd73674a19640bb SHA1 c05f5f1671a462b81b7f80b6b497a3cf087f9b18 SHA256 bb883fc4aca57d52740029bae37e13389430a3f51e0d6794b65744172c0051e9
-MD5 f99a394511b270af311a6bf1eb8c7886 ChangeLog 7271
-RMD160 479efc0e8a48df0202b67c4b9fd73674a19640bb ChangeLog 7271
-SHA256 bb883fc4aca57d52740029bae37e13389430a3f51e0d6794b65744172c0051e9 ChangeLog 7271
+MISC ChangeLog 7568 RMD160 1f464c9f7d7d7dde179a7cd98df45a51408fcde1 SHA1 241939b237baeaa45f42f081e84cb820670ab063 SHA256 999398e2072877d95142acd3c984f2ba409794f22d019ce080a3fa45578e504a
+MD5 f0e6eb246da353465fa0bd580925d725 ChangeLog 7568
+RMD160 1f464c9f7d7d7dde179a7cd98df45a51408fcde1 ChangeLog 7568
+SHA256 999398e2072877d95142acd3c984f2ba409794f22d019ce080a3fa45578e504a ChangeLog 7568
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -59,10 +60,3 @@ SHA256 0feb02fc2e0b9148fb98ca3508c0de95fc584fd95b4528f77fd809e8e655b379 files/di
 MD5 1442a3c003c4fa6e8e0b9b337f3890f6 files/digest-xf86-video-i810-1.7.2 524
 RMD160 7fffcb711ea528a547e75b0208cc9479a8139ea4 files/digest-xf86-video-i810-1.7.2 524
 SHA256 4fbdc824f551bf048f8e99bd7bf0ac15937ec97427355c04f9f2540b3af7c84b files/digest-xf86-video-i810-1.7.2 524
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFMUuTamhnQswr0vIRAvNHAJwMkfQgZ4MdUIa22ovQhLhYMAPiqwCgjjsQ
-7NZ9BEfVa6kCGCzWfyOge/k=
-=MCTt
------END PGP SIGNATURE-----
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."