diff --git a/meson.build b/meson.build index cb8f10c1..f8c0e8b1 100644 --- a/meson.build +++ b/meson.build @@ -163,9 +163,7 @@ config_h.set10('HAVE_INSTALLED_TESTS', get_option('install-tests')) pkgconfig = import('pkgconfig') dep_udev = dependency('libudev') dep_mtdev = dependency('mtdev', version : '>= 1.1.0') -dep_libevdev = dependency('libevdev', version: '>= 1.9.0') -config_h.set10('HAVE_LIBEVDEV_DISABLE_PROPERTY', - dep_libevdev.version().version_compare('>= 1.9.902')) +dep_libevdev = dependency('libevdev', version: '>= 1.10.0') dep_lm = cc.find_library('m', required : false) dep_rt = cc.find_library('rt', required : false) diff --git a/src/evdev.c b/src/evdev.c index 68b76107..d9b347a0 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -2233,17 +2233,10 @@ evdev_pre_configure_model_quirks(struct evdev_device *device) unsigned int p = t->tuples[idx].first; bool enable = t->tuples[idx].second; - if (enable) { + if (enable) libevdev_enable_property(device->evdev, p); - } - else { -#if HAVE_LIBEVDEV_DISABLE_PROPERTY + else libevdev_disable_property(device->evdev, p); -#else - evdev_log_error(device, - "quirks: a quirk for this device requires newer libevdev than installed\n"); -#endif - } evdev_log_debug(device, "quirks: %s %s (%#x)\n", enable ? "enabling" : "disabling", diff --git a/test/litest-device-keyboard-quirked.c b/test/litest-device-keyboard-quirked.c index 340dc137..2b6c6536 100644 --- a/test/litest-device-keyboard-quirked.c +++ b/test/litest-device-keyboard-quirked.c @@ -214,7 +214,6 @@ static const char quirk_file[] = "[litest Quirked keyboard disable F1-F3]\n" "MatchName=litest Quirked Keyboard\n" "AttrEventCode=-KEY_F1;-EV_KEY:0x3c;-KEY_F3\n" -#if HAVE_LIBEVDEV_DISABLE_PROPERTY "\n" "[litest Quirked keyboard enable buttonpad]\n" "MatchName=litest Quirked Keyboard\n" @@ -239,7 +238,6 @@ static const char quirk_file[] = "[litest Quirked keyboard enable semi-mt]\n" "MatchName=litest Quirked Keyboard\n" "AttrInputProp=+INPUT_PROP_SEMI_MT\n" -#endif ; TEST_DEVICE(LITEST_KEYBOARD_QUIRKED, diff --git a/test/test-device.c b/test/test-device.c index 936f0c55..c55e8512 100644 --- a/test/test-device.c +++ b/test/test-device.c @@ -1400,15 +1400,13 @@ START_TEST(device_quirks) struct libinput_device *device; char **message; bool disable_key_f1 = false, - enable_btn_left = false; -#if HAVE_LIBEVDEV_DISABLE_PROPERTY - bool disable_pointingstick = false, + enable_btn_left = false, + disable_pointingstick = false, enable_buttonpad = false, enable_direct = false, disable_direct = false, enable_semi_mt = false, disable_semi_mt = false; -#endif _litest_context_destroy_ struct libinput *li = litest_create_context(); libinput_log_set_priority(li, LIBINPUT_LOG_PRIORITY_DEBUG); @@ -1437,7 +1435,6 @@ START_TEST(device_quirks) disable_key_f1 = true; if (strstr(*message, "enabling EV_KEY BTN_LEFT")) enable_btn_left = true; -#if HAVE_LIBEVDEV_DISABLE_PROPERTY if (strstr(*message, "enabling INPUT_PROP_BUTTONPAD")) enable_buttonpad = true; if (strstr(*message, "disabling INPUT_PROP_POINTING_STICK")) @@ -1458,21 +1455,18 @@ START_TEST(device_quirks) litest_assert(!enable_semi_mt); disable_semi_mt = true; } -#endif free(*message); message++; } litest_assert(disable_key_f1); litest_assert(enable_btn_left); -#if HAVE_LIBEVDEV_DISABLE_PROPERTY litest_assert(enable_buttonpad); litest_assert(disable_pointingstick); litest_assert(enable_direct); litest_assert(disable_direct); litest_assert(enable_semi_mt); litest_assert(disable_semi_mt); -#endif litest_disable_log_handler(li);