rpms/xorg-x11-server/F-9 xorg-x11-server.spec, 1.342, 1.343 xserver-1.5.0-no-evdev-keyboards-kthnx.patch, 1.4, 1.5

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2409

Modified Files:
	xorg-x11-server.spec 
	xserver-1.5.0-no-evdev-keyboards-kthnx.patch 
Log Message:
* Thu Sep 18 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.5.0-2
- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: update to force
  AllowEmptyInput off by default. #462606 




Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- xorg-x11-server.spec	12 Sep 2008 14:24:46 -0000	1.342
+++ xorg-x11-server.spec	18 Sep 2008 02:09:43 -0000	1.343
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -458,6 +458,10 @@
 
 
 %changelog
+* Thu Sep 18 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.5.0-2
+- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: update to force
+  AllowEmptyInput off by default. #462606 
+
 * Fri Sep 12 2008 Adam Jackson <ajax at redhat.com> 1.5.0-1
 - xserver 1.5.0
 

xserver-1.5.0-no-evdev-keyboards-kthnx.patch:

Index: xserver-1.5.0-no-evdev-keyboards-kthnx.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xserver-1.5.0-no-evdev-keyboards-kthnx.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xserver-1.5.0-no-evdev-keyboards-kthnx.patch	12 Sep 2008 14:14:43 -0000	1.4
+++ xserver-1.5.0-no-evdev-keyboards-kthnx.patch	18 Sep 2008 02:09:43 -0000	1.5
@@ -1,11 +1,14 @@
-From d70615e602361be7204552327f1fd5fa6d170cd0 Mon Sep 17 00:00:00 2001
+From c5714d2d77e872344d0ef8b4665f50cd43e467d8 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Fri, 12 Sep 2008 10:12:55 -0400
 Subject: [PATCH] config: disable evdev for keyboards
 
+If we ignore evdev keyboards, then we must have AEI off by default to allow
+for kbd to start if no xorg.conf is present.
 ---
- config/hal.c |   28 ++++++++++++++++++++++++++++
- 1 files changed, 28 insertions(+), 0 deletions(-)
+ config/hal.c                   |   28 ++++++++++++++++++++++++++++
+ hw/xfree86/common/xf86Config.c |    5 +++--
+ 2 files changed, 31 insertions(+), 2 deletions(-)
 
 diff --git a/config/hal.c b/config/hal.c
 index 0e0505b..76e8c45 100644
@@ -53,6 +56,22 @@
      driver = get_prop_string(hal_ctx, udi, "input.x11_driver");
      if (!driver){
          /* verbose, don't tell the user unless they _want_ to see it */
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index a1c2e34..67cc783 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -1088,8 +1088,9 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
+     }
+ #endif
+ 
+-    /* AllowEmptyInput is automatically true if we're hotplugging */
+-    xf86Info.allowEmptyInput = (xf86Info.autoAddDevices && xf86Info.autoEnableDevices);
++    /* Disable AEI by default, so setups with no config file force the kbd
++     * driver */
++    xf86Info.allowEmptyInput = FALSE;
+     xf86GetOptValBool(FlagOptions, FLAG_ALLOW_EMPTY_INPUT, &xf86Info.allowEmptyInput);
+ 
+     xf86Info.useDefaultFontPath = TRUE;
 -- 
-1.6.0.1
+1.5.5.2