Skip to content

feat(xdp): add support for libei #1003

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

Merged
andyholmes merged 4 commits into from
Dec 28, 2025
Merged

feat(xdp): add support for libei #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7289c3
feat(xdp): add a private libei based ValentInputAdapter
andyholmes Dec 26, 2025
93ff780
refactor(xdp): depend on the linux/input-event-codes.h header
andyholmes Dec 28, 2025
13a8964
feat(xdp): add support for the libei adapter
andyholmes Dec 28, 2025
a3b94e9
build(deps): bump minimum libportal version to 0.9
andyholmes Dec 28, 2025
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
2 changes: 2 additions & 0 deletions build-aux/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ RUN dnf install -y \
gtk4-devel gtk4-debuginfo \
json-glib-devel json-glib-debuginfo \
libadwaita-devel libadwaita-debuginfo \
libei-devel libei-debuginfo \
libpeas-devel libpeas-debuginfo \
libphonenumber-devel libphonenumber-debuginfo \
libportal-devel libportal-debuginfo \
libportal-gtk4-devel libportal-gtk4-debuginfo \
libtinysparql libtinysparql-debuginfo \
libxkbcommon-devel libxkbcommon-debuginfo \
pipewire-devel pipewire-debuginfo \
pulseaudio-libs-devel pulseaudio-libs-debuginfo \
sqlite-devel sqlite-debuginfo \
Expand Down
2 changes: 2 additions & 0 deletions build-aux/docker/Dockerfile.toolbox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ RUN dnf install -y \
gtk4-devel gtk4-debuginfo \
json-glib-devel json-glib-debuginfo \
libadwaita-devel libadwaita-debuginfo \
libei-devel libei-debuginfo \
libpeas-devel libpeas-debuginfo \
libphonenumber-devel libphonenumber-debuginfo \
libportal-devel libportal-debuginfo \
libportal-gtk4-devel libportal-gtk4-debuginfo \
libtinysparql libtinysparql-debuginfo \
libxkbcommon-devel libxkbcommon-debuginfo \
pipewire-devel pipewire-debuginfo \
pulseaudio-libs-devel pulseaudio-libs-debuginfo \
sqlite-devel sqlite-debuginfo \
Expand Down
20 changes: 20 additions & 0 deletions build-aux/flatpak/ca.andyholmes.Valent.Devel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,26 @@
}
]
},
{
"name": "libei",
"buildsystem": "meson",
"cleanup": [
"/bin/*"
],
"config-opts": [
"-Dlibei=enabled",
"-Dlibeis=disabled",
"-Dliboeffis=disabled",
"-Dtests=disabled"
],
"sources": [
{
"type": "git",
"url": "https://gitlab.freedesktop.org/libinput/libei.git",
"branch": "main"
}
]
},
{
"name": "libpeas",
"buildsystem": "meson",
Expand Down
26 changes: 26 additions & 0 deletions build-aux/flatpak/ca.andyholmes.Valent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,32 @@
}
]
},
{
"name": "libei",
"buildsystem": "meson",
"cleanup": [
"/bin/*"
],
"config-opts": [
"-Dlibei=enabled",
"-Dlibeis=disabled",
"-Dliboeffis=disabled",
"-Dtests=disabled"
],
"sources": [
{
"type": "git",
"url": "https://gitlab.freedesktop.org/libinput/libei.git",
"tag": "1.5.0",
"x-checker-data": {
"type": "anitya",
"project-id": 350087,
"stable-only": true,
"tag-template": "$version"
}
}
]
},
{
"name": "libpeas",
"buildsystem": "meson",
Expand Down
21 changes: 16 additions & 5 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,10 @@ json_glib_version = '>= 1.6.0'
libpeas_version = '>= 2.0.0'
eds_version = '>= 3.48'
libadwaita_version = '>= 1.6'
libportal_version = ['>= 0.7.1']
libei_version = '>= 1.3.0'
libportal_version = '>= 0.9'
tinysparql_version = '>= 3.0'
xkbcommon_version = '>= 1.0.0'

libm_dep = cc.find_library('m', required: true)
gio_dep = dependency('gio-2.0', version: glib_version)
Expand Down Expand Up @@ -193,6 +195,14 @@ libportal_gtk4_dep = dependency('libportal-gtk4',
version: libportal_version,
required: false,
)
libei_dep = dependency('libei-1.0',
version: libei_version,
required: false,
)
xkbcommon_dep = dependency('xkbcommon',
version: xkbcommon_version,
required: false,
)

# Debugging & Testing
libsysprof_capture_dep = dependency('sysprof-capture-4',
Expand Down Expand Up @@ -237,19 +247,20 @@ config_h_dependencies = {
'HAVE_ADWAITA': libadwaita_dep,
'HAVE_GLYCIN': glycin_dep,
'HAVE_LIBPORTAL_GTK4': libportal_gtk4_dep,
'HAVE_LIBEI': libei_dep,
'HAVE_SYSPROF': libsysprof_capture_dep,
'HAVE_WALBOTTLE': libwalbottle_dep,
'HAVE_XKBCOMMON': xkbcommon_dep,
}

foreach define, dep : config_h_dependencies
config_h.set(define, dep.found())
endforeach

config_h_functions = {
'HAVE_CLOCK_GETTIME': 'clock_gettime',
'HAVE_LOCALTIME_R': 'localtime_r',
'HAVE_SCHED_GETCPU': 'sched_getcpu',
'HAVE_REMOTE_DESKTOP_FULL': 'xdp_portal_create_remote_desktop_session_full',
'HAVE_CLOCK_GETTIME': 'clock_gettime',
'HAVE_LOCALTIME_R': 'localtime_r',
'HAVE_SCHED_GETCPU': 'sched_getcpu',
}

foreach define, function : config_h_functions
Expand Down
5 changes: 5 additions & 0 deletions src/plugins/xdp/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ plugin_xdp_sources = files([
'valent-xdp-utils.c',
])

if libei_dep.found() and xkbcommon_dep.found()
plugin_xdp_deps += [libei_dep, xkbcommon_dep]
plugin_xdp_sources += files(['valent-ei-input.c'])
endif

plugin_xdp_include_directories = [include_directories('.')]

# Resources
Expand Down
Loading
Loading