Build fix for xserver 1.20

This commit is contained in:
Adam Jackson 2018-03-05 13:57:49 -05:00
parent 67b006e203
commit a6133193d4
2 changed files with 39 additions and 1 deletions

View File

@ -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

View File

@ -13,7 +13,7 @@
Summary: Xorg X11 vmware video driver
Name: xorg-x11-drv-vmware
Version: 13.2.1
Release: 5%{?gver}%{?dist}
Release: 6%{?gver}%{?dist}
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
@ -41,6 +43,7 @@ X.Org X11 vmware video driver.
%prep
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%patch0 -p1
%build
autoreconf -v --install || exit 1
@ -59,6 +62,9 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
%{_mandir}/man4/vmware.4*
%changelog
* Mon Mar 05 2018 Adam Jackson <ajax@redhat.com> - 13.2.1-6
- Build fix for xserver 1.20
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 13.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild