xserver: Branch 'master'

[Adam Jackson]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 371ff0c969a38a0013688391bbd7375bc7b6f933
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Thu Feb 16 10:43:06 2017 +0100

    xwayland: bump wayland-protocols version to 1.7
    
    Xwayland support for pointer locking in confinement requires
    wayland-protocols version 1.7 or later.
    
    Update the required version in configure.ac to match the minimal
    required version of wayland-protocols.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/configure.ac b/configure.ac
index 4dcf8b5..e291b34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2475,7 +2475,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.7 $LIBDRM epoxy"
 if test "x$XF86VIDMODE" = xyes; then
 	XWAYLANDMODULES="$XWAYLANDMODULES $VIDMODEPROTO"
 fi