From 1a87a54d6ca41c5d2112a8c16fa89a7e9f4daa8c Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 26 Mar 2008 22:09:47 +0000 Subject: [PATCH] * Wed Mar 26 2008 Adam Jackson 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. --- xorg-x11-server.spec | 10 ++++++++-- xserver-1.5.0-vmmouse.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 xserver-1.5.0-vmmouse.patch diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 052fb7e..f53337f 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -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 @@ Patch5005: xserver-1.5.0-unselinux.patch 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: Xorg = %{version}-%{release} 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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 26 2008 Adam Jackson 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 1.4.99.901-10.20080314 - xserver-1.5.0-no-evdev-keyboards-kthnx.patch: Sorry, evdev keyboarding is just too broken. diff --git a/xserver-1.5.0-vmmouse.patch b/xserver-1.5.0-vmmouse.patch new file mode 100644 index 0000000..46fb4e7 --- /dev/null +++ b/xserver-1.5.0-vmmouse.patch @@ -0,0 +1,34 @@ +From 15f5b9b9d1db20cc283098e03f536d4d10a890f8 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +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 = ""; +- 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 = ""; +- defPtr.inp_driver = "mouse"; ++ defPtr.inp_driver = "vmmouse"; + confInput = &defPtr; + foundPointer = configInput(&Pointer, confInput, from); + if (foundPointer) { +-- +1.5.4.3 +