diff options
| author | root <root@rshg054.dnsready.net> | 2013-06-26 01:38:17 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-06-26 01:38:17 -0700 |
| commit | 02e1f1221ec9570de0aaec8f15edb6d2af336bff (patch) | |
| tree | 94b0e68a309f5fa68c667b8125553f445df021ac /extra/xf86-video-intel | |
| parent | f566ab403132b1bb3eb3a5b2e604c117bc0630c7 (diff) | |
Wed Jun 26 01:37:43 PDT 2013
Diffstat (limited to 'extra/xf86-video-intel')
| -rw-r--r-- | extra/xf86-video-intel/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/xf86-video-intel/firefox_image_fix.diff | 30 |
2 files changed, 44 insertions, 5 deletions
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index c936481fc..205ef1547 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187885 2013-06-07 20:50:17Z lcarlier $ +# $Id: PKGBUILD 188921 2013-06-25 16:24:01Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.9 -pkgrel=1 +pkgver=2.21.10 +pkgrel=2 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') @@ -18,19 +18,28 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS '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=('1359cbc9e494a284faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189') +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 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/xf86-video-intel/firefox_image_fix.diff b/extra/xf86-video-intel/firefox_image_fix.diff new file mode 100644 index 000000000..653295dab --- /dev/null +++ b/extra/xf86-video-intel/firefox_image_fix.diff @@ -0,0 +1,30 @@ +From 77ddadf0ec6b867a0638660bf06c82ad31577795 Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@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@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@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 |