Hello community,
here is the log from the commit of package xf86-input-evdev for
openSUSE:Factory checked in at 2016-10-06 12:29:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-evdev (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-evdev.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-evdev"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-evdev/xf86-input-evdev.changes
2016-06-05 14:19:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xf86-input-evdev.new/xf86-input-evdev.changes
2016-10-06 12:29:31.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Oct 1 19:35:04 UTC 2016 - mimi...@gmail.com
+
+- update to version 2.10.4
+ * Support XINPUT ABI version 23 and 24
+
+-------------------------------------------------------------------
Old:
----
xf86-input-evdev-2.10.3.tar.bz2
xf86-input-evdev-2.10.3.tar.bz2.sig
New:
----
xf86-input-evdev-2.10.4.tar.bz2
xf86-input-evdev-2.10.4.tar.bz2.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-evdev.spec ++++++
--- /var/tmp/diff_new_pack.JwcVSA/_old 2016-10-06 12:29:32.000000000 +0200
+++ /var/tmp/diff_new_pack.JwcVSA/_new 2016-10-06 12:29:32.000000000 +0200
@@ -17,7 +17,7 @@
Name: xf86-input-evdev
-Version: 2.10.3
+Version: 2.10.4
Release: 0
Summary: Generic Linux input driver for the Xorg X server
License: MIT
@@ -74,7 +74,7 @@
%build
# Once u_01-Add-a-kiosk-mode-for-touch-screens.patch is removed this is no
longer needed
-/usr/bin/autoreconf -v --install --force
+%{_bindir}/autoreconf -v --install --force
%configure
make %{?_smp_mflags} V=1
@@ -103,7 +103,7 @@
%{_datadir}/X11/xorg.conf.d/10-*.conf
%dir %{_libdir}/xorg/modules/input
%{_libdir}/xorg/modules/input/evdev_drv.so
-%{_datadir}/man/man4/evdev.4%{?ext_man}
+%{_mandir}/man4/evdev.4%{?ext_man}
%files devel
%defattr(-,root,root)
++++++ xf86-input-evdev-2.10.3.tar.bz2 -> xf86-input-evdev-2.10.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-evdev-2.10.3/ChangeLog
new/xf86-input-evdev-2.10.4/ChangeLog
--- old/xf86-input-evdev-2.10.3/ChangeLog 2016-06-01 03:41:52.000000000
+0200
+++ new/xf86-input-evdev-2.10.4/ChangeLog 2016-10-01 09:54:15.000000000
+0200
@@ -1,3 +1,45 @@
+commit 551db5b86e2a19e027e57571b8e5405dacb8bd67
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Sat Oct 1 17:48:30 2016 +1000
+
+ evdev 2.10.4
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit bb8bde7456def4186f9a4a0a9f98d53c949e1450
+Author: Keith Packard <kei...@keithp.com>
+Date: Tue May 31 17:52:43 2016 -0700
+
+ Support XINPUT ABI 24 (remove select mask from block/wakeup handlers)
+
+ The evdev driver wasn't using the select mask arguments, so this
+ change just involves adjusting the argument lists.
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 7b1267f7f18c478d3dc34a7668eaefa402815891
+Author: Keith Packard <kei...@keithp.com>
+Date: Tue May 31 17:52:42 2016 -0700
+
+ Support XINPUT ABI version 23 (threaded input)
+
+ Use input_lock/input_unlock calls instead of SIGIO functions
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit e08b0332761b0cff6d6a3f5d7e88c22f786bd530
+Author: Keith Packard <kei...@keithp.com>
+Date: Tue May 31 17:52:41 2016 -0700
+
+ Report errors when attempting to write keyboard controls
+
+ This is mostly to eliminate a compiler warning.
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
commit 7c1971d9e7b73b861874633a33f97487abf1d45d
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Wed Jun 1 11:41:03 2016 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-evdev-2.10.3/configure
new/xf86-input-evdev-2.10.4/configure
--- old/xf86-input-evdev-2.10.3/configure 2016-06-01 03:41:11.000000000
+0200
+++ new/xf86-input-evdev-2.10.4/configure 2016-10-01 09:49:20.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-input-evdev 2.10.3.
+# Generated by GNU Autoconf 2.69 for xf86-input-evdev 2.10.4.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-input-evdev'
PACKAGE_TARNAME='xf86-input-evdev'
-PACKAGE_VERSION='2.10.3'
-PACKAGE_STRING='xf86-input-evdev 2.10.3'
+PACKAGE_VERSION='2.10.4'
+PACKAGE_STRING='xf86-input-evdev 2.10.4'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -1364,7 +1364,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-evdev 2.10.3 to adapt to many kinds of
systems.
+\`configure' configures xf86-input-evdev 2.10.4 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1435,7 +1435,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-evdev 2.10.3:";;
+ short | recursive ) echo "Configuration of xf86-input-evdev 2.10.4:";;
esac
cat <<\_ACEOF
@@ -1574,7 +1574,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-evdev configure 2.10.3
+xf86-input-evdev configure 2.10.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1898,7 +1898,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-evdev $as_me 2.10.3, which was
+It was created by xf86-input-evdev $as_me 2.10.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2766,7 +2766,7 @@
# Define the identity of the package.
PACKAGE='xf86-input-evdev'
- VERSION='2.10.3'
+ VERSION='2.10.4'
cat >>confdefs.h <<_ACEOF
@@ -19227,7 +19227,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-evdev $as_me 2.10.3, which was
+This file was extended by xf86-input-evdev $as_me 2.10.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19293,7 +19293,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xf86-input-evdev config.status 2.10.3
+xf86-input-evdev config.status 2.10.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-evdev-2.10.3/configure.ac
new/xf86-input-evdev-2.10.4/configure.ac
--- old/xf86-input-evdev-2.10.3/configure.ac 2016-06-01 03:40:56.000000000
+0200
+++ new/xf86-input-evdev-2.10.4/configure.ac 2016-10-01 09:49:07.000000000
+0200
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-evdev],
- [2.10.3],
+ [2.10.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-evdev])
AC_CONFIG_SRCDIR([Makefile.am])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-evdev-2.10.3/src/emuMB.c
new/xf86-input-evdev-2.10.4/src/emuMB.c
--- old/xf86-input-evdev-2.10.3/src/emuMB.c 2016-06-01 03:40:46.000000000
+0200
+++ new/xf86-input-evdev-2.10.4/src/emuMB.c 2016-09-06 05:51:21.000000000
+0200
@@ -184,10 +184,13 @@
EvdevMBEmuTimer(InputInfoPtr pInfo)
{
EvdevPtr pEvdev = pInfo->private;
- int sigstate;
int id;
- sigstate = xf86BlockSIGIO ();
+#if HAVE_THREADED_INPUT
+ input_lock();
+#else
+ int sigstate = xf86BlockSIGIO();
+#endif
pEvdev->emulateMB.pending = FALSE;
if ((id = stateTab[pEvdev->emulateMB.state][4][0]) != 0) {
@@ -200,7 +203,11 @@
pEvdev->emulateMB.state);
}
- xf86UnblockSIGIO (sigstate);
+#if HAVE_THREADED_INPUT
+ input_unlock();
+#else
+ xf86UnblockSIGIO(sigstate);
+#endif
return 0;
}
@@ -261,9 +268,7 @@
}
-void EvdevMBEmuWakeupHandler(pointer data,
- int i,
- pointer LastSelectMask)
+void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS)
{
InputInfoPtr pInfo = (InputInfoPtr)data;
EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
@@ -277,9 +282,7 @@
}
}
-void EvdevMBEmuBlockHandler(pointer data,
- struct timeval **waitTime,
- pointer LastSelectMask)
+void EvdevMBEmuBlockHandler(BLOCK_HANDLER_ARGS)
{
InputInfoPtr pInfo = (InputInfoPtr) data;
EvdevPtr pEvdev= (EvdevPtr) pInfo->private;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-evdev-2.10.3/src/emuThird.c
new/xf86-input-evdev-2.10.4/src/emuThird.c
--- old/xf86-input-evdev-2.10.3/src/emuThird.c 2016-06-01 03:40:46.000000000
+0200
+++ new/xf86-input-evdev-2.10.4/src/emuThird.c 2016-06-02 01:42:05.000000000
+0200
@@ -89,12 +89,19 @@
InputInfoPtr pInfo = (InputInfoPtr)arg;
EvdevPtr pEvdev = pInfo->private;
struct emulate3B *emu3B = &pEvdev->emulate3B;
- int sigstate = 0;
- sigstate = xf86BlockSIGIO ();
+#if HAVE_THREADED_INPUT
+ input_lock();
+#else
+ int sigstate = xf86BlockSIGIO();
+#endif
emu3B->state = EM3B_EMULATING;
Evdev3BEmuPostButtonEvent(pInfo, emu3B->button, BUTTON_PRESS);
- xf86UnblockSIGIO (sigstate);
+#if HAVE_THREADED_INPUT
+ input_unlock();
+#else
+ xf86UnblockSIGIO(sigstate);
+#endif
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-evdev-2.10.3/src/evdev.c
new/xf86-input-evdev-2.10.4/src/evdev.c
--- old/xf86-input-evdev-2.10.3/src/evdev.c 2016-05-12 07:28:16.000000000
+0200
+++ new/xf86-input-evdev-2.10.4/src/evdev.c 2016-06-02 01:41:25.000000000
+0200
@@ -1108,6 +1108,7 @@
InputInfoPtr pInfo;
struct input_event ev[ArrayLength(bits) + 1];
int i;
+ int rc;
memset(ev, 0, sizeof(ev));
@@ -1122,7 +1123,9 @@
ev[i].code = SYN_REPORT;
ev[i].value = 0;
- write(pInfo->fd, ev, sizeof ev);
+ rc = write(pInfo->fd, ev, sizeof ev);
+ if (rc != sizeof ev)
+ xf86IDrvMsg(pInfo, X_ERROR, "Failed to set keyboard controls:
%s\n", strerror(errno));
}
static int
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xf86-input-evdev-2.10.3/src/evdev.h
new/xf86-input-evdev-2.10.4/src/evdev.h
--- old/xf86-input-evdev-2.10.3/src/evdev.h 2016-06-01 03:40:46.000000000
+0200
+++ new/xf86-input-evdev-2.10.4/src/evdev.h 2016-09-06 05:51:21.000000000
+0200
@@ -67,6 +67,18 @@
#define LogMessageVerbSigSafe xf86MsgVerb
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 23
+#define HAVE_THREADED_INPUT 1
+#endif
+
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 24
+#define BLOCK_HANDLER_ARGS void *data, void *waitTime
+#define WAKEUP_HANDLER_ARGS void *data, int i
+#else
+#define BLOCK_HANDLER_ARGS pointer data, struct timeval **waitTime,
pointer LastSelectMask
+#define WAKEUP_HANDLER_ARGS void *data, int i, pointer LastSelectMask
+#endif
+
#define EVDEV_MAXBUTTONS 32
#define EVDEV_MAXQUEUE 32
@@ -260,8 +272,8 @@
/* Middle Button emulation */
int EvdevMBEmuTimer(InputInfoPtr);
BOOL EvdevMBEmuFilterEvent(InputInfoPtr, int, BOOL);
-void EvdevMBEmuWakeupHandler(pointer, int, pointer);
-void EvdevMBEmuBlockHandler(pointer, struct timeval**, pointer);
+void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS);
+void EvdevMBEmuBlockHandler(BLOCK_HANDLER_ARGS);
void EvdevMBEmuPreInit(InputInfoPtr);
void EvdevMBEmuOn(InputInfoPtr);
void EvdevMBEmuFinalize(InputInfoPtr);
