[arch-commits] CVS update of extra/x11-drivers/xf86-video-intel (1 file)

[Jan de Groot]

    Date: Sunday, March 16, 2008 @ 17:17:41
  Author: jgc
    Path: /home/cvs-extra/extra/x11-drivers/xf86-video-intel

Modified: 01_fix_compiz_video.diff (1.2 -> 1.3)

upgpkg: xf86-video-intel 2.2.1-2
    Add patch again


--------------------------+
 01_fix_compiz_video.diff |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)


Index: extra/x11-drivers/xf86-video-intel/01_fix_compiz_video.diff
diff -u /dev/null extra/x11-drivers/xf86-video-intel/01_fix_compiz_video.diff:1.3
--- /dev/null	Sun Mar 16 17:17:41 2008
+++ extra/x11-drivers/xf86-video-intel/01_fix_compiz_video.diff	Sun Mar 16 17:17:41 2008
@@ -0,0 +1,34 @@
+Index: xserver-xorg-video-intel-2.1.1/src/i810_video.c
+===================================================================
+--- xserver-xorg-video-intel-2.1.1.orig/src/i810_video.c	2007-10-12 13:38:10.000000000 +0100
++++ xserver-xorg-video-intel-2.1.1/src/i810_video.c	2007-10-12 13:38:39.000000000 +0100
+@@ -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 */
+Index: xserver-xorg-video-intel-2.1.1/src/i830_video.c
+===================================================================
+--- xserver-xorg-video-intel-2.1.1.orig/src/i830_video.c	2007-10-12 13:38:10.000000000 +0100
++++ xserver-xorg-video-intel-2.1.1/src/i830_video.c	2007-10-12 13:39:03.000000000 +0100
+@@ -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,