rpms/xorg-x11-server/F-10 xserver-1.5.3-AEI-on-by-default.patch, NONE, 1.1 xorg-x11-server.spec, 1.381, 1.382

[Peter Hutterer]

Author: whot

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.3-AEI-on-by-default.patch 
Log Message:
* Thu Nov 13 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.5.3-3
- xserver-1.5.3-AEI-on-by-default.patch: ensure AEI on if there is no
  xorg.conf. (#471221)




xserver-1.5.3-AEI-on-by-default.patch:

--- NEW FILE xserver-1.5.3-AEI-on-by-default.patch ---
>From 15bf414daa83967fd1f24bd48bd01ea941c11ce2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at redhat.com>
Date: Thu, 13 Nov 2008 10:17:33 +1000
Subject: [PATCH] xfree86: AllowEmptyInput is true by default - update the xf86Info defaults.

Also set AutoAddDevices and AutoEnableDevices to their defaults.

And in doing so, switch the rest of the defaults over to named intializers.

Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>
(cherry picked from commit 0b56b44addc323a00eb7cd86240cb0dd4275bcf8)

Conflicts:

	hw/xfree86/common/xf86Globals.c
---
 hw/xfree86/common/xf86Globals.c |   69 ++++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index f5babbc..a5edd82 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -95,45 +95,48 @@ InputInfoPtr xf86InputDevs = NULL;
 /* Globals that video drivers may not access */
 
 xf86InfoRec xf86Info = {
-	-1,		/* consoleFd */
-	-1,		/* vtno */
-	FALSE,		/* vtSysreq */
-	SKWhenNeeded,	/* ddxSpecialKeys */
-	NULL,		/* pMouse */
+    .consoleFd                  = -1,
+    .vtno                       = -1,
+    .vtSysreq                   = FALSE,
+    .ddxSpecialKeys             = SKWhenNeeded,
+    .pMouse                     = NULL,
 #ifdef XINPUT
-	NULL,		/* mouseLocal */
+    .mouseLocal                 = NULL,
 #endif
-	-1,		/* lastEventTime */
-	FALSE,		/* vtRequestsPending */
-	FALSE,		/* inputPending */
-	FALSE,		/* dontVTSwitch */
-	FALSE,		/* dontZap */
-	FALSE,		/* dontZoom */
-	FALSE,		/* notrapSignals */
-	FALSE,		/* caughtSignal */
-	FALSE,		/* sharedMonitor */
-	NULL,		/* currentScreen */
+    .lastEventTime              = -1,
+    .vtRequestsPending          = FALSE,
+    .inputPending               = FALSE,
+    .dontVTSwitch               = FALSE,
+    .dontZap                    = FALSE,
+    .dontZoom                   = FALSE,
+    .notrapSignals              = FALSE,
+    .caughtSignal               = FALSE,
+    .sharedMonitor              = FALSE,
+    .currentScreen              = NULL,
 #ifdef CSRG_BASED
-	-1,		/* screenFd */
-	-1,		/* consType */
+    .screenFd                   = -1,
+    .consType                   = -1,
 #endif
-	FALSE,		/* allowMouseOpenFail */
-	TRUE,		/* vidModeEnabled */
-	FALSE,		/* vidModeAllowNonLocal */
-	TRUE,		/* miscModInDevEnabled */
-	FALSE,		/* miscModInDevAllowNonLocal */
-	PCIOsConfig,	/* pciFlags */
-	Pix24DontCare,	/* pixmap24 */
-	X_DEFAULT,	/* pix24From */
+    .allowMouseOpenFail         = FALSE,
+    .vidModeEnabled             = TRUE,
+    .vidModeAllowNonLocal       = FALSE,
+    .miscModInDevEnabled        = TRUE,
+    .miscModInDevAllowNonLocal  = FALSE,
+    .pciFlags                   = PCIOsConfig,
+    .pixmap24                   = Pix24DontCare,
+    .pix24From                  = X_DEFAULT,
 #ifdef __i386__
-	FALSE,		/* pc98 */
+    .pc98                       = FALSE,
 #endif
-	TRUE,		/* pmFlag */
-	LogNone,	/* syncLog */
-	0,		/* estimateSizesAggressively */
-	FALSE,		/* kbdCustomKeycodes */
-	FALSE,		/* disableRandR */
-	X_DEFAULT	/* randRFrom */
+    .pmFlag                     = TRUE,
+    .log                        = LogNone,
+    .estimateSizesAggressively  = 0,
+    .kbdCustomKeycodes          = FALSE,
+    .disableRandR               = FALSE,
+    .randRFrom                  = X_DEFAULT,
+    .allowEmptyInput            = TRUE,
+    .autoAddDevices             = TRUE,
+    .autoEnableDevices          = TRUE
 };
 const char *xf86ConfigFile = NULL;
 const char *xf86InputDeviceList = NULL;
-- 
1.6.0.3



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-10/xorg-x11-server.spec,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -r1.381 -r1.382
--- xorg-x11-server.spec	12 Nov 2008 07:14:28 -0000	1.381
+++ xorg-x11-server.spec	13 Nov 2008 04:05:47 -0000	1.382
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.3
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -85,6 +85,8 @@
 
 # Bug 434807
 Patch6003: xserver-1.5.2-more-sanity-checks.patch
+# Bug 471221
+Patch6004: xserver-1.5.3-AEI-on-by-default.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -516,6 +518,10 @@
 
 
 %changelog
+* Thu Nov 13 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.5.3-3
+- xserver-1.5.3-AEI-on-by-default.patch: ensure AEI on if there is no
+  xorg.conf. (#471221)
+
 * Wed Nov 12 2008 Dave Airlie <airlied at redhat.com> 1.5.3-2
 - xserver-1.5.3-exa-fix-composite-rects.patch - backport (#470638)
 - xserver-1.5.3-exa-fix-x-y-src-dst.patch - backport