[arch-commits] Commit in xf86-video-intel/trunk (4 files)
Laurent Carlier
lcarlier at archlinux.org
Mon Sep 8 12:33:07 UTC 2014
Date: Monday, September 8, 2014 @ 14:33:07
Author: lcarlier
Revision: 221154
upgpkg: xf86-video-intel 2.99.916-1
upstream update 2.99.916
Modified:
xf86-video-intel/trunk/PKGBUILD
Deleted:
xf86-video-intel/trunk/fix-i810-segfault-2.99.914.patch
xf86-video-intel/trunk/sna-clear-cursor-image-after-rotation.patch
xf86-video-intel/trunk/sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
------------------------------------------------------------+
PKGBUILD | 24 -----
fix-i810-segfault-2.99.914.patch | 31 -------
sna-clear-cursor-image-after-rotation.patch | 24 -----
sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch | 47 -----------
4 files changed, 4 insertions(+), 122 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-09-08 12:03:44 UTC (rev 221153)
+++ PKGBUILD 2014-09-08 12:33:07 UTC (rev 221154)
@@ -3,8 +3,8 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=xf86-video-intel
-pkgver=2.99.914
-pkgrel=4
+pkgver=2.99.916
+pkgrel=1
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
@@ -23,25 +23,9 @@
conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<18' 'X-ABI-VIDEODRV_VERSION>=19'
'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
- sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
- sna-clear-cursor-image-after-rotation.patch)
-sha256sums=('78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46'
- 'a7c27ce28e6db47971aea2762496fdb05f93413c418756f5e7f6cf2e76b91041'
- 'a40ee7d923ce77057d4add2f9dae61bc7870e64b2cf1f49d2b2a6d729102b7ae'
- 'bc5383abd2dd680e830600da3d3da1d9c56b0b270efffd3aec94b23bfd9179c9')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('409a819f4ac3e7c9432dd4acafe4621bbb3702adb34b1ea942b2e6d7c71eed01')
-prepare() {
- cd ${pkgname}-${pkgver}
- # fix segfaulting on i810 chipsets - merged upstream
- 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() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
Deleted: fix-i810-segfault-2.99.914.patch
===================================================================
--- fix-i810-segfault-2.99.914.patch 2014-09-08 12:03:44 UTC (rev 221153)
+++ fix-i810-segfault-2.99.914.patch 2014-09-08 12:33:07 UTC (rev 221154)
@@ -1,31 +0,0 @@
-From ce804875914f52dba5356f8aefec850d411b051a Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Thu, 31 Jul 2014 15:18:02 +0000
-Subject: i810: Fix startup after marking GPU screens in the module
-
-Fixes regression from
-
-commit d6830190bc9956f485db6c3420f7a4a79793a693
-Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Wed Jul 23 10:53:40 2014 +0100
-
- sna: Disable all outputs when initializing as a slaved output provider
-
-Reported-by: Tobias Powalowski
-Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
----
-diff --git a/src/legacy/i810/i810_driver.c b/src/legacy/i810/i810_driver.c
-index a1b73fd..3d53d04 100644
---- a/src/legacy/i810/i810_driver.c
-+++ b/src/legacy/i810/i810_driver.c
-@@ -152,7 +152,7 @@ static int i810_pitches[] = {
- static Bool
- I810GetRec(ScrnInfoPtr scrn)
- {
-- if (((uintptr_t)scrn->driverPrivate & 1) == 0)
-+ if (((uintptr_t)scrn->driverPrivate & 3) == 0)
- return TRUE;
-
- scrn->driverPrivate = xnfcalloc(sizeof(I810Rec), 1);
---
-cgit v0.9.0.2-2-gbebe
Deleted: sna-clear-cursor-image-after-rotation.patch
===================================================================
--- sna-clear-cursor-image-after-rotation.patch 2014-09-08 12:03:44 UTC (rev 221153)
+++ sna-clear-cursor-image-after-rotation.patch 2014-09-08 12:33:07 UTC (rev 221154)
@@ -1,24 +0,0 @@
-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
-
Deleted: sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch
===================================================================
--- sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch 2014-09-08 12:03:44 UTC (rev 221153)
+++ sna-glyphs-Fallback-to-masked-glyphs-if-rendering-to.patch 2014-09-08 12:33:07 UTC (rev 221154)
@@ -1,47 +0,0 @@
-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
-
More information about the arch-commits
mailing list