diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-05-19 16:30:11 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-05-19 16:30:35 +1000 |
| commit | f279108ffd07616299cf9fb922de14bd1249658d (patch) | |
| tree | 7cc60427bf864383be220cdde6cc595b86eb5bac | |
| parent | 583ed5acdc17a4dc7848c891d7cdbd35ff07b781 (diff) | |
| download | xorg-driver-xf86-input-libinput-f279108ffd07616299cf9fb922de14bd1249658d.tar.gz | |
Bump the libinput requirement to 1.11
Released June 2018, that should be recent enough.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/xf86libinput.c | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 6026197..bf65e90 100644 --- a/configure.ac +++ b/configure.ac @@ -45,22 +45,12 @@ XORG_DEFAULT_OPTIONS # Obtain compiler/linker options from server and required extensions PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto [inputproto >= 2.2]) -PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.7.0]) +PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.11.0]) OLD_LIBS=$LIBS OLD_CFLAGS=$CFLAGS LIBS="$LIBS $LIBINPUT_LIBS" CFLAGS="$CFLAGS $LIBINPUT_CFLAGS" -AC_MSG_CHECKING([if libinput_device_touch_get_touch_count is available]) -AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include <libinput.h>]], - [[libinput_device_touch_get_touch_count(NULL)]])], - [AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_LIBINPUT_TOUCH_COUNT, [1], - [libinput_device_touch_get_touch_count() is available]) - [libinput_have_touch_count=yes]], - [AC_MSG_RESULT([no]) - [libinput_have_touch_count=no]]) AC_MSG_CHECKING([if libinput_device_config_scroll_get_button_lock is available]) AC_LINK_IFELSE( diff --git a/src/xf86libinput.c b/src/xf86libinput.c index d6da6e3..28b376c 100644 --- a/src/xf86libinput.c +++ b/src/xf86libinput.c @@ -1104,11 +1104,9 @@ xf86libinput_init_touch(InputInfoPtr pInfo) XIGetKnownProperty(AXIS_LABEL_PROP_ABS_MT_POSITION_Y), min, max, res * 1000, 0, res * 1000, Absolute); -#if HAVE_LIBINPUT_TOUCH_COUNT ntouches = libinput_device_touch_get_touch_count(device); if (ntouches == 0) /* unknown - mtdev */ ntouches = TOUCH_MAX_SLOTS; -#endif InitTouchClassDeviceStruct(dev, ntouches, XIDirectTouch, 2); } |