diff --git a/.gitignore b/.gitignore index 53082cd..7c4c4d1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ xf86-video-vmware-11.0.1.tar.bz2 /xf86-video-vmware-12.0.2.tar.bz2 /xf86-video-vmware-20120718.tar.bz2 /xf86-video-vmware-20130109.tar.bz2 +/xf86-video-vmware-13.0.1.tar.bz2 diff --git a/0001-Remove-mibstore.h.patch b/0001-Remove-mibstore.h.patch deleted file mode 100644 index 822c6bc..0000000 --- a/0001-Remove-mibstore.h.patch +++ /dev/null @@ -1,59 +0,0 @@ -From b91093db9412b35c7c930f88bc41402d212dd91d Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Wed, 9 Jan 2013 23:10:16 -0500 -Subject: [PATCH] Remove mibstore.h - -Signed-off-by: Adam Jackson ---- - saa/saa_priv.h | 1 - - src/vmware.c | 2 -- - vmwgfx/vmwgfx_driver.c | 1 - - 3 files changed, 4 deletions(-) - -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()); --- -1.8.0.2 - diff --git a/sources b/sources index ef6d0e2..bed3322 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e9e72dfbdcacc5392d055934628831cf xf86-video-vmware-20130109.tar.bz2 +b08e0195ebf3f88a82129322cb93da08 xf86-video-vmware-13.0.1.tar.bz2 diff --git a/xorg-x11-drv-vmware.spec b/xorg-x11-drv-vmware.spec index 7650874..5a3c118 100644 --- a/xorg-x11-drv-vmware.spec +++ b/xorg-x11-drv-vmware.spec @@ -1,7 +1,7 @@ %define tarball xf86-video-vmware %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -%define gitdate 20130109 +#define gitdate 20130109 %define gitversion adf375f3 %if 0%{?gitdate} @@ -10,15 +10,17 @@ Summary: Xorg X11 vmware video driver Name: xorg-x11-drv-vmware -Version: 12.0.99.901 -Release: 5%{?gver}%{?dist} +Version: 13.0.1 +Release: 1%{?gver}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support -#Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 +%if 0%{?gitdate} Source0: %{tarball}-%{gitdate}.tar.bz2 -Patch0: 0001-Remove-mibstore.h.patch +%else +Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 +%endif ExclusiveArch: %{ix86} x86_64 ia64 @@ -38,7 +40,6 @@ X.Org X11 vmware video driver. %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -%patch0 -p1 %build %if 0%{?gitdate} @@ -65,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/vmware.4* %changelog +* Tue Apr 23 2013 Peter Hutterer 13.0.1-1 +- vmware 13.0.1 + * Thu Mar 07 2013 Peter Hutterer - 12.0.99.901-5.20130109gitadf375f3 - require xorg-x11-server-devel, not -sdk