[xorg-x11-drv-intel] xserver 1.15 API compat

[Adam Jackson]

commit ca4947fe2af0c85c06abd115d39c834d1efc277d
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Oct 24 15:34:47 2013 -0400

    xserver 1.15 API compat

 intel-2.21.15-xserver-1.15-compat.patch |   12 ++++++++++++
 xorg-x11-drv-intel.spec                 |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/intel-2.21.15-xserver-1.15-compat.patch b/intel-2.21.15-xserver-1.15-compat.patch
new file mode 100644
index 0000000..b45a2a2
--- /dev/null
+++ b/intel-2.21.15-xserver-1.15-compat.patch
@@ -0,0 +1,12 @@
+diff -up xf86-video-intel-2.21.15/src/compat-api.h.jx xf86-video-intel-2.21.15/src/compat-api.h
+--- xf86-video-intel-2.21.15/src/compat-api.h.jx	2013-05-21 06:15:11.000000000 -0400
++++ xf86-video-intel-2.21.15/src/compat-api.h	2013-10-24 15:30:52.291337300 -0400
+@@ -158,4 +158,8 @@ static inline void FreePixmap(PixmapPtr
+ 	if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h)
+ #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-intel.spec b/xorg-x11-drv-intel.spec
index dc8d7b3..0948982 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -25,7 +25,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.21.15
-Release:   4%{?gitrev}%{?dist}
+Release:   5%{?gitrev}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -41,6 +41,7 @@ Source4:    make-git-snapshot.sh
 
 Patch1: 0001-xwayland-Add-xwayland-support.patch
 Patch2: 0002-xwayland-shortcut-Enter-ExitVT.patch
+Patch3: intel-2.21.15-xserver-1.15-compat.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -89,6 +90,7 @@ Debugging tools for Intel graphics chips
 %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3
 %patch1 -p1 -b .wl1
 %patch2 -p1 -b .wl2
+%patch3 -p1 -b .compat
 %build
  
 #export CFLAGS="$RPM_OPT_FLAGS -fno-omit-frame-pointer"
@@ -160,6 +162,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Thu Oct 24 2013 Adam Jackson <ajax at redhat.com> 2.21.15-5
+- xserver 1.15 API compat
+
 * Wed Oct 02 2013 Adam Jackson <ajax at redhat.com> 2.21.15-4
 - Default to uxa again