- rel 3; fix build with xserver 1.14

diff --git a/build.patch b/build.patch
new file mode 100644 (file)
index 0000000..3121790
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,54 @@
+commit 23d87c92b7211cc5249eefe4ab3a2c7f370e279e
+Author: Zack Rusin <zackr@vmware.com>
+Date:   Thu Feb 14 14:33:01 2013 -0800
+
+    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());

diff --git a/xorg-driver-video-vmware.spec b/xorg-driver-video-vmware.spec
index 5a00070c8ac6571f8d2e85b2870b20a5a8b4aceb..9e7f6f4d5abc81b4316d034df339ad2d346b4428 100644 (file)
--- a/xorg-driver-video-vmware.spec
+++ b/xorg-driver-video-vmware.spec
@@ -2,11 +2,12 @@ Summary:      X.org video driver for VMware virtual video cards
 Summary(pl.UTF-8):     Sterownik obrazu X.org dla wirtualnych kart graficznych VMware
 Name:          xorg-driver-video-vmware
 Version:       13.0.0
-Release:       2
+Release:       3
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-%{version}.tar.bz2
 # Source0-md5: b72be57517cbc7a56362f2ee0f092269
+Patch0:                build.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libxatracker-devel >= 8
 BuildRequires: autoconf >= 2.60
@@ -43,6 +44,7 @@ Wykrywa automatycznie wersję dowolnej wirtualnej karty SVGA VMware.
 
 %prep
 %setup -q -n xf86-video-vmware-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}