Add patch to fix screen corruption, bug #391819.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

4 files changed, 43 insertions, 4 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 432f8613ecf1..2d16ad5c19df 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.76 2011/11/17 17:45:18 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.77 2011/11/25 23:30:18 chithanh Exp $
+
+*xf86-video-intel-2.17.0-r1 (25 Nov 2011)
+
+  25 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -xf86-video-intel-2.17.0.ebuild, +xf86-video-intel-2.17.0-r1.ebuild,
+  +files/xf86-video-intel-2.17-sna-offsets.patch:
+  Add patch to fix screen corruption, bug #391819.
 
 *xf86-video-intel-2.17.0 (17 Nov 2011)
 
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 73e0234ecd37..cba5f927e477 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,6 +1,7 @@
 AUX 2.10.0-0001-Extract-pixel-value-for-all-formats-to-avoid-hitting.patch 3943 RMD160 edfc2294341ff7c314e87e82ec95ceff920585ca SHA1 b1c9bcfe6b48a0f7426fbdb3c862a121f81a58e7 SHA256 53694b0c147834067b90be1508e96f67d290de595516361c98af069ae6cd9113
 AUX xf86-video-intel-2.15-batch-overrun.patch 882 RMD160 203f4f92a7bffef0f900ccc8f5c81cd69a975dcb SHA1 fc3f100a57dc52c06b7f2109aba774bb3abcef93 SHA256 5044689aaefa4c3416c8e8d70d0765b8b149a8352b3992cb405d3a280d9f495f
 AUX xf86-video-intel-2.15-unsigned-promotion.patch 1207 RMD160 19b3eb510411d1c0d70df793b7d1525828c4035d SHA1 5505becb9bea0391d6441aa070ade16dc01f48d8 SHA256 c61713af565c8ce55d4c00dbfe24380ed6952698df1bf3070813db953b979102
+AUX xf86-video-intel-2.17-sna-offsets.patch 1062 RMD160 23f2a6038b00421d5d88433e69cd5af47731fd9b SHA1 268d7801436cac6921d016d4c755a8670a9f31ba SHA256 26ad750c57220a11875ebf4bb1665cf748c9da12af9c0eade12609559de06041
 DIST xf86-video-intel-2.10.0.tar.bz2 885299 RMD160 e37d47758231d61d99fa65873884727b44623c33 SHA1 1683eddf89ed88f109cb2fe46284e3f8f304a0d9 SHA256 e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab
 DIST xf86-video-intel-2.11.0.tar.bz2 871551 RMD160 a857942e7eacd9e7c517c485fb6e400103e238f3 SHA1 f25eb8619ac7c107fdcee525388a8a03dd62719b SHA256 db292cbc25f3b132357795697a61c5ec6f08cb041a2cb6fd081298306f4f5a4f
 DIST xf86-video-intel-2.13.0.tar.bz2 917026 RMD160 565c3b58938ac392d7a4322ba51aabdc9e229606 SHA1 1b2aebd444bcfc371a55af8910eb4d5928eab5c9 SHA256 d8b2fae8d0c4ae372994cb7df8de8aa995b8e89b1bc5766c53ea0751752fc887
@@ -16,8 +17,8 @@ EBUILD xf86-video-intel-2.13.0.ebuild 1363 RMD160 b298e5314ea68e77c783b58d54f58f
 EBUILD xf86-video-intel-2.14.0.ebuild 1363 RMD160 79ee67e89f8315e9659db2d04c3b11e5ea428c33 SHA1 0eeb6467fd552adc526f0624f9173faf381c9897 SHA256 2f39c7cb5763dbe2206533bcf7df2dfb22dd70dd0e7c2253ecfdf428381c5c7e
 EBUILD xf86-video-intel-2.15.0-r1.ebuild 1273 RMD160 56d437abd6bcd7e48aa0b7c65fe9ea95993ac77f SHA1 e981a9a15d809d18bed2376f9c823cb775553bea SHA256 20a844125ed83f0e00eceda9d83562ccb12d31e0131a1263bdc8c8be4f68a59b
 EBUILD xf86-video-intel-2.16.0.ebuild 1234 RMD160 dbb8179ee3add4d8fb87f9a03ca4e4e2feea0b9b SHA1 6c69aad59f414688c3d28277987b4382dacbd167 SHA256 40fdcf06bb64a44208034b4f1723a80756dd46bd72cb1ef56a27589af26e0abf
-EBUILD xf86-video-intel-2.17.0.ebuild 1297 RMD160 2e5eb1578cbf57c532a1867f41553951ddd68182 SHA1 0989cfd66c655d90334a5833d64737477b077401 SHA256 4bb6b82302c10b34e1b2650809584ba35178e5e80cb8ec1e7f1f342540e61918
+EBUILD xf86-video-intel-2.17.0-r1.ebuild 1300 RMD160 c755ab9ccf56a44309edd005448c466a49f41f2a SHA1 ba12b2ba504221d7181c56a5990835622e10662d SHA256 eeec5ed2ac2b7e40a220d9f31c7ca2256f0397fe3d829a8f16be46da006ea94d
 EBUILD xf86-video-intel-2.8.1.ebuild 810 RMD160 f516c452a6b13354529fa47a93fe3bfabb77e4a0 SHA1 a5764d81c92ed60cedce493dc5a1770d156e0779 SHA256 e022006015034d3c2481a670df34668ae48a82fe12d5c6476e72aa21ede0453f
 EBUILD xf86-video-intel-2.9.1.ebuild 791 RMD160 f484b870054546af768f122e86787540a653c471 SHA1 86d4e85846eb9c22073210bb16beb21c073e5603 SHA256 a324cb9bcb34cb8d05b749052d3253230f04e8f7c4f4ac7ccd53615130a9b170
-MISC ChangeLog 43107 RMD160 8caae375e3bc15d753d277da991cbfc06fec7d92 SHA1 cba6e17d000cd39955e6d950617928ab6b45cb9c SHA256 cfe78bdc05267d48ab99f21bbc65c382f81d717b6778dd48c6efef131f7922d1
+MISC ChangeLog 43392 RMD160 03d5e63075af0272c283dfd84f986e15fcaa4ba4 SHA1 37955592239a01db77bca584a0d9ab8fefe25da4 SHA256 57392c32dbbb3afefd5b658116d29ed451565ac6657e0e5cab5bfe9caff34037
 MISC metadata.xml 283 RMD160 e7fecb8c9f42c160464e04cbad8453fa5ae5f082 SHA1 0405010812eb8926276f73f0f5129d889d89ac06 SHA256 0b173562be9c319a1c2475b8f7c96112574a68c1fabad605c78d5068276ee82a
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-offsets.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-offsets.patch
new file mode 100644
index 000000000000..1e4ec4ce698b
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-offsets.patch
@@ -0,0 +1,31 @@
+From 16f5e224dcfd97012b38ee1af6c72dbe3c0f3304 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri, 25 Nov 2011 16:21:41 +0000
+Subject: sna: Avoid the double application of drawable offsets for tiled spans
+
+As we handle tiled spans indirectly, we need to avoid applying the
+drawable offsets twice (once in the mi layer generating the spans, and
+then once more in the tiled rect renderer).
+
+Reported-by: Ulrich Müller <ulm@gentoo.org>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43245
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 1a35c4d..03020c9 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -2790,9 +2790,9 @@ sna_fill_spans(DrawablePtr drawable, GCPtr gc, int n,
+ 				return;
+ 
+ 			for (i = 0; i < n; i++) {
+-				rect[i].x = pt[i].x;
++				rect[i].x = pt[i].x - drawable->x;
+ 				rect[i].width = width[i];
+-				rect[i].y = pt[i].y;
++				rect[i].y = pt[i].y - drawable->y;
+ 				rect[i].height = 1;
+ 			}
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r1.ebuild
index 20c1892254ec..bc1281e6954b 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0.ebuild,v 1.1 2011/11/17 17:45:18 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r1.ebuild,v 1.1 2011/11/25 23:30:18 chithanh Exp $
 
 EAPI=4