Hello community,
here is the log from the commit of package xf86-input-keyboard for
openSUSE:Factory checked in at 2016-09-27 13:42:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-keyboard (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-keyboard.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-keyboard"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-keyboard/xf86-input-keyboard.changes
2015-08-21 07:35:59.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-input-keyboard.new/xf86-input-keyboard.changes
2016-09-27 13:42:39.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Sep 20 19:06:57 UTC 2016 - [email protected]
+
+- Add patch U_Use-xf86AddEnabledDevice-with-threaded-input.patch
+ This is in preparation for the upcoming XServer and its threaded input.
+
+-------------------------------------------------------------------
New:
----
U_Use-xf86AddEnabledDevice-with-threaded-input.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-keyboard.spec ++++++
--- /var/tmp/diff_new_pack.VtxIJv/_old 2016-09-27 13:42:42.000000000 +0200
+++ /var/tmp/diff_new_pack.VtxIJv/_new 2016-09-27 13:42:42.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xf86-input-keyboard
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,9 @@
Group: System/X11/Servers/XF86_4
Url: http://xorg.freedesktop.org/
Source0:
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
+
+Patch1: U_Use-xf86AddEnabledDevice-with-threaded-input.patch
+
BuildRequires: pkg-config
BuildRequires: pkgconfig(inputproto)
BuildRequires: pkgconfig(xorg-macros) >= 1.8
@@ -46,6 +49,8 @@
%prep
%setup -q
+%patch1 -p1
+
%build
%configure
make %{?_smp_mflags}
++++++ U_Use-xf86AddEnabledDevice-with-threaded-input.patch ++++++
>From 157e0631b12d0aae4a5f38b81bee615a7eaf553f Mon Sep 17 00:00:00 2001
From: Keith Packard <[email protected]>
Date: Mon, 30 May 2016 01:27:49 -0700
Subject: [PATCH] Use xf86AddEnabledDevice with threaded input
We didn't use SIGIO input for keyboard processing, but we can use
threaded input.
Signed-off-by: Keith Packard <[email protected]>
Signed-off-by: Peter Hutterer <[email protected]>
---
src/kbd.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/kbd.c b/src/kbd.c
index e378dcc..be6948c 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -45,6 +45,10 @@
#include "xkbstr.h"
#include "xkbsrv.h"
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 23
+#define HAVE_THREADED_INPUT 1
+#endif
+
#define CAPSFLAG 1
#define NUMFLAG 2
#define SCROLLFLAG 4
@@ -352,7 +356,11 @@ KbdProc(DeviceIntPtr device, int what)
*/
if (pInfo->fd >= 0) {
xf86FlushInput(pInfo->fd);
+#if HAVE_THREADED_INPUT
+ xf86AddEnabledDevice(pInfo);
+#else
AddEnabledDevice(pInfo->fd);
+#endif
}
device->public.on = TRUE;
@@ -365,8 +373,13 @@ KbdProc(DeviceIntPtr device, int what)
/*
* Restore original keyboard directness and translation.
*/
- if (pInfo->fd != -1)
+ if (pInfo->fd != -1) {
+#if HAVE_THREADED_INPUT
+ xf86RemoveEnabledDevice(pInfo);
+#else
RemoveEnabledDevice(pInfo->fd);
+#endif
+ }
pKbd->KbdOff(pInfo, what);
device->public.on = FALSE;
break;
--
2.10.0
