diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2023-02-09 15:38:26 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2023-02-09 22:57:00 +0000 |
| commit | 2f8778ca68c44dcd6c86fab25c33704d825201d6 (patch) | |
| tree | c3b75ad143527e5641322a6678da0f415c8ceb9d /include | |
| parent | f99bd03165040868b1471d122a07414f32f294fd (diff) | |
| download | xserver-2f8778ca68c44dcd6c86fab25c33704d825201d6.tar.gz | |
xwayland: wl_pointer.axis_v120 is no longer optional
With Wayland 1.21 being our baseline, we do not need to compile
wl_pointer.axis_v120 conditionally.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/meson.build | 1 | ||||
| -rw-r--r-- | include/xwayland-config.h.meson.in | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/meson.build b/include/meson.build index e953dfa65..f3e160ded 100644 --- a/include/meson.build +++ b/include/meson.build @@ -419,7 +419,6 @@ xwayland_data.set('XWL_HAS_GLAMOR', build_glamor and (gbm_dep.found() or build_e xwayland_data.set('XWL_HAS_EGLSTREAM', build_eglstream ? '1' : false) xwayland_data.set('XWL_HAS_LIBDECOR', have_libdecor ? '1' : false) xwayland_data.set('XWL_HAS_XWAYLAND_EXTENSION', xwaylandproto_dep.found() ? '1' : false) -xwayland_data.set('XWL_HAS_WL_POINTER_AXIS_V120', wayland_client_dep.found() and wayland_client_dep.version().version_compare('>= 1.21.0')) configure_file(output : 'xwayland-config.h', input : 'xwayland-config.h.meson.in', diff --git a/include/xwayland-config.h.meson.in b/include/xwayland-config.h.meson.in index 43b9ff29e..c254c1fd3 100644 --- a/include/xwayland-config.h.meson.in +++ b/include/xwayland-config.h.meson.in @@ -15,6 +15,3 @@ /* Build Xwayland with XWAYLAND extension */ #mesondefine XWL_HAS_XWAYLAND_EXTENSION - -/* libwayland has support for wl_pointer.axis_v120 events */ -#mesondefine XWL_HAS_WL_POINTER_AXIS_V120 |