Fix build issues on new kernels caused by removal of _INPUT_H

0001-xf86-Fix-build-against-recent-Linux-kernel.patch

@@ -0,0 +1,35 @@
+From c5396ec05a5c6cab6608ba677f703c5227b1de13 Mon Sep 17 00:00:00 2001
+From: Thierry Reding <thierry.reding@avionic-design.de>
+Date: Wed, 17 Oct 2012 12:11:49 +0200
+Subject: [PATCH] xf86: Fix build against recent Linux kernel
+
+Recent Linux kernels reworked the linux/input.h header file, which is
+now part of the "user-space API". The include guard therefore has an
+additional additional _UAPI prefix.
+
+Instead of adding another case to the #ifdef, drop any include guard
+checks and instead always undefine the BUS_* definitions on Linux.
+
+Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
+Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ hw/xfree86/common/xf86str.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
+index 0590262..4c2d147 100644
+--- a/hw/xfree86/common/xf86str.h
++++ b/hw/xfree86/common/xf86str.h
+@@ -347,7 +347,7 @@ typedef struct _DriverRec {
+  */
+ 
+ /* Tolerate prior #include <linux/input.h> */
+-#if defined(linux) && defined(_INPUT_H)
++#if defined(linux)
+ #undef BUS_NONE
+ #undef BUS_PCI
+ #undef BUS_SBUS
+-- 
+1.7.11.7
+

xorg-x11-server.spec

@@ -43,7 +43,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.13.0
-Release:   6%{?gitdate:.%{gitdate}}%{dist}
+Release:   7%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -125,6 +125,9 @@ Patch7057: 0001-Xi-Call-UpdateDeviceState-after-the-first-emulated-m.patch
 Patch7058: 0001-Xi-Don-t-check-for-TOUCH_END-it-s-never-set.patch
 Patch7059: 0001-Xi-don-t-deliver-TouchEnd-to-a-client-waiting-for-To.patch
 
+# kernel doesn't use _INPUT_H anymore
+Patch7060:  0001-xf86-Fix-build-against-recent-Linux-kernel.patch
+
 %global moduledir	%{_libdir}/xorg/modules
 %global drimoduledir	%{_libdir}/dri
 %global sdkdir		%{_includedir}/xorg
@@ -597,6 +600,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Oct 31 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.13.0-7
+- Fix build issues on new kernels caused by removal of _INPUT_H
+
 * Tue Oct 30 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.13.0-6
 - Add touchscreen fixes (including pointer emulation) #871064