You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
74 lines
2.9 KiB
74 lines
2.9 KiB
6 years ago
|
From 7f22271ca7ace43f6fa1168a2acea9af6f2d5896 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jason Gerecke <killertofu@gmail.com>
|
||
|
|
Date: Thu, 13 Oct 2016 10:39:46 -0700
|
||
|
|
Subject: [PATCH xserver 01/12] xwayland: Depend on wayland-protocols to build
|
||
|
|
tablet protocol headers
|
||
|
|
|
||
|
|
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
|
||
|
|
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
|
||
|
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
Acked-by: Ping Cheng <ping.cheng@wacom.com>
|
||
|
|
(cherry picked from commit 89c841915ac4fba6d2a5ad0051c778f1a76ffbf3)
|
||
|
|
---
|
||
|
|
configure.ac | 2 +-
|
||
|
|
hw/xwayland/Makefile.am | 9 ++++++++-
|
||
|
|
hw/xwayland/xwayland-input.c | 1 +
|
||
|
|
3 files changed, 10 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index e6c5b35de..d34e10538 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -2503,7 +2503,7 @@ AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes])
|
||
|
|
|
||
|
|
dnl Xwayland DDX
|
||
|
|
|
||
|
|
-XWAYLANDMODULES="wayland-client >= 1.3.0 wayland-protocols >= 1.1 $LIBDRM epoxy"
|
||
|
|
+XWAYLANDMODULES="wayland-client >= 1.3.0 wayland-protocols >= 1.5 $LIBDRM epoxy"
|
||
|
|
if test "x$XF86VIDMODE" = xyes; then
|
||
|
|
XWAYLANDMODULES="$XWAYLANDMODULES $VIDMODEPROTO"
|
||
|
|
fi
|
||
|
|
diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
|
||
|
|
index a3c9fce48..e376f09dd 100644
|
||
|
|
--- a/hw/xwayland/Makefile.am
|
||
|
|
+++ b/hw/xwayland/Makefile.am
|
||
|
|
@@ -56,7 +56,9 @@ Xwayland_built_sources += \
|
||
|
|
relative-pointer-unstable-v1-client-protocol.h \
|
||
|
|
relative-pointer-unstable-v1-protocol.c \
|
||
|
|
pointer-constraints-unstable-v1-client-protocol.h \
|
||
|
|
- pointer-constraints-unstable-v1-protocol.c
|
||
|
|
+ pointer-constraints-unstable-v1-protocol.c \
|
||
|
|
+ tablet-unstable-v2-client-protocol.h \
|
||
|
|
+ tablet-unstable-v2-protocol.c
|
||
|
|
|
||
|
|
nodist_Xwayland_SOURCES = $(Xwayland_built_sources)
|
||
|
|
CLEANFILES = $(Xwayland_built_sources)
|
||
|
|
@@ -79,6 +81,11 @@ pointer-constraints-unstable-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/unstab
|
||
|
|
pointer-constraints-unstable-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
|
||
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
|
||
|
|
|
||
|
|
+tablet-unstable-v2-protocol.c: $(WAYLAND_PROTOCOLS_DATADIR)/unstable/tablet/tablet-unstable-v2.xml
|
||
|
|
+ $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
|
||
|
|
+tablet-unstable-v2-client-protocol.h: $(WAYLAND_PROTOCOLS_DATADIR)/unstable/tablet/tablet-unstable-v2.xml
|
||
|
|
+ $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
|
||
|
|
+
|
||
|
|
%-protocol.c : %.xml
|
||
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
|
||
|
|
|
||
|
|
diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
|
||
|
|
index f2564d5d3..8fdc875ea 100644
|
||
|
|
--- a/hw/xwayland/xwayland-input.c
|
||
|
|
+++ b/hw/xwayland/xwayland-input.c
|
||
|
|
@@ -34,6 +34,7 @@
|
||
|
|
#include <inpututils.h>
|
||
|
|
#include <mipointer.h>
|
||
|
|
#include <mipointrst.h>
|
||
|
|
+#include "tablet-unstable-v2-client-protocol.h"
|
||
|
|
|
||
|
|
/* Copied from mipointer.c */
|
||
|
|
#define MIPOINTER(dev) \
|
||
|
|
--
|
||
|
|
2.13.5
|
||
|
|
|