Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Thu Apr 30 12:18:49 CEST 2009. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-04-15 12:02:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2009-04-30 10:40:34.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Apr 30 10:24:31 CEST 2009 - sndirsch@novell.com + +- xf86-input-evdev-2.2.2 + * Three fixes to avoid deadlocks, two of which caused by allocs + during SIGIO handling. + +------------------------------------------------------------------- +Wed Apr 29 11:07:20 CEST 2009 - sndirsch@suse.de + +- xf86-input-citron 2.2.2 +- obsoletes xf86-input-citron.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-input-citron-2.2.1.tar.bz2 xf86-input-citron.diff xf86-input-evdev-2.2.1.tar.bz2 New: ---- xf86-input-citron-2.2.2.tar.bz2 xf86-input-evdev-2.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.Ph4559/_old 2009-04-30 12:18:36.000000000 +0200 +++ /var/tmp/diff_new_pack.Ph4559/_new 2009-04-30 12:18:36.000000000 +0200 @@ -24,7 +24,7 @@ BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 26 +Release: 27 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -36,7 +36,7 @@ Source0: xf86-input-acecad-1.3.0.tar.bz2 Source1: xf86-input-aiptek-1.2.0.tar.bz2 Source2: xf86-input-calcomp-1.1.2.tar.bz2 -Source3: xf86-input-citron-2.2.1.tar.bz2 +Source3: xf86-input-citron-2.2.2.tar.bz2 Source4: xf86-input-digitaledge-1.1.1.tar.bz2 Source5: xf86-input-dmc-1.1.2.tar.bz2 Source6: xf86-input-dynapro-1.1.2.tar.bz2 @@ -63,7 +63,7 @@ Source27: xf86-input-void-1.2.0.tar.bz2 Source28: xf86-input-diamondtouch-0.3.0.tar.bz2 Source29: xf86-input-synaptics-1.1.0.tar.bz2 -Source30: xf86-input-evdev-2.2.1.tar.bz2 +Source30: xf86-input-evdev-2.2.2.tar.bz2 Source31: 11-x11-synaptics.fdi Source32: 11-mouse.fdi Patch2: xf86-input-jamstudio.diff @@ -81,7 +81,6 @@ Patch23: wait.diff Patch24: xf86-input-synaptics-settings.diff Patch25: xf86-input-calcomp.diff -Patch26: xf86-input-citron.diff Patch27: xf86-input-digitaledge.diff Patch28: xf86-input-dmc.diff Patch29: xf86-input-dynapro.diff @@ -139,9 +138,6 @@ pushd xf86-input-calcomp-* %patch25 -p1 popd -pushd xf86-input-citron-* -%patch26 -p1 -popd pushd xf86-input-digitaledge-* %patch27 -p1 popd @@ -242,6 +238,13 @@ /usr/share/hal/fdi/policy/20thirdparty/11-mouse.fdi %changelog +* Thu Apr 30 2009 sndirsch@novell.com +- xf86-input-evdev-2.2.2 + * Three fixes to avoid deadlocks, two of which caused by allocs + during SIGIO handling. +* Wed Apr 29 2009 sndirsch@suse.de +- xf86-input-citron 2.2.2 +- obsoletes xf86-input-citron.diff * Wed Apr 15 2009 sndirsch@suse.de - xf86-input-joystick 1.4.1 * Incompatible with xorg-server master. Configure fails for ++++++ xf86-input-citron-2.2.1.tar.bz2 -> xf86-input-citron-2.2.2.tar.bz2 ++++++ ++++ 20211 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-2.2.1/ChangeLog new/xf86-input-citron-2.2.2/ChangeLog --- old/xf86-input-citron-2.2.1/ChangeLog 2007-09-10 18:00:44.000000000 +0200 +++ new/xf86-input-citron-2.2.2/ChangeLog 2009-04-29 02:53:10.000000000 +0200 @@ -1,3 +1,59 @@ +commit 7c202dd28ae9c6fffd7ae958a21463ae69c51a8a +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Apr 28 17:51:32 2009 -0700 + + Version 2.2.2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit d411ee98f95c62bb63cab88a5fa97be6e4fb057e +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Apr 28 17:50:51 2009 -0700 + + Delete duplicate EXTRA_DIST line from Makefile + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 32dbc726871bf7e3a7535d788f169f8e11c981fd +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> +Date: Mon Feb 2 18:32:11 2009 -0200 + + Janitor: correct make distcheck. + +commit 6f479966a1f5f9ab376a0b6144548e5f3da76b12 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Jan 30 20:17:02 2009 -0800 + + Add README with pointers to mailing list, bugzilla & git repos + +commit 52b092a77ef19c77bf40cd6896c0d1e54d5f5f62 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Jan 9 16:11:02 2009 -0800 + + Remove xorgconfig & xorgcfg from See Also list in man page + +commit 0297c49fd3743e15900a05169ba36e6a0fb438c0 +Author: Peter Hutterer <peter.hutterer@redhat.com> +Date: Thu Aug 14 14:55:59 2008 +0930 + + Fix build, XF86_VERSION_CURRENT doesn't exist anymore. + +commit 591674bee43061f1169ebeede653fb6d98147724 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Mon May 26 22:03:52 2008 +0930 + + Check for XINPUT ABI 3. + +commit a59ffb3cdc9d68a0ad21f04831e4255ad0e985d8 +Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com> +Date: Mon Feb 4 01:10:27 2008 -0200 + + Don't call xf86SoundKbdBell and xf86XInputSetSendCoreEvents + + Only call those functions if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0. + + Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au> + commit 9a4d7854273a34c1a32f46fb52f2f8c3a227cd12 Author: Tilman Sauerbeck <tilman@code-monkey.de> Date: Sun Sep 9 17:09:45 2007 +0200 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-2.2.1/configure.ac new/xf86-input-citron-2.2.2/configure.ac --- old/xf86-input-citron-2.2.1/configure.ac 2007-09-09 17:01:45.000000000 +0200 +++ new/xf86-input-citron-2.2.2/configure.ac 2009-04-29 02:51:23.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-citron], - 2.2.1, + 2.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-citron) @@ -32,15 +32,16 @@ AM_MAINTAINER_MODE -DRIVER_NAME=citron -AC_SUBST([DRIVER_NAME]) - +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) AM_CONFIG_HEADER([config.h]) # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC +XORG_CWARNFLAGS AH_TOP([#include "xorg-server.h"]) @@ -77,16 +78,18 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) sdkdir=$(pkg-config --variable=sdkdir xorg-server) - -CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' -AC_SUBST([CFLAGS]) +XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" # Checks for libraries. # Checks for header files. AC_HEADER_STDC +DRIVER_NAME=citron +AC_SUBST([DRIVER_NAME]) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile man/Makefile]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-2.2.1/Makefile.am new/xf86-input-citron-2.2.2/Makefile.am --- old/xf86-input-citron-2.2.1/Makefile.am 2007-09-09 17:06:05.000000000 +0200 +++ new/xf86-input-citron-2.2.2/Makefile.am 2009-04-29 02:38:31.000000000 +0200 @@ -21,10 +21,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man -CLEANFILES = ChangeLog EXTRA_DIST = ChangeLog +MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-2.2.1/man/citron.man new/xf86-input-citron-2.2.2/man/citron.man --- old/xf86-input-citron-2.2.1/man/citron.man 2007-09-09 16:57:53.000000000 +0200 +++ new/xf86-input-citron-2.2.2/man/citron.man 2009-01-10 00:04:07.000000000 +0100 @@ -903,6 +903,6 @@ "60" .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__). +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__). .SH "AUTHORS" 2000\-2005 \- written by Citron GmbH (support@citron.de) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-2.2.1/README new/xf86-input-citron-2.2.2/README --- old/xf86-input-citron-2.2.1/README 1970-01-01 01:00:00.000000000 +0100 +++ new/xf86-input-citron-2.2.2/README 2009-01-30 01:02:10.000000000 +0100 @@ -0,0 +1,19 @@ + +Please submit bugs & patches to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/driver/xf86-input-citron + + http://cgit.freedesktop.org/xorg/driver/xf86-input-citron + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-2.2.1/src/citron.c new/xf86-input-citron-2.2.2/src/citron.c --- old/xf86-input-citron-2.2.1/src/citron.c 2007-09-09 17:13:00.000000000 +0200 +++ new/xf86-input-citron-2.2.2/src/citron.c 2008-08-19 17:40:58.000000000 +0200 @@ -305,7 +305,7 @@ MODULEVENDORSTRING, /* vendor specific string */ MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, /* Current XFree version */ + XORG_VERSION_CURRENT, /* Current Xorg version */ CITOUCH_VERSION_MAJOR, /* Module-specific major version */ CITOUCH_VERSION_MINOR, /* Module-specific minor version */ CITOUCH_VERSION_PATCH, /* Module-specific patch level */ @@ -1368,7 +1368,10 @@ * screen to fit one meter. * Device may reports touch pressure on the 3rd axis. */ - if (InitValuatorClassDeviceStruct (dev, 2, xf86GetMotionEvents, + if (InitValuatorClassDeviceStruct (dev, 2, +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, +#endif local->history_size, Absolute) == FALSE) { ErrorF ("%sUnable to allocate Citron touchscreen ValuatorClassDeviceStruct\n", CI_ERROR); @@ -2058,12 +2061,14 @@ DBG(6, ErrorF("%s\treporting mode = %s\n", CI_INFO, mode==TS_Raw?"raw":"scaled")); return (Success); } +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 else if ((mode == SendCoreEvents) || (mode == DontSendCoreEvents)) { xf86XInputSetSendCoreEvents (local, (mode == SendCoreEvents)); DBG(6, ErrorF("%s\tmode = %sSend Core Events\n", CI_INFO, mode==DontSendCoreEvents?"Don\'t ":"")); return (Success); } +#endif #ifdef CIT_MODE_EXT else if (mode == ClickMode_Enter) { @@ -2466,6 +2471,7 @@ if(priv->beep == 0) return; +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 /* ring release bell */ if(press == 0) @@ -2492,6 +2498,7 @@ else /* ring press bell */ xf86SoundKbdBell(priv->press_vol,priv->press_pitch, priv->press_dur); +#endif DBG(7, ErrorF("%scit_Beep called - %s\n", CI_INFO, (press == 0) ? "release" : "press")); #endif @@ -2508,6 +2515,7 @@ if(priv->beepkey == 0) return; +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 /* ring release bell */ if(press <= 0) @@ -2532,6 +2540,7 @@ else /* ring press bell */ xf86SoundKbdBell(priv->presskey_vol,priv->presskey_pitch, priv->presskey_dur); +#endif DBG(7, ErrorF("%scit_BeepKey called - %s\n", CI_INFO, (press == 0) ? "release" : "press")); #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-citron-2.2.1/src/Makefile.am new/xf86-input-citron-2.2.2/src/Makefile.am --- old/xf86-input-citron-2.2.1/src/Makefile.am 2007-09-09 16:57:53.000000000 +0200 +++ new/xf86-input-citron-2.2.2/src/Makefile.am 2009-02-03 05:39:52.000000000 +0100 @@ -24,6 +24,8 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. +AM_CFLAGS = $(XORG_CFLAGS) + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version @DRIVER_NAME@_drv_ladir = @inputdir@ ++++++ xf86-input-evdev-2.2.1.tar.bz2 -> xf86-input-evdev-2.2.2.tar.bz2 ++++++ ++++ 56736 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.2.1/ChangeLog new/xf86-input-evdev-2.2.2/ChangeLog --- old/xf86-input-evdev-2.2.1/ChangeLog 2009-03-24 06:16:45.000000000 +0100 +++ new/xf86-input-evdev-2.2.2/ChangeLog 2009-04-30 08:41:18.000000000 +0200 @@ -1,3 +1,43 @@ +commit cf887a2b7cff9eb99c872a9cf5a9382ff6317899 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu Apr 30 16:39:15 2009 +1000 + + evdev 2.2.2 + +commit 1cc0651e1b44af505d7177b22c6083eae9b118cc +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu Apr 16 13:23:50 2009 +1000 + + Print read errors as X_NONE to avoid mallocs in the server. + + Messages of type X_NONE are just passed down to the log files, everything else + gets the (EE) or (II) prefixed. Since this mallocs, we can't use it in the + signal handler. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + (cherry picked from commit 220e2dfb8f6aa08bd5f59e81c6883c057b945721) + +commit 48a747ea8603ece6bd25ba5b1ce92c2eb91a7c01 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu Apr 16 12:01:03 2009 +1000 + + Pre-allocate the reopen timer so we don't allocate during sigio handling. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + (cherry picked from commit ddc126637404cb3d9356b7698779dcd8849f8718) + +commit aa58eb609617beb5d3199dab262f96003f57ab97 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon Apr 6 10:22:25 2009 +1000 + + Trigger read error handling if len is <= 0. + + Red Hat Bug 494245 <https://bugzilla.redhat.com/show_bug.cgi?id=494245> + + Reported-by: David Woodhouse <dwmw2@infradead.org> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + (cherry picked from commit 98ecb5233bb3b899bd696a90d2733c6a345676dd) + commit aff7228d972eedd556b13f06d8db0b5ffb622b46 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Tue Mar 24 15:13:23 2009 +1000 @@ -1762,7 +1802,7 @@ Handle the alternate spellings of the xkb options. commit 9773dac6238b64cab1d42b2231097b23058c44ee -Merge: 11cf9c9... 1a0bc8e... +Merge: 11cf9c9 1a0bc8e Author: Adam Jackson <ajax@redhat.com> Date: Sat Mar 8 20:18:02 2008 -0500 @@ -2116,7 +2156,7 @@ Finish merging copyright notices. (evdev_key.c was missed.) commit 26dbf38041ebe67e7ab399a6746684a404ea2121 -Merge: 2943558... 9eb546e... +Merge: 2943558 9eb546e Author: Zephaniah E. Hull <warp@agamemnon.b5> Date: Tue Jun 5 23:14:46 2007 -0400 @@ -2363,14 +2403,14 @@ bump to 1.1.4 commit 3fc70342aaba5f95d01b6e51164ae207532fa8f4 -Merge: 1a8cea3... ef01c2e... +Merge: 1a8cea3 ef01c2e Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Nov 2 03:42:14 2006 +0200 Merge branch 'input-hotplug' commit 1a8cea3dc4d8336b61a071a52479e71d7dd619d4 -Merge: 51d21a3... 4c72fb7... +Merge: 51d21a3 4c72fb7 Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Nov 2 03:42:13 2006 +0200 @@ -2391,14 +2431,14 @@ Use the DIX motion history if we have ABI version 1 or higher. commit 79eb7dcac8cdbecc07be08737388a8a6574e3d76 -Merge: d7f686b... 63f7edf... +Merge: d7f686b 63f7edf Author: Daniel Stone <daniel@fooishbar.org> Date: Tue Oct 17 11:32:39 2006 +0300 Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-evdev into input-hotplug commit d7f686bfa3e773cfc7740c707da9fc64196e143c -Merge: ec09e0d... 4c72fb7... +Merge: ec09e0d 4c72fb7 Author: Daniel Stone <daniel@fooishbar.org> Date: Tue Oct 17 11:31:58 2006 +0300 @@ -2453,7 +2493,7 @@ Fix compilation. commit 63f7edf7862032221e25de3c59fee1158d616597 -Merge: 7b91f92... 771eee9... +Merge: 7b91f92 771eee9 Author: Zephaniah E. Hull <warp@agamemnon.b5> Date: Tue Jul 25 16:00:44 2006 -0400 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.2.1/config.h.in new/xf86-input-evdev-2.2.2/config.h.in --- old/xf86-input-evdev-2.2.1/config.h.in 2009-03-23 07:36:42.000000000 +0100 +++ new/xf86-input-evdev-2.2.2/config.h.in 2009-04-30 08:41:03.000000000 +0200 @@ -32,6 +32,10 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.2.1/configure.ac new/xf86-input-evdev-2.2.2/configure.ac --- old/xf86-input-evdev-2.2.1/configure.ac 2009-03-23 07:36:25.000000000 +0100 +++ new/xf86-input-evdev-2.2.2/configure.ac 2009-04-30 08:39:11.000000000 +0200 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-evdev], - 2.2.1, + 2.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-evdev) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.2.1/src/evdev.c new/xf86-input-evdev-2.2.2/src/evdev.c --- old/xf86-input-evdev-2.2.1/src/evdev.c 2009-03-23 07:36:15.000000000 +0100 +++ new/xf86-input-evdev-2.2.2/src/evdev.c 2009-04-30 08:38:43.000000000 +0200 @@ -564,25 +564,32 @@ while (len == sizeof(ev)) { len = read(pInfo->fd, &ev, sizeof(ev)); - if (len == 0) + if (len <= 0) { if (errno == ENODEV) /* May happen after resume */ { xf86RemoveEnabledDevice(pInfo); close(pInfo->fd); pInfo->fd = -1; - pEvdev->reopen_left = pEvdev->reopen_attempts; - pEvdev->reopen_timer = TimerSet(NULL, 0, 100, EvdevReopenTimer, pInfo); + if (pEvdev->reopen_timer) + { + pEvdev->reopen_left = pEvdev->reopen_attempts; + pEvdev->reopen_timer = TimerSet(pEvdev->reopen_timer, 0, 100, EvdevReopenTimer, pInfo); + } } else if (errno != EAGAIN) - xf86Msg(X_ERROR, "%s: Read error: %s\n", pInfo->name, + { + /* We use X_NONE here because it doesn't alloc */ + xf86MsgVerb(X_NONE, 0, "%s: Read error: %s\n", pInfo->name, strerror(errno)); + } break; } + /* The kernel promises that we always only read a complete + * event, so len != sizeof ev is an error. */ if (len % sizeof(ev[0])) { - /* The kernel promises that we always only read a complete - * event, so len != sizeof ev is an error. */ - xf86Msg(X_ERROR, "%s: Read error: %s\n", pInfo->name, strerror(errno)); + /* We use X_NONE here because it doesn't alloc */ + xf86MsgVerb(X_NONE, 0, "%s: Read error: %s\n", pInfo->name, strerror(errno)); break; } @@ -1226,7 +1233,7 @@ if (pInfo->fd == -1) { pEvdev->reopen_left = pEvdev->reopen_attempts; - pEvdev->reopen_timer = TimerSet(NULL, 0, 100, EvdevReopenTimer, pInfo); + pEvdev->reopen_timer = TimerSet(pEvdev->reopen_timer, 0, 100, EvdevReopenTimer, pInfo); } else { pEvdev->min_maj = EvdevGetMajorMinor(pInfo); @@ -1237,6 +1244,8 @@ return !Success; } + pEvdev->reopen_timer = TimerSet(pEvdev->reopen_timer, 0, 0, NULL, NULL); + xf86FlushInput(pInfo->fd); xf86AddEnabledDevice(pInfo); EvdevMBEmuOn(pInfo); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org