diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-06-18 14:32:56 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-09-09 12:36:09 +1000 |
| commit | 5201ed8cc6d6468f7391dac6dbe1cac0682b1dfb (patch) | |
| tree | 92c13f57a5922c391fbe2b5d593196af6a438e3e | |
| parent | a62e2b14a2bc1cbfce91772d61b9359c191e0d05 (diff) | |
| download | libinput-5201ed8cc6d6468f7391dac6dbe1cac0682b1dfb.tar.gz | |
meson.build: update libwacom dependency to 0.27 or newer
Released in 2017, that's enough waiting
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | meson.build | 10 | ||||
| -rw-r--r-- | src/evdev-tablet-pad.c | 2 | ||||
| -rw-r--r-- | test/test-pad.c | 6 | ||||
| -rw-r--r-- | udev/libinput-device-group.c | 4 |
4 files changed, 7 insertions, 15 deletions
diff --git a/meson.build b/meson.build index 492aba58..f0f7b237 100644 --- a/meson.build +++ b/meson.build @@ -136,15 +136,7 @@ includes_src = include_directories('src') have_libwacom = get_option('libwacom') config_h.set10('HAVE_LIBWACOM', have_libwacom) if have_libwacom - dep_libwacom = dependency('libwacom', version : '>= 0.20') - - result = cc.has_function('libwacom_get_paired_device', - dependencies: dep_libwacom) - config_h.set10('HAVE_LIBWACOM_GET_PAIRED_DEVICE', result) - - result = cc.has_function('libwacom_get_button_evdev_code', - dependencies: dep_libwacom) - config_h.set10('HAVE_LIBWACOM_GET_BUTTON_EVDEV_CODE', result) + dep_libwacom = dependency('libwacom', version : '>= 0.27') else dep_libwacom = declare_dependency() endif diff --git a/src/evdev-tablet-pad.c b/src/evdev-tablet-pad.c index c55aafcf..4f4f7b57 100644 --- a/src/evdev-tablet-pad.c +++ b/src/evdev-tablet-pad.c @@ -550,7 +550,7 @@ pad_init_buttons_from_libwacom(struct pad_dispatch *pad, struct evdev_device *device) { bool rc = false; -#if HAVE_LIBWACOM_GET_BUTTON_EVDEV_CODE +#if HAVE_LIBWACOM struct libinput *li = pad_libinput_context(pad); WacomDeviceDatabase *db = NULL; WacomDevice *tablet = NULL; diff --git a/test/test-pad.c b/test/test-pad.c index 9eba7182..54b2c4a3 100644 --- a/test/test-pad.c +++ b/test/test-pad.c @@ -176,7 +176,7 @@ END_TEST START_TEST(pad_button_intuos) { -#if !HAVE_LIBWACOM_GET_BUTTON_EVDEV_CODE +#if !HAVE_LIBWACOM struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; unsigned int code; @@ -236,7 +236,7 @@ END_TEST START_TEST(pad_button_bamboo) { -#if !HAVE_LIBWACOM_GET_BUTTON_EVDEV_CODE +#if !HAVE_LIBWACOM struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; unsigned int code; @@ -286,7 +286,7 @@ END_TEST START_TEST(pad_button_libwacom) { -#if HAVE_LIBWACOM_GET_BUTTON_EVDEV_CODE +#if HAVE_LIBWACOM struct litest_device *dev = litest_current_device(); struct libinput *li = dev->libinput; WacomDeviceDatabase *db = NULL; diff --git a/udev/libinput-device-group.c b/udev/libinput-device-group.c index 65d22ec3..df06803d 100644 --- a/udev/libinput-device-group.c +++ b/udev/libinput-device-group.c @@ -30,7 +30,7 @@ #include "libinput-util.h" -#if HAVE_LIBWACOM_GET_PAIRED_DEVICE +#if HAVE_LIBWACOM #include <libwacom/libwacom.h> static void @@ -209,7 +209,7 @@ int main(int argc, char **argv) } else { char *physmatch = NULL; -#if HAVE_LIBWACOM_GET_PAIRED_DEVICE +#if HAVE_LIBWACOM if (vendor_id == VENDOR_ID_WACOM) { if (product_id == PRODUCT_ID_WACOM_EKR) wacom_handle_ekr(device, |