forked from pool/libinput
Accepting request 477703 from home:Zaitor:branches:X11:Wayland
New upstream release, not buildtested OBS-URL: https://build.opensuse.org/request/show/477703 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libinput?expand=0&rev=111
This commit is contained in:
Git OBS Bridge
parent
040c8d943a
commit
3fd2c142aa
BIN
libinput-1.6.2.tar.xz
(Stored with Git LFS)
BIN
libinput-1.6.2.tar.xz
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
BIN
libinput-1.6.3.tar.xz
(Stored with Git LFS)
Normal file
BIN
libinput-1.6.3.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
libinput-1.6.3.tar.xz.sig
Normal file
BIN
libinput-1.6.3.tar.xz.sig
Normal file
Binary file not shown.
@ -1,71 +0,0 @@
|
||||
From 7b11fef3490277317f4a794beeadf206a48844f6 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri, 24 Feb 2017 10:10:44 +1000
|
||||
Subject: Fix a crash when requesting invalid mode group indices
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
||||
(cherry picked from commit c787ccf270f44007dbadce72c1516b819c2ca5ce)
|
||||
|
||||
diff --git a/src/evdev-tablet-pad-leds.c b/src/evdev-tablet-pad-leds.c
|
||||
index 209ab73..89b3b9d 100644
|
||||
--- a/src/evdev-tablet-pad-leds.c
|
||||
+++ b/src/evdev-tablet-pad-leds.c
|
||||
@@ -645,5 +645,9 @@ evdev_device_tablet_pad_get_mode_group(struct evdev_device *device,
|
||||
if (!(device->seat_caps & EVDEV_DEVICE_TABLET_PAD))
|
||||
return NULL;
|
||||
|
||||
+ if (index >=
|
||||
+ (unsigned int)evdev_device_tablet_pad_get_num_mode_groups(device))
|
||||
+ return NULL;
|
||||
+
|
||||
return pad_get_mode_group(pad, index);
|
||||
}
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
|
||||
From 3940ab7f40a39a045e888068d199871e6d669392 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Fri, 24 Feb 2017 10:15:23 +1000
|
||||
Subject: tools: add mode group info to libinput-list-devices
|
||||
|
||||
We don't cater for the special case of groups having a different number of
|
||||
modes, there is no hardware right now that does that.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
||||
(cherry picked from commit 38c675c9599fabeb8c530ab74898524a71cacf75)
|
||||
|
||||
diff --git a/tools/libinput-list-devices.c b/tools/libinput-list-devices.c
|
||||
index e202388..8fd25df 100644
|
||||
--- a/tools/libinput-list-devices.c
|
||||
+++ b/tools/libinput-list-devices.c
|
||||
@@ -245,16 +245,23 @@ rotation_default(struct libinput_device *device)
|
||||
static void
|
||||
print_pad_info(struct libinput_device *device)
|
||||
{
|
||||
- int nbuttons, nrings, nstrips;
|
||||
+ int nbuttons, nrings, nstrips, ngroups, nmodes;
|
||||
+ struct libinput_tablet_pad_mode_group *group;
|
||||
|
||||
nbuttons = libinput_device_tablet_pad_get_num_buttons(device);
|
||||
nrings = libinput_device_tablet_pad_get_num_rings(device);
|
||||
nstrips = libinput_device_tablet_pad_get_num_strips(device);
|
||||
+ ngroups = libinput_device_tablet_pad_get_num_mode_groups(device);
|
||||
+
|
||||
+ group = libinput_device_tablet_pad_get_mode_group(device, 0);
|
||||
+ nmodes = libinput_tablet_pad_mode_group_get_num_modes(group);
|
||||
|
||||
printf("Pad:\n");
|
||||
printf(" Rings: %d\n", nrings);
|
||||
printf(" Strips: %d\n", nstrips);
|
||||
printf(" Buttons: %d\n", nbuttons);
|
||||
+ printf(" Mode groups: %d (%d modes)\n", ngroups, nmodes);
|
||||
+
|
||||
}
|
||||
|
||||
static void
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 8 09:34:25 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 1.6.3:
|
||||
* A few small fixes that likely affect few users only: the
|
||||
minimum size for horizontal edge scrolling has been reduced to
|
||||
40mm and hovering touches inside a software button area are
|
||||
handled better now. Since we don't use pressure-based touches
|
||||
in 1.6.x, this is unlikely to be noticed.
|
||||
* Requesting an invalid mode group index doesn't crash anymore,
|
||||
that's pretty much UX improvement 101.
|
||||
- Drop libinput-fix-crasher.patch: Fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 1 19:51:34 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
Name: libinput
|
||||
%define lname libinput10
|
||||
Version: 1.6.2
|
||||
Version: 1.6.3
|
||||
Release: 0
|
||||
Summary: Input device and event processing library
|
||||
License: MIT
|
||||
@ -32,8 +32,6 @@ Source: http://freedesktop.org/software/libinput/%name-%version.tar.xz
|
||||
Source2: http://freedesktop.org/software/libinput/%name-%version.tar.xz.sig
|
||||
Source3: baselibs.conf
|
||||
Source4: %name.keyring
|
||||
# PATCH-FIX-UPSTREAM libinput-fix-crasher.patch zaitor@opensuse.org -- Fix a crash when requesting invalid mode group indices.
|
||||
Patch: libinput-fix-crasher.patch
|
||||
#git#BuildRequires: autoconf >= 2.64
|
||||
#git#BuildRequires: automake >= 1.11
|
||||
#git#BuildRequires: libtool >= 2.2
|
||||
@ -100,7 +98,6 @@ to develop applications that require libinput.
|
||||
|
||||
%prep
|
||||
%setup -qn %name-%version
|
||||
%patch -p1
|
||||
|
||||
%build
|
||||
if [ ! -e configure ]; then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user