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

[Laurent Carlier]

    Date: Friday, August 1, 2014 @ 14:42:47
  Author: lcarlier
Revision: 218489

upgpkg: xf86-video-intel 2.99.914-3

fix FS#40949

Added:
  xf86-video-intel/trunk/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
Modified:
  xf86-video-intel/trunk/PKGBUILD

------------------------------------------------------------+
 PKGBUILD                                                   |   13 +--
 sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch |   47 +++++++++++
 2 files changed, 55 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-01 11:22:27 UTC (rev 218488)
+++ PKGBUILD	2014-08-01 12:42:47 UTC (rev 218489)
@@ -4,7 +4,7 @@
 
 pkgname=xf86-video-intel
 pkgver=2.99.914
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -24,15 +24,18 @@
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        fix-i810-segfault-2.99.914.patch)
+        fix-i810-segfault-2.99.914.patch
+	sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch)
 sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46'
-            'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041')
+            'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041'
+            'a40ee7d923ce77057d4add2f9dae61bc7870e64b2cf1f49d2b2a6d729102b7ae')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  # fix segfaulting on i810 chipsets
+  # fix segfaulting on i810 chipsets - merged upstream
   patch -Np1 -i ../fix-i810-segfault-2.99.914.patch
-#  autoreconf -fiv
+  # fix FS#40949 - merged upstream
+  patch -Np1 -i ../sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
 }
 
 build() {

Added: sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
===================================================================
--- sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch	                        (rev 0)
+++ sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch	2014-08-01 12:42:47 UTC (rev 218489)
@@ -0,0 +1,47 @@
+From fc2de62496061b9d0bace02729765344bd939122 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Fri, 1 Aug 2014 12:00:05 +0100
+Subject: [PATCH 1/2] sna/glyphs: Fallback to masked glyphs if rendering to a
+ too wide dst
+
+Fixes regression from
+
+commit 79399ff9264ff23da0ab95131a67d2ac85651b3d
+Author: Chris Wilson <chris at chris-wilson.co.uk>
+Date:   Mon Mar 24 10:46:57 2014 +0000
+
+    sna: Eliminate a few conditionals in glyph fast path
+
+for large pixmaps (such as extended desktops on gen2/gen3).
+
+Bugzilla: https://bugs.archlinux.org/task/40949
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+ src/sna/sna_glyphs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
+index 0bb72d8..5d3bec2 100644
+--- a/src/sna/sna_glyphs.c
++++ b/src/sna/sna_glyphs.c
+@@ -800,7 +800,7 @@ glyphs0_to_dst(struct sna *sna,
+ 								   0, 0, 0, 0, 0, 0,
+ 								   0, 0,
+ 								   COMPOSITE_PARTIAL, &tmp))
+-						goto next_glyph_N;
++						return false;
+ 
+ 					glyph_atlas = p->atlas;
+ 				}
+@@ -892,7 +892,7 @@ next_glyph_N:
+ 							   0, 0, 0, 0, 0, 0,
+ 							   0, 0,
+ 							   COMPOSITE_PARTIAL, &tmp))
+-					goto next_glyph_0;
++					return false;
+ 
+ 				glyph_atlas = p->atlas;
+ 			}
+-- 
+2.0.3
+