vmware 12.0.2

.gitignore

@@ -2,3 +2,4 @@ xf86-video-vmware-10.16.7.tar.bz2
 xf86-video-vmware-11.0.1.tar.bz2
 /xf86-video-vmware-11.0.3.tar.bz2
 /xf86-video-vmware-12.0.1.tar.bz2
+/xf86-video-vmware-12.0.2.tar.bz2

sources

@@ -1 +1 @@
-08101a9b09774ec2f432db5118928c53  xf86-video-vmware-12.0.1.tar.bz2
+0743ec7c479603fba60d118858fd5783  xf86-video-vmware-12.0.2.tar.bz2

vmware-12.0.1-git.patch

@@ -1,31 +0,0 @@
-From b70116b907aa8545f0275589a52275235083bb40 Mon Sep 17 00:00:00 2001
-From: Zack Rusin <zackr@vmware.com>
-Date: Thu, 15 Mar 2012 15:37:26 +0000
-Subject: Fix a memory corruption due to a redundant free.
-
-We use the empty rect purely as a placeholder and never
-initialize it with its own memory so lets not try to free
-it.
-Spotted by Dave Airlie.
-
-Signed-off-by: Zack Rusin <zackr@vmware.com>
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
-index 0a6b98f..469598a 100644
---- a/vmwgfx/vmwgfx_saa.c
-+++ b/vmwgfx/vmwgfx_saa.c
-@@ -1151,11 +1151,9 @@ vmwgfx_composite_prepare(struct saa_driver *driver, CARD8 op,
-     if (xa_composite_prepare(vsaa->xa_ctx, xa_comp))
- 	goto out_err;
- 
--    REGION_UNINIT(pScreen, &empty);
-     return TRUE;
- 
-   out_err:
--    REGION_UNINIT(pScreen, &empty);
-     return FALSE;
- }
- 
---
-cgit v0.9.0.2-2-gbebe

xorg-x11-drv-vmware.spec

@@ -4,8 +4,8 @@
 
 Summary:    Xorg X11 vmware video driver
 Name:	    xorg-x11-drv-vmware
-Version:    12.0.1
-Release:    2%{?dist}
+Version:    12.0.2
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -14,7 +14,6 @@ Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
 Patch2:	    vmware-11.0.3-vgahw.patch
 Patch3:	    vmware-12.0.1-vgahw.patch
-Patch4:	    vmware-12.0.1-git.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -36,7 +35,6 @@ X.Org X11 vmware video driver.
 %setup -q -n %{tarball}-%{version}
 %patch2 -p1 -b .vgahw
 %patch3 -p1 -b .vgahw2
-%patch4 -p1 -b .git
 
 %build
 %if 0%{?gitdate}
@@ -63,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Fri Apr 20 2012 Adam Jackson <ajax@redhat.com> 12.0.2-1
+- vmware 12.0.2
+
 * Mon Mar 19 2012 Adam Jackson <ajax@redhat.com> 12.0.1-2
 - vmware-12.0.1-vgahw.patch: Fix a different crash at start (#782995)
 - vmware-12.0.1-git.patch: Backport a garbage-free fix from git.