Skip to content

implement libdemi support #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

implement libdemi support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
051a379
meson_options.txt: add enum-backend option
illiliti Mar 13, 2022
afe7ae0
meson.build: use enum-backend to set have_udev
illiliti Mar 13, 2022
63bcec0
meson.build: conditionally add netlink seat to sources
illiliti Mar 13, 2022
6951cbb
meson_options.txt: deprecate udev option
illiliti Mar 13, 2022
f92c094
implement libdemi support
illiliti Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ endif
############ udev bits ############

have_udev = get_option('udev')
have_udev = have_udev and get_option('enum-backend') == 'udev'
config_h.set10('HAVE_UDEV', have_udev)
if have_udev
dep_udev = dependency('libudev')
Expand Down Expand Up @@ -375,8 +376,6 @@ src_libinput = src_libfilter + [
'src/evdev-tablet-pad.c',
'src/evdev-tablet-pad.h',
'src/evdev-tablet-pad-leds.c',
'src/netlink-seat.c',
'src/netlink-seat.h',
'src/path-seat.c',
'src/udev-seat.c',
'src/udev-seat.h',
Expand All @@ -397,6 +396,13 @@ deps_libinput = [
dep_libquirks
]

if get_option('enum-backend') == 'demi'
deps_libinput += dependency('demi')
src_libinput += ['src/demi-seat.c', 'src/demi-seat.h']
elif not have_udev
src_libinput += ['src/netlink-seat.c', 'src/netlink-seat.h']
endif

libinput_version_h_config = configuration_data()
libinput_version_h_config.set('LIBINPUT_VERSION_MAJOR', libinput_version[0])
libinput_version_h_config.set('LIBINPUT_VERSION_MINOR', libinput_version[1])
Expand Down
6 changes: 6 additions & 0 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,15 @@ option('libwacom',
type: 'boolean',
value: true,
description: 'Use libwacom for tablet identification (default=true)')
option('enum-backend',
type: 'combo',
choices: ['netlink', 'udev'],
value: 'udev',
description: 'Input device detection backend (default=udev)')
option('udev',
type: 'boolean',
value: true,
deprecated: true,
description: 'Use libudev for device detection (default=true)')
option('debug-gui',
type: 'boolean',
Expand Down
Loading