From 4a450fca77831882ba0cd0d1cfe42fb86ce9e79f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 13 Nov 2009 02:28:43 +0100
Subject: [PATCH] xf86-video-vmware: add patch to make this work with
 xorg-server>=1.7.

Bump revision.

--HG--
extra : convert_revision : b5c6b4e76462596adaf19d6081f39e62f2fda0b0
---
 .../patches/fix_xorg_server_1.7_abi.diff      | 37 +++++++++++++++++++
 templates/xf86-video-vmware/template          |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 templates/xf86-video-vmware/patches/fix_xorg_server_1.7_abi.diff

diff --git a/templates/xf86-video-vmware/patches/fix_xorg_server_1.7_abi.diff b/templates/xf86-video-vmware/patches/fix_xorg_server_1.7_abi.diff
new file mode 100644
index 00000000000..00394cba2ca
--- /dev/null
+++ b/templates/xf86-video-vmware/patches/fix_xorg_server_1.7_abi.diff
@@ -0,0 +1,37 @@
+--- src/vmware.c.orig	2009-11-13 02:13:01.461716326 +0100
++++ src/vmware.c	2009-11-13 02:14:03.786668653 +0100
+@@ -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) {
diff --git a/templates/xf86-video-vmware/template b/templates/xf86-video-vmware/template
index 544cbe0e356..fbb0a4d0c33 100644
--- a/templates/xf86-video-vmware/template
+++ b/templates/xf86-video-vmware/template
@@ -1,7 +1,7 @@
 # Template build file for 'xf86-video-vmware'.
 pkgname=xf86-video-vmware
 version=10.16.8
-revision=1
+revision=2
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Modular Xorg VMware virtual video driver"