Date: Wednesday, August 18, 2010 @ 17:22:19 Author: jgc Revision: 87989
upgpkg: xf86-video-vmware 11.0.2-1 Update to 11.0.2 - fixes FS#20254 Modified: xf86-video-vmware/trunk/PKGBUILD Deleted: xf86-video-vmware/trunk/LICENSE xf86-video-vmware/trunk/abi2.patch ------------+ LICENSE | 27 --------------------------- PKGBUILD | 16 +++++++--------- abi2.patch | 38 -------------------------------------- 3 files changed, 7 insertions(+), 74 deletions(-) Deleted: LICENSE =================================================================== --- LICENSE 2010-08-18 20:45:37 UTC (rev 87988) +++ LICENSE 2010-08-18 21:22:19 UTC (rev 87989) @@ -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. Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-08-18 20:45:37 UTC (rev 87988) +++ PKGBUILD 2010-08-18 21:22:19 UTC (rev 87989) @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=xf86-video-vmware -pkgver=11.0.1 +pkgver=11.0.2 pkgrel=1 pkgdesc="X.org vmware video driver" arch=(i686 x86_64) @@ -13,16 +13,14 @@ conflicts=('xorg-server<1.8.0') groups=('xorg-video-drivers') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - LICENSE) -sha1sums=('cc82cbacaa90c28b42440f6a197f5167595c8417' - 'f7fad008ca63b6862056f9d1123a81aef053d586') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('7598145097971437cf0bfc0445e4435602159b41') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr + make + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/" } Deleted: abi2.patch =================================================================== --- abi2.patch 2010-08-18 20:45:37 UTC (rev 87988) +++ abi2.patch 2010-08-18 21:22:19 UTC (rev 87989) @@ -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) {
