xf86-video-*: recompiled against local arch abs.

3 files changed, 3 insertions, 68 deletions

diff --git a/abs/core/xf86-video-vmware/LICENSE b/abs/core/xf86-video-vmware/LICENSE
deleted file mode 100644
index 7934272..0000000
--- a/abs/core/xf86-video-vmware/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
-Copyright (C) 1998-2002 VMware, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
diff --git a/abs/core/xf86-video-vmware/PKGBUILD b/abs/core/xf86-video-vmware/PKGBUILD
index c99cfbe..38b3efe 100644
--- a/abs/core/xf86-video-vmware/PKGBUILD
+++ b/abs/core/xf86-video-vmware/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=xf86-video-vmware
 pkgver=11.0.3
-pkgrel=1
+pkgrel=3
 pkgdesc="X.org vmware video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libdrm')
-makedepends=('pkgconfig' 'xorg-server' 'libdrm' 'libx11' 'libxext')
-conflicts=('xorg-server<1.8.1')
+makedepends=('pkgconfig' 'xorg-server-devel' 'libdrm' 'libx11' 'libxext')
+conflicts=('xorg-server<1.9.0')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/abs/core/xf86-video-vmware/abi2.patch b/abs/core/xf86-video-vmware/abi2.patch
deleted file mode 100644
index 29e8dde..0000000
--- a/abs/core/xf86-video-vmware/abi2.patch
+++ /dev/null
@@ -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) {