[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD firefox_image_fix.diff)

[Andreas Radke]

    Date: Monday, June 24, 2013 @ 20:08:15
  Author: andyrtr
Revision: 188898

upgpkg: xf86-video-intel 2.21.10-2

fix FS#35896

Added:
  xf86-video-intel/trunk/firefox_image_fix.diff
Modified:
  xf86-video-intel/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   11 ++++++++---
 firefox_image_fix.diff |   30 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-24 17:25:32 UTC (rev 188897)
+++ PKGBUILD	2013-06-24 18:08:15 UTC (rev 188898)
@@ -4,7 +4,7 @@
 
 pkgname=xf86-video-intel
 pkgver=2.21.10
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -18,12 +18,17 @@
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        firefox_image_fix.diff)
+sha256sums=('7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6'
+            '33465c66b0a4bca2dfd242c86cb8cb882fbf841e1c2da632a5aa76f9d04b84d1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # fix image issues in FF+TB, https://bugs.freedesktop.org/show_bug.cgi?id=66059
+  patch -Np1 -i ${srcdir}/firefox_image_fix.diff
+
   ./configure --prefix=/usr \
     --enable-dri
 

Added: firefox_image_fix.diff
===================================================================
--- firefox_image_fix.diff	                        (rev 0)
+++ firefox_image_fix.diff	2013-06-24 18:08:15 UTC (rev 188898)
@@ -0,0 +1,30 @@
+From 77ddadf0ec6b867a0638660bf06c82ad31577795 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Sun, 23 Jun 2013 21:01:12 +0000
+Subject: sna: Clear 'clear' hint upon uploading into tiled
+
+Fixes regression from
+commit 53c113c3cc2f8527debc185f0819139ca8637637 [2.21.10]
+Author: Chris Wilson <chris at chris-wilson.co.uk>
+Date:   Fri Jun 21 19:27:24 2013 +0100
+
+    sna: Allow PutImage to write inplace using manual tiling
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66059
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 0994c33..43d6a67 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -4000,6 +4000,8 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
+ 	} while (--n);
+ 	__kgem_bo_unmap__cpu(&sna->kgem, priv->gpu_bo, dst);
+ 
++	priv->clear = false;
++	priv->cpu = false;
+ 	return true;
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe