From 78970a82c6a7fb8ff34e13e82ceb8329d7e099e9 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 27 Mar 2008 13:52:30 +0000 Subject: [PATCH] * Thu Mar 27 2008 Adam Jackson 1.4.99.901-13.20080314 - archify the vmmouse logic. --- xorg-x11-server.spec | 10 ++++++++-- xserver-1.5.0-vmmouse.patch | 28 +++++++++++++++++----------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 6f1d7ec..442bda3 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: 12.%{gitdate}%{?dist} +Release: 13.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -160,7 +160,10 @@ 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 xorg-x11-drv-vmmouse +Requires: xorg-x11-drv-void xorg-x11-drv-evdev +%ifarch %{ix86} x86_64 +Requires: xorg-x11-drv-vmmouse +%endif # virtuals. XXX fix the xkbcomp fork() upstream. Requires: xkbdata xkbcomp Requires: xorg-x11-server-common >= %{version}-%{release} @@ -515,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 27 2008 Adam Jackson 1.4.99.901-13.20080314 +- archify the vmmouse logic. + * Thu Mar 27 2008 Dave Airlie 1.4.99.901-12.20080314 - xserver-1.5.0-fix-lsl-quirk.patch - fix the LSL quirk (#435216) diff --git a/xserver-1.5.0-vmmouse.patch b/xserver-1.5.0-vmmouse.patch index 46fb4e7..d6ceaa1 100644 --- a/xserver-1.5.0-vmmouse.patch +++ b/xserver-1.5.0-vmmouse.patch @@ -1,31 +1,37 @@ -From 15f5b9b9d1db20cc283098e03f536d4d10a890f8 Mon Sep 17 00:00:00 2001 +From 6f3a12d390eb67856f2a32a83f72eed3aea99e70 Mon Sep 17 00:00:00 2001 From: Adam Jackson -Date: Wed, 26 Mar 2008 18:07:37 -0400 +Date: Thu, 27 Mar 2008 09:50:34 -0400 Subject: [PATCH] Use vmmouse, not mouse, for automatic mouse sections. --- - hw/xfree86/common/xf86Config.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + hw/xfree86/common/xf86Config.c | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 4a4aabc..93b18bd 100644 +index 4a4aabc..0c579fb 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c -@@ -1336,7 +1336,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) +@@ -1336,7 +1336,11 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) if (!foundPointer) { bzero(&defPtr, sizeof(defPtr)); defPtr.inp_identifier = ""; -- defPtr.inp_driver = "mouse"; -+ defPtr.inp_driver = "vmmouse"; ++#if defined(__i386__) || defined (__amd64__) ++ defPtr.inp_driver = "vmmouse" ++#else + defPtr.inp_driver = "mouse"; ++#endif confInput = &defPtr; foundPointer = TRUE; from = X_DEFAULT; -@@ -1383,7 +1383,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) +@@ -1383,7 +1387,11 @@ 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"; ++#if defined(__i386__) || defined (__amd64__) ++ defPtr.inp_driver = "vmmouse" ++#else + defPtr.inp_driver = "mouse"; ++#endif confInput = &defPtr; foundPointer = configInput(&Pointer, confInput, from); if (foundPointer) {