From 1173daef134b662170d931d9f684f2d871ccdb0e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Mar 23 2010 03:23:10 +0000
Subject: * Tue Mar 23 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7.99.902-3.20100319

- xserver-1.8-merge-driver.patch: merge driver from input classes into
  options. Fixes wacom hotplugging issues.

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 21cac2f..6fd354c 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.99.902
-Release:   2.%{gitdate}%{dist}
+Release:   3.%{gitdate}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -88,6 +88,7 @@ Patch6053: xserver-1.8-disable-vboxvideo.patch
 
 # 543647
 Patch6054: xserver-1.7.4-owner-events.patch
+Patch6055: xserver-1.8-merge-driver.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -525,6 +526,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Mar 23 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7.99.902-3.20100319
+- xserver-1.8-merge-driver.patch: merge driver from input classes into
+  options. Fixes wacom hotplugging issues.
+
 * Fri Mar 19 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7.99.902-2.20100319
 - xserver-1.7.4-owner-events.patch: if owner-events is true for passive
   grabs, add the window mask (#543647)
diff --git a/xserver-1.8-merge-driver.patch b/xserver-1.8-merge-driver.patch
new file mode 100644
index 0000000..6c3818f
--- /dev/null
+++ b/xserver-1.8-merge-driver.patch
@@ -0,0 +1,36 @@
+From 4528e6dfb838a0f2d164ae15e637406adba36144 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 23 Mar 2010 12:13:56 +1000
+Subject: [PATCH] xfree86: merge driver from the input class into the options.
+
+A driver that is assigned by an input class is only present as idev->driver.
+The driver itself has no access to this information once PreInit is called.
+For devices that rely on chain-hotplugging (wacom), this means that for the
+second device the driver information is lost and the second device cannot be
+initialized through NewInputDeviceRequest. Although this could be worked
+around by hardcoding the driver name in the wacom driver, having the
+assigned driver in the options seems like the better solution.
+
+This issue only manifests itself with the udev backend. With HAL, the driver
+is assigned by HAL and the option is duplicated in config/hal.c.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ hw/xfree86/common/xf86Xinput.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
+index e9f7f2f..8229227 100644
+--- a/hw/xfree86/common/xf86Xinput.c
++++ b/hw/xfree86/common/xf86Xinput.c
+@@ -618,6 +618,7 @@ MergeInputClasses(IDevPtr idev, InputAttributes *attrs)
+                     "InputClass configuration");
+             return BadAlloc;
+         }
++        mergedopts = xf86ReplaceStrOption(mergedopts, "driver", idev->driver);
+     }
+     idev->commonOptions = xf86optionListMerge(idev->commonOptions, mergedopts);
+ 
+-- 
+1.6.6.1
+