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>

diff --git a/meson.build b/meson.build
index 492aba58a618719d995dd6dd1a4c760a18e216d2..f0f7b237b93026c84cb15116d20ed713ac65ae4f 100644 (file)
--- 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 c55aafcfd8f36226744c66564cee2bebd79e567d..4f4f7b57fc4b9e2f7cc72137da8b054f0531c787 100644 (file)
--- 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 9eba7182f4796570168bad4c59f1ac66bc20ffee..54b2c4a33a4248191c6b0092c1cade6f163ab078 100644 (file)
--- 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 65d22ec329ce645a26ccb2b66fc2bfcfc0555cdb..df06803d3e710704e45e2eea2551f83003574b0a 100644 (file)
--- 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,