xorg-xf86-video-vmware: buildfix for xorg-xserver 1.14

This commit is contained in:
Fredrik Rinnestam 2013-03-09 15:44:52 +01:00
parent 0560cc2206
commit 5890d17e39
3 changed files with 45 additions and 3 deletions

View File

@ -1 +1,2 @@
356a94935a08023e0b595f3a76d83bed mibstore.patch
b72be57517cbc7a56362f2ee0f092269 xf86-video-vmware-13.0.0.tar.bz2 b72be57517cbc7a56362f2ee0f092269 xf86-video-vmware-13.0.0.tar.bz2

View File

@ -5,12 +5,12 @@
name=xorg-xf86-video-vmware name=xorg-xf86-video-vmware
version=13.0.0 version=13.0.0
release=1 release=2
source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-$version.tar.bz2) source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-$version.tar.bz2 mibstore.patch)
build() { build() {
cd xf86-video-vmware-$version cd xf86-video-vmware-$version
patch -p1 -i $SRC/mibstore.patch
./configure --prefix=/usr --mandir=/usr/man ./configure --prefix=/usr --mandir=/usr/man
make make

View File

@ -0,0 +1,41 @@
diff -rupN xf86-video-vmware-13.0.0-patch/saa/saa_priv.h xf86-video-vmware-13.0.0/saa/saa_priv.h
--- xf86-video-vmware-13.0.0-patch/saa/saa_priv.h 2013-03-09 15:27:32.726040864 +0100
+++ xf86-video-vmware-13.0.0/saa/saa_priv.h 2013-03-09 15:27:57.940903017 +0100
@@ -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 -rupN xf86-video-vmware-13.0.0-patch/src/vmware.c xf86-video-vmware-13.0.0/src/vmware.c
--- xf86-video-vmware-13.0.0-patch/src/vmware.c 2013-03-09 15:27:32.725040830 +0100
+++ xf86-video-vmware-13.0.0/src/vmware.c 2013-03-09 15:28:22.261734594 +0100
@@ -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 -rupN xf86-video-vmware-13.0.0-patch/vmwgfx/vmwgfx_driver.c xf86-video-vmware-13.0.0/vmwgfx/vmwgfx_driver.c
--- xf86-video-vmware-13.0.0-patch/vmwgfx/vmwgfx_driver.c 2013-03-09 15:27:32.726040864 +0100
+++ xf86-video-vmware-13.0.0/vmwgfx/vmwgfx_driver.c 2013-03-09 15:28:48.430629350 +0100
@@ -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());