From 9526ee659401dee7160f35cb62ded2779bcbbc99 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 25 Jan 2010 16:43:57 +0000
Subject: merged x11 repository into main

ref #255
---
 main/xf86-video-vmware/APKBUILD   | 35 +++++++++++++++++++++++++++++++++++
 main/xf86-video-vmware/abi2.patch | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 main/xf86-video-vmware/APKBUILD
 create mode 100644 main/xf86-video-vmware/abi2.patch

(limited to 'main/xf86-video-vmware')

diff --git a/main/xf86-video-vmware/APKBUILD b/main/xf86-video-vmware/APKBUILD
new file mode 100644
index 0000000000..bd979907df
--- /dev/null
+++ b/main/xf86-video-vmware/APKBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xf86-video-vmware
+pkgver=10.16.9
+pkgrel=0
+pkgdesc="X.org VMWare video driver"
+url="http://xorg.freedesktop.org/"
+license="custom"
+subpackages="$pkgname-dev $pkgname-doc"
+depends=
+makedepends="pkgconfig xorg-server-dev videoproto renderproto xproto
+	fontsproto xf86dgaproto xineramaproto randrproto xextproto libxi-dev"
+
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+	abi2.patch"
+
+prepare() {
+	cd "$srcdir"/$pkgname-$pkgver
+	patch -Np1 -i "$srcdir/abi2.patch" || return 1
+}
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
+
+	./configure --prefix=/usr || return 1
+	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" install || return 1
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+md5sums="3b3d38abfa1f8be4b1e26dcd236bc94f  xf86-video-vmware-10.16.9.tar.bz2
+cbc8e0bef13ccec7ceac233cd09233da  abi2.patch"
diff --git a/main/xf86-video-vmware/abi2.patch b/main/xf86-video-vmware/abi2.patch
new file mode 100644
index 0000000000..29e8ddeb19
--- /dev/null
+++ b/main/xf86-video-vmware/abi2.patch
@@ -0,0 +1,38 @@
+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) {
-- 
cgit v1.2.3