diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-10-19 00:22:58 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-10-19 00:22:58 +0000 |
| commit | 86a9e9230e90471eddea2179657bc5fdfc7d2d99 (patch) | |
| tree | ea007c2ac4b2719526af092a71fd6dd0924196ec /x11-drivers/xf86-video-i810/files | |
| parent | minor QA: IUSE wrt bug #150083 (diff) | |
| download | historical-86a9e9230e90471eddea2179657bc5fdfc7d2d99.tar.gz historical-86a9e9230e90471eddea2179657bc5fdfc7d2d99.tar.bz2 historical-86a9e9230e90471eddea2179657bc5fdfc7d2d99.zip | |
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
Diffstat (limited to 'x11-drivers/xf86-video-i810/files')
| -rw-r--r-- | x11-drivers/xf86-video-i810/files/1.6.5-fix_no_dri.patch | 62 |
1 files changed, 62 insertions, 0 deletions
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 |