fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-09 05:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson.build: update libwacom dependency to 0.27 or newer

Browse source 
Released in 2017, that's enough waiting

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-06-18 14:32:56 +10:00
parent a62e2b14a2
commit 5201ed8cc6
4 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
meson.build
View file

@ -136,15 +136,7 @@ includes_src = include_directories('src')
have_libwacom = get_option('libwacom') have_libwacom = get_option('libwacom')
config_h.set10('HAVE_LIBWACOM', have_libwacom) config_h.set10('HAVE_LIBWACOM', have_libwacom)
if have_libwacom if have_libwacom
dep_libwacom = dependency('libwacom', version : '>= 0.20') dep_libwacom = dependency('libwacom', version : '>= 0.27')
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)
else else
dep_libwacom = declare_dependency() dep_libwacom = declare_dependency()
endif endif

2
src/evdev-tablet-pad.c
View file

@ -550,7 +550,7 @@ pad_init_buttons_from_libwacom(struct pad_dispatch *pad,
struct evdev_device *device) struct evdev_device *device)
{ {
bool rc = false; bool rc = false;
#if HAVE_LIBWACOM_GET_BUTTON_EVDEV_CODE #if HAVE_LIBWACOM
struct libinput *li = pad_libinput_context(pad); struct libinput *li = pad_libinput_context(pad);
WacomDeviceDatabase *db = NULL; WacomDeviceDatabase *db = NULL;
WacomDevice *tablet = NULL; WacomDevice *tablet = NULL;

6
test/test-pad.c
View file

@ -176,7 +176,7 @@ END_TEST
START_TEST(pad_button_intuos) START_TEST(pad_button_intuos)
{ {
#if !HAVE_LIBWACOM_GET_BUTTON_EVDEV_CODE #if !HAVE_LIBWACOM
struct litest_device *dev = litest_current_device(); struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput; struct libinput *li = dev->libinput;
unsigned int code; unsigned int code;
@ -236,7 +236,7 @@ END_TEST
START_TEST(pad_button_bamboo) START_TEST(pad_button_bamboo)
{ {
#if !HAVE_LIBWACOM_GET_BUTTON_EVDEV_CODE #if !HAVE_LIBWACOM
struct litest_device *dev = litest_current_device(); struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput; struct libinput *li = dev->libinput;
unsigned int code; unsigned int code;
@ -286,7 +286,7 @@ END_TEST
START_TEST(pad_button_libwacom) START_TEST(pad_button_libwacom)
{ {
#if HAVE_LIBWACOM_GET_BUTTON_EVDEV_CODE #if HAVE_LIBWACOM
struct litest_device *dev = litest_current_device(); struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput; struct libinput *li = dev->libinput;
WacomDeviceDatabase *db = NULL; WacomDeviceDatabase *db = NULL;

4
udev/libinput-device-group.c
View file

@ -30,7 +30,7 @@
#include "libinput-util.h" #include "libinput-util.h"
#if HAVE_LIBWACOM_GET_PAIRED_DEVICE #if HAVE_LIBWACOM
#include <libwacom/libwacom.h> #include <libwacom/libwacom.h>
static void static void
@ -209,7 +209,7 @@ int main(int argc, char **argv)
} else { } else {
char *physmatch = NULL; char *physmatch = NULL;
#if HAVE_LIBWACOM_GET_PAIRED_DEVICE #if HAVE_LIBWACOM
if (vendor_id == VENDOR_ID_WACOM) { if (vendor_id == VENDOR_ID_WACOM) {
if (product_id == PRODUCT_ID_WACOM_EKR) if (product_id == PRODUCT_ID_WACOM_EKR)
wacom_handle_ekr(device, wacom_handle_ekr(device,