[arch-commits] Commit in xf86-video-intel/trunk (2 files)

[Laurent Carlier]

    Date: Wednesday, August 6, 2014 @ 00:18:16
  Author: lcarlier
Revision: 219345

upgpkg: xf86-video-intel 2.99.914-4

fix FS#41317

Added:
  xf86-video-intel/trunk/sna-clear-cursor-image-after-rotation.patch
Modified:
  xf86-video-intel/trunk/PKGBUILD

---------------------------------------------+
 PKGBUILD                                    |   11 +++++++++--
 sna-clear-cursor-image-after-rotation.patch |   24 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-05 22:14:19 UTC (rev 219344)
+++ PKGBUILD	2014-08-05 22:18:16 UTC (rev 219345)
@@ -4,7 +4,7 @@
 
 pkgname=xf86-video-intel
 pkgver=2.99.914
-pkgrel=3
+pkgrel=4
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -25,7 +25,8 @@
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
         fix-i810-segfault-2.99.914.patch
-	sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch)
+	sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
+        sna-clear-cursor-image-after-rotation.patch)
 sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46'
             'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041'
             'a40ee7d923ce77057d4add2f9dae61bc7870e64b2cf1f49d2b2a6d729102b7ae')
@@ -36,6 +37,8 @@
   patch -Np1 -i ../fix-i810-segfault-2.99.914.patch
   # fix FS#40949 - merged upstream
   patch -Np1 -i ../sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
+  # fix FS#41317 - merged upstream
+  patch -Np1 -i ../sna-clear-cursor-image-after-rotation.patch
 }
 
 build() {
@@ -60,3 +63,7 @@
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
+sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46'
+            'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041'
+            'a40ee7d923ce77057d4add2f9dae61bc7870e64b2cf1f49d2b2a6d729102b7ae'
+            'bc5383abd2dd680e830600da3d3da1d9c56b0b270efffd3aec94b23bfd9179c9')

Added: sna-clear-cursor-image-after-rotation.patch
===================================================================
--- sna-clear-cursor-image-after-rotation.patch	                        (rev 0)
+++ sna-clear-cursor-image-after-rotation.patch	2014-08-05 22:18:16 UTC (rev 219345)
@@ -0,0 +1,24 @@
+From a88795c64123e4084044451d8861838ea904abd9 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Tue, 29 Jul 2014 21:11:09 +0100
+Subject: sna: Clear cursor image after rotation
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81886
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 8964e77..eed68d3 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -4294,7 +4294,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
+ 		image = sna->cursor.scratch;
+ 		cursor->last_width = cursor->last_height = size;
+ 	}
+-	if (width < cursor->last_width || height < cursor->last_height)
++	if (width < cursor->last_width || height < cursor->last_height || rotation != cursor->rotation)
+ 		memset(image, 0, 4*size*size);
+ 	if (rotation == RR_Rotate_0) {
+ 		if (argb == NULL) {
+-- 
+cgit v0.10.2
+