evdev 2.7.3

.gitignore

@@ -13,3 +13,4 @@ xf86-input-evdev-20100823.tar.bz2
 /xf86-input-evdev-2.7.0.tar.bz2
 /xf86-input-evdev-20120718.tar.bz2
 /xf86-input-evdev-2.7.2.tar.bz2
+/xf86-input-evdev-2.7.3.tar.bz2

0001-Don-t-delete-the-device-on-ENODEV.patch

@@ -1,38 +0,0 @@
-From 1660f32f21ba1fa70fa79af1cb59436065a6ba8a Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 31 Jul 2012 16:39:00 +1000
-Subject: [PATCH evdev] Don't delete the device on ENODEV
-
-This is signal handler code and we cannot clean up properly while in the
-signal handler. So reduce the code to removing the signal handler and let
-the device be cleaned up later.
-
-If hotplugging is on, the server will remove it when the config backend says
-so and if it is off, the server will remove it on shutdown.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/evdev.c |    6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/evdev.c b/src/evdev.c
-index f54b66f..b832d98 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -1113,12 +1113,8 @@ EvdevReadInput(InputInfoPtr pInfo)
-         if (len <= 0)
-         {
-             if (errno == ENODEV) /* May happen after resume */
--            {
--                EvdevMBEmuFinalize(pInfo);
--                Evdev3BEmuFinalize(pInfo);
-                 xf86RemoveEnabledDevice(pInfo);
--                EvdevCloseDevice(pInfo);
--            } else if (errno != EAGAIN)
-+            else if (errno != EAGAIN)
-             {
-                 /* We use X_NONE here because it doesn't alloc */
-                 xf86MsgVerb(X_NONE, 0, "%s: Read error: %s\n", pInfo->name,
--- 
-1.7.10.4
-

0001-Fix-broken-ButtonMapping-option-53168.patch

@@ -1,40 +0,0 @@
-From 33e7831b5fabc5c9dcc0224800a04761086952a7 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 7 Aug 2012 14:32:17 +1000
-Subject: [PATCH evdev] Fix broken ButtonMapping option (#53168)
-
-Regression introduced in 8af0e6f1ebaf327f735bca507134b34bb24b26c6.
-s is now initialized to NULL, so we never entered the loop.
-
-X.Org Bug 53168 <http://bugs.freedesktop.org/show_bug.cgi?id=53168>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/evdev.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/evdev.c b/src/evdev.c
-index b832d98..ced6561 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -1671,7 +1671,7 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)
- 
-         xf86IDrvMsg(pInfo, X_CONFIG, "ButtonMapping '%s'\n", mapping);
-         map = mapping;
--        while (s && *s != '\0' && nbuttons < EVDEV_MAXBUTTONS)
-+        do
-         {
-             btn = strtol(map, &s, 10);
- 
-@@ -1685,7 +1685,7 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)
- 
-             pEvdev->btnmap[nbuttons++] = btn;
-             map = s;
--        }
-+        } while (s && *s != '\0' && nbuttons < EVDEV_MAXBUTTONS);
-         free(mapping);
-     }
- 
--- 
-1.7.10.4
-

sources

@@ -1 +1 @@
-e1da5be7f946bfcd9eb7201bc95da67c  xf86-input-evdev-2.7.2.tar.bz2
+f68920ce2921a88b4662acc972bf3a4a  xf86-input-evdev-2.7.3.tar.bz2

xorg-x11-drv-evdev.spec

@@ -7,8 +7,8 @@
 
 Summary:    Xorg X11 evdev input driver
 Name:       xorg-x11-drv-evdev
-Version:    2.7.2
-Release:    6%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
+Version:    2.7.3
+Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 URL:        http://www.x.org
 License:    MIT
 Group:      User Interface/X Hardware Support
@@ -23,10 +23,6 @@ Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
 # Bug 805902 - Scrollwheels on tablets are broken
 Patch02: 0001-Allow-relative-scroll-valuators-on-absolute-devices.patch
-# Only disable device on ENODEV to avoid free in sighandler
-Patch03: 0001-Don-t-delete-the-device-on-ENODEV.patch
-# FDO 53168 - Option ButtonMapping is broken
-Patch04: 0001-Fix-broken-ButtonMapping-option-53168.patch
 
 ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
 
@@ -46,8 +42,6 @@ X.Org X11 evdev input driver.
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 %patch02 -p1 -b .relscroll
-%patch03 -p1 -b .enodev
-%patch04 -p1 -b .buttonmapping
 
 %build
 autoreconf --force -v --install || exit 1
@@ -89,6 +83,9 @@ X.Org X11 evdev input driver development files.
 
 
 %changelog
+* Mon Aug 13 2012 Peter Hutterer <peter.hutterer@redhat.com> 2.7.3-1
+- evdev 2.7.3
+
 * Wed Aug 08 2012 Peter Hutterer <peter.hutterer@redhat.com> 2.7.2-6
 - Fix broken ButtonMapping option (regression in 2.7.2)