Mailinglist Archive: opensuse-commit (1318 mails)
| < Previous | Next > |
commit xorg-x11-driver-input
- From: root@xxxxxxx (h_root)
- Date: Sun, 6 Aug 2006 22:07:45 +0200 (CEST)
- Message-id: <20060806200745.3482A9510D@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package xorg-x11-driver-input
checked in at Sun Aug 6 22:07:44 CEST 2006.
--------
--- xorg-x11-driver-input/xorg-x11-driver-input.changes 2006-07-31 17:26:27.000000000 +0200
+++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2006-08-06 15:30:43.000000000 +0200
@@ -1,0 +2,13 @@
+Sat Aug 5 22:42:08 CEST 2006 - sndirsch@xxxxxxx
+
+- p_mouse_misc.diff:
+ * patch to fix X server crashes with synaptics driver (Bug #61702)
+- p_kbd.diff:
+ * save us one second during Xserver start
+
+-------------------------------------------------------------------
+Thu Aug 3 11:15:44 CEST 2006 - sndirsch@xxxxxxx
+
+- install mouse driver manual page to man4x subdirectory
+
+-------------------------------------------------------------------
New:
----
p_kbd.diff
p_mouse_misc.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-input.spec ++++++
--- /var/tmp/diff_new_pack.s9Yagr/_old 2006-08-06 22:07:24.000000000 +0200
+++ /var/tmp/diff_new_pack.s9Yagr/_new 2006-08-06 22:07:24.000000000 +0200
@@ -15,13 +15,13 @@
BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.1
-Release: 7
+Release: 8
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
Requires: xorg-x11-server
Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/mouse_drv.so
-Summary: xorg-x11-driver-input
+Summary: X.Org input drivers
Source0: xf86-input-acecad-X11R7.1-1.1.0.tar.bz2
Source1: xf86-input-aiptek-X11R7.1-1.0.1.tar.bz2
Source2: xf86-input-calcomp-X11R7.1-1.1.0.tar.bz2
@@ -53,10 +53,12 @@
Patch: 64bit.diff
Patch1: xf86-input-magictouch.diff
Patch2: xf86-input-jamstudio.diff
+Patch3: p_mouse_misc.diff
+Patch4: p_kbd.diff
%description
-xorg-x11-driver-input
+This package contains X.Org input drivers.
@@ -73,6 +75,12 @@
pushd xf86-input-jamstudio-*
%patch2
popd
+pushd xf86-input-mouse-*/src
+%patch3 -p6
+popd
+pushd xf86-input-keyboard-*/src
+%patch4 -p6
+popd
%build
%ifarch %ix86 x86_64
@@ -94,21 +102,30 @@
%else
for dir in $(ls | grep -v -e xf86-input-vmmouse); do
%endif
- make -C $dir install DESTDIR=$RPM_BUILD_ROOT
+ case $dir in
+ xf86-input-mouse-*) make -C $dir install DESTDIR=$RPM_BUILD_ROOT DRIVER_MAN_SUFFIX=4x ;;
+ *) make -C $dir install DESTDIR=$RPM_BUILD_ROOT ;;
+ esac
done
-# resolve conflicting mouse manual pages
-mv $RPM_BUILD_ROOT/%{_mandir}/man4/mouse.4 \
- $RPM_BUILD_ROOT/%{_mandir}/man4/xorgmouse.4
%clean
rm -rf "$RPM_BUILD_ROOT"
%files
%defattr(-,root,root)
+%dir %{_mandir}/man4x
/usr/%{_lib}/xorg/modules/input/
%{_mandir}/man4/*
+%{_mandir}/man4x/*
%changelog -n xorg-x11-driver-input
+* Sat Aug 05 2006 - sndirsch@xxxxxxx
+- p_mouse_misc.diff:
+ * patch to fix X server crashes with synaptics driver (Bug #61702)
+- p_kbd.diff:
+ * save us one second during Xserver start
+* Thu Aug 03 2006 - sndirsch@xxxxxxx
+- install mouse driver manual page to man4x subdirectory
* Mon Jul 31 2006 - sndirsch@xxxxxxx
- added splitprovides for mouse driver to make sure it gets
installed during update
++++++ p_kbd.diff ++++++
--- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig 2005-08-24 17:24:16.000000000 +0200
+++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c 2005-08-24 17:25:04.000000000 +0200
@@ -497,7 +497,6 @@
* passing on parts of the VT switch sequence.
*/
if (pInfo->fd >= 0) {
- sleep(1);
xf86FlushInput(pInfo->fd);
AddEnabledDevice(pInfo->fd);
}
++++++ p_mouse_misc.diff ++++++
--- programs/Xserver/hw/xfree86/input/mouse/mouse.c 1 Nov 2004 16:45:53 -0000 1.1.1.39
+++ programs/Xserver/hw/xfree86/input/mouse/mouse.c 17 Mar 2005 18:39:52 -0000
@@ -967,6 +967,9 @@
if (!(pMse = xcalloc(sizeof(MouseDevRec), 1)))
return pInfo;
pInfo->private = pMse;
+ /* for sanity check in Misc extension - Hack! */
+ pMse->magic = MOUSE_MAGIC;
+ pMse->size = sizeof(*pMse);
pMse->Ctrl = MouseCtrl;
pMse->PostEvent = MousePostEvent;
pMse->CommonOptions = MouseCommonOptions;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
| < Previous | Next > |