frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jason Gerecke 2016-10-13 10:39:46 -07:00 committed by Peter Hutterer
parent 59554eaa6c
commit 89c841915a
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -2355,7 +2355,7 @@ AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
dnl Xwayland DDX 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 if test "x$XF86VIDMODE" = xyes; then
XWAYLANDMODULES="$XWAYLANDMODULES $VIDMODEPROTO" XWAYLANDMODULES="$XWAYLANDMODULES $VIDMODEPROTO"
fi fi

9
hw/xwayland/Makefile.am
View File

@ -55,7 +55,9 @@ Xwayland_built_sources += \
relative-pointer-unstable-v1-client-protocol.h \ relative-pointer-unstable-v1-client-protocol.h \
relative-pointer-unstable-v1-protocol.c \ relative-pointer-unstable-v1-protocol.c \
pointer-constraints-unstable-v1-client-protocol.h \ 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) nodist_Xwayland_SOURCES = $(Xwayland_built_sources)
CLEANFILES = $(Xwayland_built_sources) CLEANFILES = $(Xwayland_built_sources)
@ -78,6 +80,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 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 < $< > $@ $(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 %-protocol.c : %.xml
$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@

3
hw/xwayland/meson.build
View File

@ -17,6 +17,7 @@ protodir = protocols_dep.get_pkgconfig_variable('pkgdatadir')
pointer_xml = join_paths(protodir, 'unstable', 'pointer-constraints', 'pointer-constraints-unstable-v1.xml') pointer_xml = join_paths(protodir, 'unstable', 'pointer-constraints', 'pointer-constraints-unstable-v1.xml')
relative_xml = join_paths(protodir, 'unstable', 'relative-pointer', 'relative-pointer-unstable-v1.xml') relative_xml = join_paths(protodir, 'unstable', 'relative-pointer', 'relative-pointer-unstable-v1.xml')
tablet_xml = join_paths(protodir, 'unstable', 'tablet', 'tablet-unstable-v2.xml')
client_header = generator(scanner, client_header = generator(scanner,
output : '@BASENAME@-client-protocol.h', output : '@BASENAME@-client-protocol.h',
@ -28,8 +29,10 @@ code = generator(scanner,
) )
srcs += client_header.process(relative_xml) srcs += client_header.process(relative_xml)
srcs += client_header.process(pointer_xml) srcs += client_header.process(pointer_xml)
srcs += client_header.process(tablet_xml)
srcs += code.process(relative_xml) srcs += code.process(relative_xml)
srcs += code.process(pointer_xml) srcs += code.process(pointer_xml)
srcs += code.process(tablet_xml)
xwayland_glamor = [] xwayland_glamor = []
if gbm_dep.found() if gbm_dep.found()

1
hw/xwayland/xwayland-input.c
View File

@ -34,6 +34,7 @@
#include <inpututils.h> #include <inpututils.h>
#include <mipointer.h> #include <mipointer.h>
#include <mipointrst.h> #include <mipointrst.h>
#include "tablet-unstable-v2-client-protocol.h"
struct sync_pending { struct sync_pending {
struct xorg_list l; struct xorg_list l;

2
meson.build
View File

@ -100,7 +100,7 @@ if (host_machine.system() != 'darwin' and
xwayland_dep = [ xwayland_dep = [
dependency('wayland-client', version: '>= 1.3.0', required: xwayland_required), dependency('wayland-client', version: '>= 1.3.0', required: xwayland_required),
dependency('wayland-protocols', version: '>= 1.1.0', required: xwayland_required), dependency('wayland-protocols', version: '>= 1.5.0', required: xwayland_required),
dependency('libdrm', version: '>= 2.3.1', required: xwayland_required), dependency('libdrm', version: '>= 2.3.1', required: xwayland_required),
dependency('epoxy', required: xwayland_required), dependency('epoxy', required: xwayland_required),
] ]