summaryrefslogtreecommitdiff
path: root/extra/xf86-video-vmware
diff options
context:
space:
mode:
Diffstat (limited to 'extra/xf86-video-vmware')
-rw-r--r--extra/xf86-video-vmware/PKGBUILD14
-rw-r--r--extra/xf86-video-vmware/git-fixes.patch55
2 files changed, 63 insertions, 6 deletions
diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD
index 47905d4e6..910632835 100644
--- a/extra/xf86-video-vmware/PKGBUILD
+++ b/extra/xf86-video-vmware/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 175177 2013-01-16 09:39:57Z jgc $
+# $Id: PKGBUILD 180220 2013-03-18 16:09:26Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-vmware
pkgver=13.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="X.org vmware video driver"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('libdrm' 'svga-dri' 'mesa')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
groups=('xorg-drivers' 'xorg')
options=('!libtool' '!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6'
+ '0a0fce7ddcb9c53da1b2aa1aa11317c10f0161026f40c82523c4dc0fd496016f')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/git-fixes.patch
./configure --prefix=/usr --enable-vmwarectrl-client
make
}
diff --git a/extra/xf86-video-vmware/git-fixes.patch b/extra/xf86-video-vmware/git-fixes.patch
new file mode 100644
index 000000000..70597def7
--- /dev/null
+++ b/extra/xf86-video-vmware/git-fixes.patch
@@ -0,0 +1,55 @@
+From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001
+From: Zack Rusin <zackr@vmware.com>
+Date: Thu, 14 Feb 2013 22:33:01 +0000
+Subject: Kill mibstore
+
+It was a noop for at least 5 years and it has been removed.
+
+Signed-off-by: Zack Rusin <zackr@vmware.com>
+---
+diff --git a/saa/saa_priv.h b/saa/saa_priv.h
+index 6652054..5d81453 100644
+--- a/saa/saa_priv.h
++++ b/saa/saa_priv.h
+@@ -48,7 +48,6 @@
+ #include "pixmapstr.h"
+ #include "windowstr.h"
+ #include "servermd.h"
+-#include "mibstore.h"
+ #include "colormapst.h"
+ #include "gcstruct.h"
+ #include "input.h"
+diff --git a/src/vmware.c b/src/vmware.c
+index 41201f1..6b74e14 100644
+--- a/src/vmware.c
++++ b/src/vmware.c
+@@ -23,7 +23,6 @@ char rcsId_vmware[] =
+ #include "xf86Pci.h" /* pci */
+
+ #include "mipointer.h" /* sw cursor */
+-#include "mibstore.h" /* backing store */
+ #include "micmap.h" /* mi color map */
+ #include "vgaHW.h" /* VGA hardware */
+ #include "fb.h"
+@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
+ * If backing store is to be supported (as is usually the case),
+ * initialise it.
+ */
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 9959ffb..7863ba2 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
+ (ms->only_hw_presents) ? "enabled" : "disabled");
+ }
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+--
+cgit v0.9.0.2-2-gbebe