diff --git a/vmware-13.0.1-xserver-1.15-compat.patch b/vmware-13.0.1-xserver-1.15-compat.patch new file mode 100644 index 0000000..cee6430 --- /dev/null +++ b/vmware-13.0.1-xserver-1.15-compat.patch @@ -0,0 +1,12 @@ +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,8 @@ + + #endif + ++#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,14,99,3,0) ++#define DamageUnregister(a, b) DamageUnregister(a) ++#endif ++ + #endif diff --git a/xorg-x11-drv-vmware.spec b/xorg-x11-drv-vmware.spec index 707cb40..ee2385b 100644 --- a/xorg-x11-drv-vmware.spec +++ b/xorg-x11-drv-vmware.spec @@ -11,7 +11,7 @@ Summary: Xorg X11 vmware video driver Name: xorg-x11-drv-vmware Version: 13.0.1 -Release: 2%{?gver}%{?dist} +Release: 3%{?gver}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -22,6 +22,8 @@ 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 + ExclusiveArch: %{ix86} x86_64 ia64 %if 0%{?gitdate} @@ -40,6 +42,7 @@ X.Org X11 vmware video driver. %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%patch0 -p1 -b .compat %build %if 0%{?gitdate} @@ -66,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/vmware.4* %changelog +* Thu Oct 24 2013 Adam Jackson 13.0.1-3 +- xserver 1.15 API compat + * Sun Aug 04 2013 Fedora Release Engineering - 13.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild