xserver-xorg-input-libinput: Changes to 'upstream-unstable'
Makefile.am | 2 +-
conf/60-libinput.conf | 28 ++++++++++++++++++++++++++++
conf/90-libinput.conf | 28 ----------------------------
configure.ac | 2 +-
src/xf86libinput.c | 1 +
5 files changed, 31 insertions(+), 30 deletions(-)
New commits:
commit f9b6fa21df735e9a68c5f527afc422f519d6002c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 28 13:43:49 2016 +1000
xf86-input-libinput 0.19.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 722411b..7dea666 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-libinput],
- [0.18.0],
+ [0.19.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-libinput])
AC_CONFIG_SRCDIR([Makefile.am])
commit 3f569ec493e738242da97afe30f7dd2a3b2b834d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 26 15:45:18 2016 +1000
conf: rename to 60-libinput.conf
60 sorts higher than the other drivers (evdev has 10, synaptics, wacom and
others have 50) so we keep the same order.
This is part of a two-step solution, the other half is renaming the
xf86-input-wacom's config snippet to sort higher than libinput's.
Currently libinput picks up devices that are (for now) destined to the wacom
driver. Since the wacom driver is more of a leaf package than libinput, the
best option here is to make the wacom driver sort higher and let users
uninstall it when not needed. To avoid crowding the 90-* space where users
usually have custom config snippets, drop libinput down to 60 and bump wacom
up.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Jason Gerecke <jason.gerecke@wacom.com>
diff --git a/Makefile.am b/Makefile.am
index 4001f94..c73c15f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xorg-libinput.pc
-dist_xorgconf_DATA = conf/90-libinput.conf
+dist_xorgconf_DATA = conf/60-libinput.conf
.PHONY: ChangeLog INSTALL
diff --git a/conf/60-libinput.conf b/conf/60-libinput.conf
new file mode 100644
index 0000000..97afd07
--- /dev/null
+++ b/conf/60-libinput.conf
@@ -0,0 +1,28 @@
+# Match on all types of devices but tablet devices and joysticks
+Section "InputClass"
+ Identifier "libinput pointer catchall"
+ MatchIsPointer "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+EndSection
+
+Section "InputClass"
+ Identifier "libinput keyboard catchall"
+ MatchIsKeyboard "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+EndSection
+
+Section "InputClass"
+ Identifier "libinput touchpad catchall"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+EndSection
+
+Section "InputClass"
+ Identifier "libinput touchscreen catchall"
+ MatchIsTouchscreen "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+EndSection
diff --git a/conf/90-libinput.conf b/conf/90-libinput.conf
deleted file mode 100644
index 97afd07..0000000
--- a/conf/90-libinput.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Match on all types of devices but tablet devices and joysticks
-Section "InputClass"
- Identifier "libinput pointer catchall"
- MatchIsPointer "on"
- MatchDevicePath "/dev/input/event*"
- Driver "libinput"
-EndSection
-
-Section "InputClass"
- Identifier "libinput keyboard catchall"
- MatchIsKeyboard "on"
- MatchDevicePath "/dev/input/event*"
- Driver "libinput"
-EndSection
-
-Section "InputClass"
- Identifier "libinput touchpad catchall"
- MatchIsTouchpad "on"
- MatchDevicePath "/dev/input/event*"
- Driver "libinput"
-EndSection
-
-Section "InputClass"
- Identifier "libinput touchscreen catchall"
- MatchIsTouchscreen "on"
- MatchDevicePath "/dev/input/event*"
- Driver "libinput"
-EndSection
commit 602bb8eefac929501b2cd5e5bd4a9838d1903774
Author: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Wed Oct 14 10:43:34 2015 +1000
Fix implicit declaration of function 'xf86Msg' in xf86libinput.c
Addition of xf86.h header fixes compilation issues in some cases.
See: https://bugs.gentoo.org/show_bug.cgi?id=560970
Signed-off-by: Stanislav Ochotnicky <sochotnicky@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/xf86libinput.c b/src/xf86libinput.c
index bc5d685..dd3250c 100644
--- a/src/xf86libinput.c
+++ b/src/xf86libinput.c
@@ -33,6 +33,7 @@
#include <list.h>
#include <exevents.h>
#include <xkbsrv.h>
+#include <xf86.h>
#include <xf86Xinput.h>
#include <xf86_OSproc.h>
#include <xserver-properties.h>
Reply to: