vmware: update to latest upstream

.gitignore

@@ -1 +1,2 @@
 xf86-video-vmware-10.16.7.tar.bz2
+xf86-video-vmware-11.0.1.tar.bz2

abi.patch

@@ -1,50 +0,0 @@
-diff --git a/src/vmware.c b/src/vmware.c
-index 2d1eabd..879c206 100644
---- a/src/vmware.c
-+++ b/src/vmware.c
-@@ -18,7 +18,9 @@ char rcsId_vmware[] =
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
- #include "xf86Resources.h"
-+#endif
- 
- #include "compiler.h"	/* inb/outb */
- 
-@@ -109,11 +111,15 @@ static SymTabRec VMWAREChipsets[] = {
-     { -1,                  NULL }
- };
- 
-+#ifndef XSERVER_LIBPCIACCESS
- static resRange vmwareLegacyRes[] = {
-     { ResExcIoBlock, SVGA_LEGACY_BASE_PORT,
-       SVGA_LEGACY_BASE_PORT + SVGA_NUM_PORTS*sizeof(uint32)},
-     _VGA_EXCLUSIVE, _END
- };
-+#else
-+#define vmwareLegacyRes NULL
-+#endif
- 
- #if XSERVER_LIBPCIACCESS
- 
-diff --git a/src/vmware.h b/src/vmware.h
-index a3502dd..31560b5 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -19,12 +19,14 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
-+
- 
- #include <X11/extensions/panoramiXproto.h>
- 
- #ifdef XSERVER_LIBPCIACCESS
- #include <pciaccess.h>
-+#else
-+#include "xf86Resources.h"
- #endif
- 
- #include "compiler.h"	        /* inb/outb */

abi2.patch

@@ -1,38 +0,0 @@
-diff -up xf86-video-vmware-10.16.7/src/vmware.c.jx xf86-video-vmware-10.16.7/src/vmware.c
---- xf86-video-vmware-10.16.7/src/vmware.c.jx	2009-08-07 16:31:33.000000000 -0400
-+++ xf86-video-vmware-10.16.7/src/vmware.c	2009-08-07 16:32:10.000000000 -0400
-@@ -640,8 +640,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
-         return FALSE;
-     }
- 
--    xf86LoaderReqSymLists(vgahwSymbols, NULL);
--
-     if (!vgaHWGetHWRec(pScrn)) {
-         return FALSE;
-     }
-@@ -959,7 +957,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
-         VMWAREFreeRec(pScrn);
-         return FALSE;
-     }
--    xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
- 
-     /* Need ramdac for hwcursor */
-     if (pVMWARE->hwCursor) {
-@@ -967,7 +964,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
-             VMWAREFreeRec(pScrn);
-             return FALSE;
-         }
--        xf86LoaderReqSymLists(ramdacSymbols, NULL);
-     }
- 
-     return TRUE;
-@@ -2051,9 +2047,6 @@ vmwareSetup(pointer module, pointer opts
-         setupDone = TRUE;
-         xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
- 
--        LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
--                          shadowfbSymbols, NULL);
--
-         return (pointer)1;
-     }
-     if (errmaj) {

sources

@@ -1 +1 @@
-5cddf28a23c21db6d7b8cdba7541391d  xf86-video-vmware-10.16.7.tar.bz2
+52e9a12843c6469f976db57a7b5f78d2  xf86-video-vmware-11.0.1.tar.bz2

xorg-x11-drv-vmware.spec

@@ -4,8 +4,8 @@
 
 Summary:    Xorg X11 vmware video driver
 Name:	    xorg-x11-drv-vmware
-Version:    10.16.7
+Version:    11.0.1
-Release:    4%{?dist}
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -13,8 +13,6 @@ BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:    vmware.xinf
-Patch0: abi.patch
-Patch1: abi2.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -31,8 +29,6 @@ X.Org X11 vmware video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .abi
-%patch1 -p1 -b .abi2
 
 %build
 %if 0%{?gitdate}
@@ -63,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Tue Aug 10 2010 Dave Airlie <airlied@redhat.com> 11.0.1-1
+- Latest upstream release.
+
 * Mon Jul 05 2010 Peter Hutterer <peter.hutterer@redhat.com> - 10.16.7-4
 - rebuild for X Server 1.9