vmware 12.0.99.901

.gitignore

@@ -4,3 +4,4 @@ xf86-video-vmware-11.0.1.tar.bz2
 /xf86-video-vmware-12.0.1.tar.bz2
 /xf86-video-vmware-12.0.2.tar.bz2
 /xf86-video-vmware-20120718.tar.bz2
+/xf86-video-vmware-20130109.tar.bz2

0001-Remove-mibstore.h.patch

@@ -0,0 +1,59 @@
+From b91093db9412b35c7c930f88bc41402d212dd91d Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 9 Jan 2013 23:10:16 -0500
+Subject: [PATCH] Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ saa/saa_priv.h         | 1 -
+ src/vmware.c           | 2 --
+ vmwgfx/vmwgfx_driver.c | 1 -
+ 3 files changed, 4 deletions(-)
+
+diff --git a/saa/saa_priv.h b/saa/saa_priv.h
+index 6652054..5d81453 100644
+--- a/saa/saa_priv.h
++++ b/saa/saa_priv.h
+@@ -48,7 +48,6 @@
+ #include "pixmapstr.h"
+ #include "windowstr.h"
+ #include "servermd.h"
+-#include "mibstore.h"
+ #include "colormapst.h"
+ #include "gcstruct.h"
+ #include "input.h"
+diff --git a/src/vmware.c b/src/vmware.c
+index 41201f1..6b74e14 100644
+--- a/src/vmware.c
++++ b/src/vmware.c
+@@ -23,7 +23,6 @@ char rcsId_vmware[] =
+ #include "xf86Pci.h"		/* pci */
+ 
+ #include "mipointer.h"		/* sw cursor */
+-#include "mibstore.h"		/* backing store */
+ #include "micmap.h"		/* mi color map */
+ #include "vgaHW.h"		/* VGA hardware */
+ #include "fb.h"
+@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
+      * If backing store is to be supported (as is usually the case),
+      * initialise it.
+      */
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 9959ffb..7863ba2 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
+ 		   (ms->only_hw_presents) ? "enabled" : "disabled");
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+-- 
+1.8.0.2
+

sources

@@ -1 +1 @@
-a9ad00ebdcd993c83612178809eed0c7  xf86-video-vmware-20120718.tar.bz2
+e9e72dfbdcacc5392d055934628831cf  xf86-video-vmware-20130109.tar.bz2

xorg-x11-drv-vmware.spec

@@ -1,8 +1,8 @@
 %define tarball xf86-video-vmware
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-%define gitdate 20120718
+%define gitdate 20130109
-%define gitversion e5ac80d8f
+%define gitversion adf375f3
 
 %if 0%{?gitdate}
 %define gver .%{gitdate}git%{gitversion}
@@ -10,17 +10,15 @@
 
 Summary:    Xorg X11 vmware video driver
 Name:	    xorg-x11-drv-vmware
-Version:    12.0.2
+Version:    12.0.99.901
-Release:    4%{?gver}%{?dist}
+Release:    1%{?gver}%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
 
 #Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source0: %{tarball}-%{gitdate}.tar.bz2
-
+Patch0:	    0001-Remove-mibstore.h.patch
-Patch2:	    vmware-11.0.3-vgahw.patch
-Patch3:	    vmware-12.0.1-vgahw.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -40,8 +38,7 @@ X.Org X11 vmware video driver.
 
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-%patch2 -p1 -b .vgahw
+%patch0 -p1
-%patch3 -p1 -b .vgahw2
 
 %build
 %if 0%{?gitdate}
@@ -68,8 +65,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vmware.4*
 
 %changelog
-* Thu Jan 10 2013 Adam Jackson <ajax@redhat.com> - 12.0.2-4.20120718gite5ac80d8f
+* Wed Jan 09 2013 Adam Jackson <ajax@redhat.com> 12.0.99.901-1
-- ABI rebuild
+- vmware 12.0.99.901
 
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 12.0.2-3.20120718gite5ac80d8f
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild