rpms/xorg-x11-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Thu Mar 27 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-13.20080314

Browse Source 
- archify the vmmouse logic.
This commit is contained in:
Adam Jackson 2008-03-27 13:52:30 +00:00
parent d15d772aa0
commit 78970a82c6
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xorg-x11-server.spec
View File

@ -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 <ajax@redhat.com> 1.4.99.901-13.20080314
- archify the vmmouse logic.
* Thu Mar 27 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-12.20080314
- xserver-1.5.0-fix-lsl-quirk.patch - fix the LSL quirk (#435216)

28
xserver-1.5.0-vmmouse.patch
View File

@ -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 <ajax@redhat.com>
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 = "<default pointer>";
- 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 = "<default pointer>";
- 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) {