rpms/xorg-x11-server/devel xserver-1.5.0-vmmouse.patch, NONE, 1.1 xorg-x11-server.spec, 1.312, 1.313

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31041

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.0-vmmouse.patch 
Log Message:
* Wed Mar 26 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-10.20080314
- xserver-1.5.0-vmmouse.patch: Use vmmouse(4) for the automagic mouse
  section.  It'll just fall back to the mouse(4) driver anyway if it's
  not a vmmouse.


xserver-1.5.0-vmmouse.patch:

--- NEW FILE xserver-1.5.0-vmmouse.patch ---
>From 15f5b9b9d1db20cc283098e03f536d4d10a890f8 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Wed, 26 Mar 2008 18:07:37 -0400
Subject: [PATCH] Use vmmouse, not mouse, for automatic mouse sections.

---
 hw/xfree86/common/xf86Config.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 4a4aabc..93b18bd 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1336,7 +1336,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
     if (!foundPointer) {
 	bzero(&defPtr, sizeof(defPtr));
 	defPtr.inp_identifier = "<default pointer>";
-	defPtr.inp_driver = "mouse";
+	defPtr.inp_driver = "vmmouse";
 	confInput = &defPtr;
 	foundPointer = TRUE;
 	from = X_DEFAULT;
@@ -1383,7 +1383,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
 	xf86Msg(X_INFO, "No default mouse found, adding one\n");
 	bzero(&defPtr, sizeof(defPtr));
 	defPtr.inp_identifier = "<default pointer>";
-	defPtr.inp_driver = "mouse";
+	defPtr.inp_driver = "vmmouse";
 	confInput = &defPtr;
 	foundPointer = configInput(&Pointer, confInput, from);
         if (foundPointer) {
-- 
1.5.4.3



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- xorg-x11-server.spec	18 Mar 2008 19:20:07 -0000	1.312
+++ xorg-x11-server.spec	26 Mar 2008 22:09:47 -0000	1.313
@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.901
-Release:   10.%{gitdate}%{?dist}
+Release:   11.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -65,6 +65,7 @@
 Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch
 Patch5008: xserver-1.5.0-xaa-sucks.patch
 Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch
+Patch5010: xserver-1.5.0-vmmouse.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -158,7 +159,7 @@
 Provides: Xserver
 # Requires: xorg-x11-drivers >= 0.99.2-4
 Requires: xorg-x11-drv-mouse xorg-x11-drv-keyboard xorg-x11-drv-vesa
-Requires: xorg-x11-drv-void xorg-x11-drv-evdev
+Requires: xorg-x11-drv-void xorg-x11-drv-evdev xorg-x11-drv-vmmouse
 # virtuals.  XXX fix the xkbcomp fork() upstream.
 Requires: xkbdata xkbcomp
 Requires: xorg-x11-server-common >= %{version}-%{release}
@@ -513,6 +514,11 @@
 
 
 %changelog
+* Wed Mar 26 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-10.20080314
+- xserver-1.5.0-vmmouse.patch: Use vmmouse(4) for the automagic mouse
+  section.  It'll just fall back to the mouse(4) driver anyway if it's
+  not a vmmouse.
+
 * Tue Mar 18 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-10.20080314
 - xserver-1.5.0-no-evdev-keyboards-kthnx.patch: Sorry, evdev keyboarding is
   just too broken.