rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.369, 1.370 xserver-1.5.2-disable-kbd-mouse.patch, 1.1, 1.2
Dave Airlie
airlied at fedoraproject.org
Sun Oct 19 07:54:07 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3548
Modified Files:
xorg-x11-server.spec xserver-1.5.2-disable-kbd-mouse.patch
Log Message:
- Update xserver-1.5.2-disable-kbd-mouse.patch: if no config file is present,
we need to force AllowEmptyInput on.
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -r1.369 -r1.370
--- xorg-x11-server.spec 16 Oct 2008 06:49:35 -0000 1.369
+++ xorg-x11-server.spec 19 Oct 2008 07:53:35 -0000 1.370
@@ -19,7 +19,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.5.2
-Release: 5%{?dist}
+Release: 6%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -521,6 +521,10 @@
%changelog
+* Sun Oct 19 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.5.2-6
+- Update xserver-1.5.2-disable-kbd-mouse.patch: if no config file is present,
+ we need to force AllowEmptyInput on.
+
* Thu Oct 16 2008 Peter Hutterer <peter.hutterer at redhat.com> 1.5.2-5
- xserver-1.5.2-enable-RAW-console.patch: enable RAW mode for console, no need
for grabbing the evdev device anymore.
xserver-1.5.2-disable-kbd-mouse.patch:
Index: xserver-1.5.2-disable-kbd-mouse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.2-disable-kbd-mouse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.5.2-disable-kbd-mouse.patch 16 Oct 2008 06:49:35 -0000 1.1
+++ xserver-1.5.2-disable-kbd-mouse.patch 19 Oct 2008 07:53:35 -0000 1.2
@@ -1,4 +1,4 @@
-From 64db18dbc3a28e5b81140df0c76d1e1c38e9b225 Mon Sep 17 00:00:00 2001
+From d3863202cba03fe564d6cc1fe3641f017392c9e7 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at redhat.com>
Date: Thu, 16 Oct 2008 11:22:29 +1030
Subject: [PATCH] xfree86: If AEI is on, disable "kbd" and "mouse" devices.
@@ -11,9 +11,11 @@
remove any that use mouse or kbd.
AEI is mutually exclusive with the kbd and mouse drivers, so pick either - or.
+If no config file is present, force AEI on.
---
hw/xfree86/common/xf86Config.c | 39 +++++++++++++++++++++++++++++++++++++--
- 1 files changed, 37 insertions(+), 2 deletions(-)
+ hw/xfree86/common/xf86Init.c | 2 ++
+ 2 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index a1c2e34..ac80add 100644
@@ -79,6 +81,19 @@
}
/*
+diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
+index 68dc387..eb4ebfa 100644
+--- a/hw/xfree86/common/xf86Init.c
++++ b/hw/xfree86/common/xf86Init.c
+@@ -508,6 +508,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
+ xf86Msg(X_ERROR, "Error parsing the config file\n");
+ return;
+ case CONFIG_NOFILE:
++ /* No config file? Then we want HAL to give us the devices. */
++ xf86Info.allowEmptyInput = TRUE;
+ autoconfig = TRUE;
+ break;
+ }
--
1.6.0.1
More information about the fedora-extras-commits
mailing list