From 0e60a9618e8d0cfbebe4613a4d880354fbfd3ec3088306ce791fe36fe4cc48ca Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 7 May 2013 11:42:20 +0000
Subject: [PATCH] - xf86-video-vmware 13.0.1   * vmwgfx: Use myGlyphs to fix
 crashes (fdo#61780)   * Kill mibstore - obsoletes U_mibstore.patch

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-vmware?expand=0&rev=19
---
 U_mibstore.patch                 | 55 --------------------------------
 xf86-video-vmware-13.0.0.tar.bz2 |  3 --
 xf86-video-vmware-13.0.1.tar.bz2 |  3 ++
 xf86-video-vmware.changes        |  8 +++++
 xf86-video-vmware.spec           |  5 +--
 5 files changed, 12 insertions(+), 62 deletions(-)
 delete mode 100644 U_mibstore.patch
 delete mode 100644 xf86-video-vmware-13.0.0.tar.bz2
 create mode 100644 xf86-video-vmware-13.0.1.tar.bz2

diff --git a/U_mibstore.patch b/U_mibstore.patch
deleted file mode 100644
index f51c4d7..0000000
--- a/U_mibstore.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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
diff --git a/xf86-video-vmware-13.0.0.tar.bz2 b/xf86-video-vmware-13.0.0.tar.bz2
deleted file mode 100644
index 1eb2254..0000000
--- a/xf86-video-vmware-13.0.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6
-size 445703
diff --git a/xf86-video-vmware-13.0.1.tar.bz2 b/xf86-video-vmware-13.0.1.tar.bz2
new file mode 100644
index 0000000..9e10ce7
--- /dev/null
+++ b/xf86-video-vmware-13.0.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d
+size 432401
diff --git a/xf86-video-vmware.changes b/xf86-video-vmware.changes
index a74a543..c80a046 100644
--- a/xf86-video-vmware.changes
+++ b/xf86-video-vmware.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue May  7 11:38:22 UTC 2013 - sndirsch@suse.com
+
+- xf86-video-vmware 13.0.1
+  * vmwgfx: Use myGlyphs to fix crashes (fdo#61780)
+  * Kill mibstore
+- obsoletes U_mibstore.patch
+
 -------------------------------------------------------------------
 Fri Apr  5 09:13:50 UTC 2013 - idonmez@suse.com
 
diff --git a/xf86-video-vmware.spec b/xf86-video-vmware.spec
index 996eb61..2785ca9 100644
--- a/xf86-video-vmware.spec
+++ b/xf86-video-vmware.spec
@@ -17,15 +17,13 @@
 
 
 Name:           xf86-video-vmware
-Version:        13.0.0
+Version:        13.0.1
 Release:        0
 Summary:        VMware SVGA video driver for the Xorg X server
 License:        MIT
 Group:          System/X11/Servers/XF86_4
 Url:            http://xorg.freedesktop.org/
 Source0:        http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
-#PATCH-FIX-UPSTREAM U_mibstore.patch -- removes obsolete include
-Patch0:         U_mibstore.patch
 ExclusiveArch:  %ix86 x86_64
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontsproto)
@@ -50,7 +48,6 @@ vmware is an Xorg driver for VMware virtual video cards.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure