xserver-xorg-input-evdev: Changes to 'upstream-experimental'
configure.ac | 2 +-
src/Makefile.am | 2 +-
src/evdev.c | 10 +++-------
3 files changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 777cfa148f8b5febaab1330e8df791f2188c046b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 13 16:22:00 2012 +1000
evdev 2.7.3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 5a91236..e0545e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-evdev],
- [2.7.2],
+ [2.7.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-evdev])
AC_CONFIG_SRCDIR([Makefile.am])
commit 447fd220e05752ec9ab388cc78826c297e1b7e24
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 7 14:32:17 2012 +1000
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>
(cherry picked from commit 33e7831b5fabc5c9dcc0224800a04761086952a7)
diff --git a/src/evdev.c b/src/evdev.c
index 6729f23..54772c7 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1665,7 +1665,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);
@@ -1679,7 +1679,7 @@ EvdevInitButtonMapping(InputInfoPtr pInfo)
pEvdev->btnmap[nbuttons++] = btn;
map = s;
- }
+ } while (s && *s != '\0' && nbuttons < EVDEV_MAXBUTTONS);
free(mapping);
}
commit f2c6da02429eaabf9111d54c41bf46aa19b49776
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Aug 5 12:26:38 2012 +1000
Link against libudev
Fixes /usr/bin/Xorg: symbol lookup error:
/usr/lib64/xorg/modules/input/evdev_drv.so: undefined symbol: udev_new
This doesn't appear in the default configuration as Xorg links against
libudev and the symbol is defined when evdev is loaded. It can be reproduced
with a HAL-enabled server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
(cherry picked from commit bc8997e8120cc8d4f33f44e0734fa488f9fef3b0)
diff --git a/src/Makefile.am b/src/Makefile.am
index cca1b0c..804ef73 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ AM_CPPFLAGS =-I$(top_srcdir)/include
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
-@DRIVER_NAME@_drv_la_LIBADD = $(MTDEV_LIBS)
+@DRIVER_NAME@_drv_la_LIBADD = $(MTDEV_LIBS) $(UDEV_LIBS)
@DRIVER_NAME@_drv_ladir = @inputdir@
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c \
commit 9791afc4c16eab92f30884a7e616dd93ac9b7513
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 31 16:39:00 2012 +1000
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>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
(cherry picked from commit 1cb8f074df8d16879ec80d778d26fb5b9af05a3b)
diff --git a/src/evdev.c b/src/evdev.c
index fc7ba88..6729f23 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1107,12 +1107,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,
Reply to: