From af8540cd330a959338bd37576323b5ff821b2ba1 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 05:00:08 +0000
Subject: import xorg-x11-drv-vmware-13.2.1-1.el7.1


---

diff --git a/SOURCES/0001-saa-Build-compatibility-with-xserver-1.20.patch b/SOURCES/0001-saa-Build-compatibility-with-xserver-1.20.patch
new file mode 100644
index 0000000..924add8
--- /dev/null
+++ b/SOURCES/0001-saa-Build-compatibility-with-xserver-1.20.patch
@@ -0,0 +1,32 @@
+From 7e5237dd08f2a469d0bc699cbcde763cc93c7407 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 7 Nov 2017 15:42:59 -0500
+Subject: [PATCH xf86-video-vmware] saa: Build compatibility with xserver 1.20
+
+fbGetRotatedPixmap went away with 24bpp support, just treat it as NULL
+and we'll do the right thing.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ saa/saa.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/saa/saa.c b/saa/saa.c
+index be9520e..d956853 100644
+--- a/saa/saa.c
++++ b/saa/saa.c
+@@ -370,6 +370,11 @@ saa_op_reads_destination(CARD8 op)
+     }
+ }
+ 
++/* compatibility with xserver >= 1.20 */
++#ifndef fbGetRotatedPixmap
++#define fbGetRotatedPixmap(pGC) NULL
++#endif
++
+ static void
+ saa_validate_gc(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
+ {
+-- 
+2.16.2
+
diff --git a/SPECS/xorg-x11-drv-vmware.spec b/SPECS/xorg-x11-drv-vmware.spec
index 65aef7c..09ca79e 100644
--- a/SPECS/xorg-x11-drv-vmware.spec
+++ b/SPECS/xorg-x11-drv-vmware.spec
@@ -13,7 +13,7 @@
 Summary:    Xorg X11 vmware video driver
 Name:	    xorg-x11-drv-vmware
 Version:    13.2.1
-Release:    1%{?gver}%{?dist}
+Release:    1%{?gver}%{?dist}.1
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -24,6 +24,8 @@ Source0: %{tarball}-%{gitdate}.tar.bz2
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 %endif
 
+Patch0: 0001-saa-Build-compatibility-with-xserver-1.20.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: autoconf automake libtool
@@ -39,7 +41,7 @@ Requires: Xorg %(xserver-sdk-abi-requires videodrv)
 X.Org X11 vmware video driver.
 
 %prep
-%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%autosetup -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -p1
 
 %build
 autoreconf -v --install || exit 1
@@ -58,6 +60,9 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Wed May 30 2018 Adam Jackson <ajax@redhat.com> - 13.2.1-1.1
+- Rebuild for xserver 1.20
+
 * Mon Jan  9 2017 Hans de Goede <hdegoede@redhat.com> - 13.2.1-1
 - New upstream bug-fix release 13.2.1