Date: Friday, April 12, 2013 @ 16:13:21 Author: andyrtr Revision: 182670
upgpkg: xf86-video-vmware 13.0.0-3 fix use with Xorg 1.14 Modified: xf86-video-vmware/trunk/PKGBUILD xf86-video-vmware/trunk/git-fixes.patch -----------------+ PKGBUILD | 4 ++-- git-fixes.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-04-12 14:08:14 UTC (rev 182669) +++ PKGBUILD 2013-04-12 14:13:21 UTC (rev 182670) @@ -3,7 +3,7 @@ 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 @@ options=('!libtool' '!emptydirs') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch) sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6' - '0a0fce7ddcb9c53da1b2aa1aa11317c10f0161026f40c82523c4dc0fd496016f') + '9322d467d2111be4049e8649b1d2729a2a2ab35cc9769cfee5be63f18e176938') build() { cd "${srcdir}/${pkgname}-${pkgver}" Modified: git-fixes.patch =================================================================== --- git-fixes.patch 2013-04-12 14:08:14 UTC (rev 182669) +++ git-fixes.patch 2013-04-12 14:13:21 UTC (rev 182670) @@ -53,3 +53,37 @@ miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); -- cgit v0.9.0.2-2-gbebe +From d13a6334fe76f4e869b2cb8c0a6a13c185b1bedd Mon Sep 17 00:00:00 2001 +From: Loïc Yhuel <[email protected]> +Date: Thu, 11 Apr 2013 09:29:10 +0000 +Subject: vmwgfx: Use myGlyphs to fix crashes + +Tested-by: Christian Hesse <[email protected]> +Reviewed-by: Jakob Bornecrantz <[email protected]> +Signed-off-by: Loïc Yhuel <[email protected]> +Signed-off-by: Jakob Bornecrantz <[email protected]> +--- +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
