From 9d6f69d79c9113b261e779dd9881100812112803 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 05 2015 13:18:09 +0000
Subject: import xorg-x11-drv-vmware-13.0.2-1.el7


---

diff --git a/.gitignore b/.gitignore
index b2e0894..53844c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/xf86-video-vmware-13.0.1.tar.bz2
+SOURCES/xf86-video-vmware-13.0.2.tar.bz2
diff --git a/.xorg-x11-drv-vmware.metadata b/.xorg-x11-drv-vmware.metadata
index 6c0c216..6c4a7e3 100644
--- a/.xorg-x11-drv-vmware.metadata
+++ b/.xorg-x11-drv-vmware.metadata
@@ -1 +1 @@
-c7109eb9f683156b12d3c55a74d51345ab70abfe SOURCES/xf86-video-vmware-13.0.1.tar.bz2
+ec38323a260e50c00f033aeff486a3ae53f46997 SOURCES/xf86-video-vmware-13.0.2.tar.bz2
diff --git a/SOURCES/vmware-13.0.1-xserver-1.15-compat.patch b/SOURCES/vmware-13.0.1-xserver-1.15-compat.patch
deleted file mode 100644
index d7c5483..0000000
--- a/SOURCES/vmware-13.0.1-xserver-1.15-compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up xf86-video-vmware-13.0.1/src/compat-api.h.jx xf86-video-vmware-13.0.1/src/compat-api.h
---- xf86-video-vmware-13.0.1/src/compat-api.h.jx	2012-08-06 18:31:14.000000000 -0400
-+++ xf86-video-vmware-13.0.1/src/compat-api.h	2013-10-24 15:35:30.457648735 -0400
-@@ -96,4 +96,10 @@
- 
- #endif
- 
-+#include "xorg-server.h"
-+#include "xorgVersion.h"
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,3,0)
-+#define DamageUnregister(a, b) DamageUnregister(b)
-+#endif
-+
- #endif
diff --git a/SOURCES/vmware-13.0.1-xv-fix.patch b/SOURCES/vmware-13.0.1-xv-fix.patch
new file mode 100644
index 0000000..acc4327
--- /dev/null
+++ b/SOURCES/vmware-13.0.1-xv-fix.patch
@@ -0,0 +1,22 @@
+diff -up xf86-video-vmware-13.0.1/src/vmwarevideo.c.jx xf86-video-vmware-13.0.1/src/vmwarevideo.c
+--- xf86-video-vmware-13.0.1/src/vmwarevideo.c.jx	2012-08-06 18:31:14.000000000 -0400
++++ xf86-video-vmware-13.0.1/src/vmwarevideo.c	2014-08-14 09:51:15.960270366 -0400
+@@ -789,7 +789,8 @@ vmwareVideoPlay(ScrnInfoPtr pScrn, VMWAR
+     struct PACKED _body {
+         uint32 escape;
+         uint32 streamId;
+-        struct _item items[SVGA_VIDEO_NUM_REGS];
++        /* Old hosts can not handle more then these regs */
++        struct _item items[SVGA_VIDEO_DATA_GMRID];
+     };
+ 
+     struct PACKED _cmdSetRegs {
+@@ -831,7 +832,7 @@ vmwareVideoPlay(ScrnInfoPtr pScrn, VMWAR
+     cmdSetRegs.body.streamId = pVid->streamId;
+ 
+     items = cmdSetRegs.body.items;
+-    for (i = SVGA_VIDEO_ENABLED; i < SVGA_VIDEO_NUM_REGS; i++) {
++    for (i = SVGA_VIDEO_ENABLED; i < SVGA_VIDEO_DATA_GMRID; i++) {
+         items[i].regId = i;
+     }
+ 
diff --git a/SPECS/xorg-x11-drv-vmware.spec b/SPECS/xorg-x11-drv-vmware.spec
index 3f9fcc4..1e9bfa8 100644
--- a/SPECS/xorg-x11-drv-vmware.spec
+++ b/SPECS/xorg-x11-drv-vmware.spec
@@ -10,8 +10,8 @@
 
 Summary:    Xorg X11 vmware video driver
 Name:	    xorg-x11-drv-vmware
-Version:    13.0.1
-Release:    7%{?gver}%{?dist}
+Version:    13.0.2
+Release:    1%{?gver}%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -22,7 +22,7 @@ Source0: %{tarball}-%{gitdate}.tar.bz2
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 %endif
 
-Patch0: vmware-13.0.1-xserver-1.15-compat.patch
+Patch1: vmware-13.0.1-xv-fix.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -31,18 +31,17 @@ BuildRequires: autoconf automake libtool
 %endif
 BuildRequires: xorg-x11-server-devel >= 1.10.99.902
 BuildRequires: libdrm-devel pkgconfig(xext) pkgconfig(x11)
-BuildRequires: mesa-libxatracker-devel >= 8.0.1-4
+BuildRequires: mesa-libxatracker-devel >= 10.2.5-3
 
 Requires: Xorg %(xserver-sdk-abi-requires ansic)
 Requires: Xorg %(xserver-sdk-abi-requires videodrv)
-Requires: libxatracker >= 8.0.1-4
 
 %description 
 X.Org X11 vmware video driver.
 
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-%patch0 -p1 -b .compat
+%patch1 -p1 -b .xv
 
 %build
 %if 0%{?gitdate}
@@ -69,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Tue Sep 09 2014 Adam Jackson <ajax@redhat.com> 13.0.2-1
+- vmware 13.0.2 plus an Xv fix from RHEL 6.6
+
 * Wed Jan 15 2014 Adam Jackson <ajax@redhat.com> - 13.0.1-7
 - 1.15 ABI rebuild