- vmware 10.16.7 + new abi patch

.cvsignore

@@ -1 +1 @@
-xf86-video-vmware-10.16.0.tar.bz2
+xf86-video-vmware-10.16.7.tar.bz2

abi.patch

@@ -1,78 +1,50 @@
-diff -up xf86-video-vmware-10.16.0/src/vmware.c.abi xf86-video-vmware-10.16.0/src/vmware.c
---- xf86-video-vmware-10.16.0/src/vmware.c.abi	2009-06-23 10:44:26.000000000 +1000
-+++ xf86-video-vmware-10.16.0/src/vmware.c	2009-06-23 10:44:46.000000000 +1000
-@@ -140,38 +140,6 @@ static PciChipsets VMWAREPciChipsets[] =
-     { -1,		       -1,		    RES_UNDEFINED }
+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 }
  };
  
--static const char *vgahwSymbols[] = {
--    "vgaHWGetHWRec",
--    "vgaHWGetIOBase",
--    "vgaHWGetIndex",
--    "vgaHWInit",
--    "vgaHWProtect",
--    "vgaHWRestore",
--    "vgaHWSave",
--    "vgaHWSaveScreen",
--    "vgaHWUnlock",
--    NULL
--};
--
--static const char *fbSymbols[] = {
--    "fbCreateDefColormap",
--    "fbPictureInit",
--    "fbScreenInit",
--    NULL
--};
--
--static const char *ramdacSymbols[] = {
--    "xf86CreateCursorInfoRec",
--    "xf86DestroyCursorInfoRec",
--    "xf86InitCursor",
--    NULL
--};
--
--static const char *shadowfbSymbols[] = {
--    "ShadowFBInit2",
--    NULL
--};
--
- #ifdef XFree86LOADER
- static XF86ModuleVersionInfo vmwareVersRec = {
-     "vmware",
-@@ -634,8 +602,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
-         return FALSE;
-     }
++#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
  
--    xf86LoaderReqSymLists(vgahwSymbols, NULL);
--
-     if (!vgaHWGetHWRec(pScrn)) {
-         return FALSE;
-     }
-@@ -971,15 +937,12 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
-         VMWAREFreeRec(pScrn);
-         return FALSE;
-     }
--    xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
--
-     /* Need ramdac for hwcursor */
-     if (pVMWARE->hwCursor) {
-         if (!xf86LoadSubModule(pScrn, "ramdac")) {
-             VMWAREFreeRec(pScrn);
-             return FALSE;
-         }
--        xf86LoaderReqSymLists(ramdacSymbols, NULL);
-     }
+ #if XSERVER_LIBPCIACCESS
  
-     /* Initialise VMWARE_CTRL extension. */
-@@ -1892,10 +1855,6 @@ vmwareSetup(pointer module, pointer opts
-     if (!setupDone) {
-         setupDone = TRUE;
-         xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
--
--        LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
--                          shadowfbSymbols, NULL);
--
-         return (pointer)1;
-     }
-     if (errmaj) {
+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 */

sources

@@ -1 +1 @@
-2768dd5c5c3867ac6fc390ae15dc85bd  xf86-video-vmware-10.16.0.tar.bz2
+5cddf28a23c21db6d7b8cdba7541391d  xf86-video-vmware-10.16.7.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.0
-Release:    5%{?dist}.1
+Version:    10.16.7
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Tue Aug 04 2009 Dave Airlie <airlied@redhat.com> 10.16.7-1
+- vmware 10.16.7 + new abi patch
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10.16.0-5.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild