xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 7d7788e0f2fbbf5d05cb918df11a5e1b7e047e48
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Fri Feb 17 09:16:24 2017 +0100

    Revert "xwayland: bump wayland-protocols version to 1.7"
    
    This reverts commit 371ff0c969a38a0013688391bbd7375bc7b6f933.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>

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