- abi.patch: patch for new server ABI

abi.patch

@@ -0,0 +1,78 @@
+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 }
+ };
+ 
+-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;
+     }
+ 
+-    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);
+     }
+ 
+     /* 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) {

xorg-x11-drv-vmware.spec

@@ -5,7 +5,7 @@
 Summary:    Xorg X11 vmware video driver
 Name:	    xorg-x11-drv-vmware
 Version:    10.16.0
-Release:    3%{?dist}
+Release:    4%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -13,6 +13,7 @@ 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
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -29,6 +30,7 @@ X.Org X11 vmware video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .abi
 
 %build
 %if 0%{?gitdate}
@@ -59,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Tue Jun 23 2009 Dave Airlie <airlied@redhat.com> 10.16.0-4
+- abi.patch: patch for new server ABI
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10.16.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild