commit 0f3d71413bccfed89a887aa5158a7f8fa68d0b93
Author: Jan Rękorajski <[email protected]>
Date: Fri Jan 3 21:25:51 2014 +0100
- fix building with xserver 1.15
xorg-driver-video-intel.spec | 2 ++
xserver-1.15.patch | 12 ++++++++++++
2 files changed, 14 insertions(+)
---
diff --git a/xorg-driver-video-intel.spec b/xorg-driver-video-intel.spec
index d1d9e26..ff2e814 100644
--- a/xorg-driver-video-intel.spec
+++ b/xorg-driver-video-intel.spec
@@ -19,6 +19,7 @@ License: MIT
Group: X11/Applications
Source0:
http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-%{version}.tar.bz2
# Source0-md5: 8b646d257ace8197d6ab4e5ddeb8efb2
+Patch0: xserver-1.15.patch
URL: http://xorg.freedesktop.org/
BuildRequires: Mesa-libGL-devel
#BuildRequires: autoconf >= 2.63
@@ -89,6 +90,7 @@ Wymaga aktywnego Kernel Mode Setting (KMS).
%prep
%setup -q -n xf86-video-intel-%{version}
+%patch0 -p1
%build
%configure \
diff --git a/xserver-1.15.patch b/xserver-1.15.patch
new file mode 100644
index 0000000..6062a70
--- /dev/null
+++ b/xserver-1.15.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(b)
++#endif
++
+ #endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-intel.git/commitdiff/0f3d71413bccfed89a887aa5158a7f8fa68d0b93
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
