--- xserver-xorg-video-intel-2.1.1.orig/debian/patches/series	2007-10-10 12:05:06.000000000 +0200
+++ xserver-xorg-video-intel-2.1.1/debian/patches/series	2007-10-10 10:24:23.000000000 +0200
@@ -1,4 +1,3 @@
-01_fix_compiz_video.diff
 02_xps1330_tvout_quirk.diff
 03_fix_brightness_control.diff
 04-fix-g33-gtt-stolen-mem-range.diff
--- xserver-xorg-video-intel-2.1.1.orig/debian/patches/01_fix_compiz_video.diff	2007-10-10 12:05:06.000000000 +0200
+++ xserver-xorg-video-intel-2.1.1/debian/patches/01_fix_compiz_video.diff	1970-01-01 01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
---- xserver-xorg-video-intel-2.1.0.orig/src/i810_video.c
-+++ xserver-xorg-video-intel-2.1.0/src/i810_video.c
-@@ -1087,7 +1087,7 @@
-     if(!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
- 	REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
- 	/* draw these */
--	xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey, clipBoxes);
-+	xf86XVFillKeyHelperDrawable(pDraw, pPriv->colorKey, clipBoxes);
-     }
- 
-     I810DisplayVideo(pScrn, id, width, height, dstPitch, 
-@@ -1381,7 +1381,7 @@
- 		     surface->pitches[0], x1, y1, x2, y2, &dstBox,
- 		     src_w, src_h, drw_w, drw_h);
- 
--    xf86XVFillKeyHelper(pScrn->pScreen, pI810Priv->colorKey, clipBoxes);
-+    xf86XVFillKeyHelperDrawable(pScrn->pScreen, pI810Priv->colorKey, clipBoxes);
- 
-     pPriv->isOn = TRUE;
-     /* we've prempted the XvImage stream so set its free timer */
---- xserver-xorg-video-intel-2.1.1.orig/src/i830_video.c
-+++ xserver-xorg-video-intel-2.1.1/src/i830_video.c
-@@ -569,8 +569,12 @@
-     /* Set up textured video if we can do it at this depth and we are on
-      * supported hardware.
-      */
-+#if 0
-     if (pScrn->bitsPerPixel >= 16 && (IS_I9XX(pI830) || IS_I965G(pI830)) &&
- 	!(!IS_I965G(pI830) && pScrn->displayWidth > 2048))
-+#endif
-+    if (pScrn->bitsPerPixel >= 16 && IS_I965G(pI830) &&
-+	!(!IS_I965G(pI830) && pScrn->displayWidth > 2048))
-     {
- 	texturedAdaptor = I830SetupImageVideoTextured(pScreen);
- 	if (texturedAdaptor != NULL) {
-@@ -2486,7 +2490,8 @@
-     }
- #endif
- 
--    if (((char *)pPixmap->devPrivate.ptr < (char *)pI830->FbBase) ||
-+    if (pPriv->textured &&
-+	((char *)pPixmap->devPrivate.ptr < (char *)pI830->FbBase) ||
- 	((char *)pPixmap->devPrivate.ptr >= (char *)pI830->FbBase +
- 	 pI830->FbMapSize)) {
- 	/* If the pixmap wasn't in framebuffer, then we have no way in XAA to
-@@ -2504,6 +2509,7 @@
- 	if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
- 	    REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
- 	    i830_fill_colorkey (pScreen, pPriv->colorKey, clipBoxes);
-+	    xf86XVFillKeyHelperDrawable(pDraw, pPriv->colorKey, clipBoxes);
- 	}
-     } else if (IS_I965G(pI830)) {
- 	I965DisplayVideoTextured(pScrn, pPriv, destId, clipBoxes, width, height,