summaryrefslogtreecommitdiff
path: root/extra/xf86-video-vmware
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-04-13 00:05:58 -0700
committerroot <root@rshg054.dnsready.net>2013-04-13 00:05:58 -0700
commit8f0418e4a239ba973834592537b474d3aac52d5b (patch)
tree55787459ba85dcd3ea548b37ca4027ef993c28b5 /extra/xf86-video-vmware
parentd976aa5e1544c80dc2457ea20b27f28f3fa05899 (diff)
Sat Apr 13 00:05:58 PDT 2013
Diffstat (limited to 'extra/xf86-video-vmware')
-rw-r--r--extra/xf86-video-vmware/PKGBUILD6
-rw-r--r--extra/xf86-video-vmware/git-fixes.patch34
2 files changed, 37 insertions, 3 deletions
diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD
index 910632835..ade9eedff 100644
--- a/extra/xf86-video-vmware/PKGBUILD
+++ b/extra/xf86-video-vmware/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180220 2013-03-18 16:09:26Z andyrtr $
+# $Id: PKGBUILD 182671 2013-04-12 14:13:36Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-vmware
pkgver=13.0.0
-pkgrel=2
+pkgrel=3
pkgdesc="X.org vmware video driver"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
@@ -15,7 +15,7 @@ groups=('xorg-drivers' 'xorg')
options=('!libtool' '!emptydirs')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6'
- '0a0fce7ddcb9c53da1b2aa1aa11317c10f0161026f40c82523c4dc0fd496016f')
+ '9322d467d2111be4049e8649b1d2729a2a2ab35cc9769cfee5be63f18e176938')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-vmware/git-fixes.patch b/extra/xf86-video-vmware/git-fixes.patch
index 70597def7..f1cde34aa 100644
--- a/extra/xf86-video-vmware/git-fixes.patch
+++ b/extra/xf86-video-vmware/git-fixes.patch
@@ -53,3 +53,37 @@ index 9959ffb..7863ba2 100644
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
--
cgit v0.9.0.2-2-gbebe
+From d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd Mon Sep 17 00:00:00 2001
+From: Loïc Yhuel <loic.yhuel@gmail.com>
+Date: Thu, 11 Apr 2013 09:29:10 +0000
+Subject: vmwgfx: Use myGlyphs to fix crashes
+
+Tested-by: Christian Hesse <mail@eworm.de>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+Signed-off-by: Loïc Yhuel <loic.yhuel@gmail.com>
+Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+diff --git a/saa/saa_render.c b/saa/saa_render.c
+index c69f2c9..c6ce68c 100644
+--- a/saa/saa_render.c
++++ b/saa/saa_render.c
+@@ -406,6 +406,8 @@ saa_render_setup(ScreenPtr pScreen)
+ saa_wrap(sscreen, ps, Trapezoids, saa_trapezoids);
+ saa_wrap(sscreen, ps, Triangles, saa_triangles);
+ saa_wrap(sscreen, ps, Composite, saa_composite);
++ saa_wrap(sscreen, ps, Glyphs, miGlyphs);
++ saa_wrap(sscreen, ps, UnrealizeGlyph, miUnrealizeGlyph);
+ }
+ }
+
+@@ -419,6 +421,8 @@ saa_render_takedown(ScreenPtr pScreen)
+ saa_unwrap(sscreen, ps, Trapezoids);
+ saa_unwrap(sscreen, ps, Triangles);
+ saa_unwrap(sscreen, ps, Composite);
++ saa_unwrap(sscreen, ps, Glyphs);
++ saa_unwrap(sscreen, ps, UnrealizeGlyph);
+ }
+ }
+ #endif
+--
+cgit v0.9.0.2-2-gbebe