* Wed Dec 24 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-4

- xserver-1.5.99.3-ddx-rules.patch: enable the DDX to set the rules for the
  core devices (#477712)
- Require xorg-x11-drv-evdev 2.1.0-3 for ABI.

xorg-x11-server.spec

@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.3
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -73,6 +73,8 @@ Patch5011: xserver-1.4.99-endian.patch
 Patch6002: xserver-1.5.1-mode-debug.patch
 
 Patch6004: xserver-1.5.99.3-dmx-xcalloc.patch
+# 6005 should be in 1.5.99.4
+Patch6005: xserver-1.5.99.3-ddx-rules.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -152,7 +154,7 @@ Requires: xorg-x11-drv-vesa
 %else
 Requires: xorg-x11-drv-fbdev
 %endif
-Requires: xorg-x11-drv-void xorg-x11-drv-evdev
+Requires: xorg-x11-drv-void xorg-x11-drv-evdev >= 2.1.0-3
 # virtuals.  XXX fix the xkbcomp fork() upstream.
 Requires: xkbdata xkbcomp
 Requires: xorg-x11-server-common >= %{version}-%{release}
@@ -493,6 +495,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 24 2008 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.3-4
+- xserver-1.5.99.3-ddx-rules.patch: enable the DDX to set the rules for the
+  core devices (#477712)
+- Require xorg-x11-drv-evdev 2.1.0-3 for ABI.
+
 * Mon Dec 22 2008 Adam Jackson <ajax@redhat.com> 1.5.99.3-3
 - xserver-1.5.0-bad-fbdev-thats-mine.patch: Do the same for sbus that we do
   for pci.

xserver-1.5.99.3-ddx-rules.patch

@@ -0,0 +1,47 @@
+From 9c5dd7337fa93fb1650cc017e523b939dcbf482a Mon Sep 17 00:00:00 2001
+From: Peter Hutterer<peter.hutterer@redhat.com>
+Date: Wed, 03  Dec  2008  04:24:25  +0000
+Subject: Let the DDX decide on the XkbRulesDefaults.
+
+Rather than assuming rules in the CoreKeyboardProc, init the default rules in
+InitCoreDevices, then re-use them later.
+
+In the xfree86 DDX, set the rules to "base" or "evdev", depending on whether
+we'll load kbd or evdev.
+
+If we create a new MD, use pc105,us as default and re-use the rules file used
+previously.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+---
+diff --git a/dix/devices.c b/dix/devices.c
+index 6b8cecb..9feca90 100644
+--- a/dix/devices.c
++++ b/dix/devices.c
+@@ -526,7 +526,6 @@ CoreKeyboardProc(DeviceIntPtr pDev, int what)
+ #ifdef XKB
+         if (!noXkbExtension) {
+             bzero(&names, sizeof(names));
+-            XkbSetRulesDflts("base", "pc105", "us", NULL, NULL);
+             XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, modMap,
+                                         CoreKeyboardBell, CoreKeyboardCtl);
+         }
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 1210a8f..9bf18b5 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -1008,6 +1008,12 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
+     xf86Info.allowEmptyInput = (xf86Info.autoAddDevices && xf86Info.autoEnableDevices);
+     xf86GetOptValBool(FlagOptions, FLAG_ALLOW_EMPTY_INPUT, &xf86Info.allowEmptyInput);
+ 
++    /* AEI on? Then we're not using kbd, so use the evdev rules set. */
++#ifdef XKB
++    XkbSetRulesDflts(((xf86Info.allowEmptyInput) ? "evdev" : "base"),
++                     "pc105", "us", NULL, NULL);
++#endif
++
+     xf86Info.useDefaultFontPath = TRUE;
+     xf86Info.useDefaultFontPathFrom = X_DEFAULT;
+     if (xf86GetOptValBool(FlagOptions, FLAG_USE_DEFAULT_FONT_PATH, &value)) {
+--
+cgit v0.8.1-24-ge5fb