[gnome-continuous] manifest: revert switch to latest xserver

[Vadim Rutkovsky <vrutkovsky src gnome org>]

commit cce8c0c066a65376efa6737de5e68fb27c9ea535
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Mon Apr 7 10:35:27 2014 +0200

    manifest: revert switch to latest xserver

 manifest.json |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 6da0bc6..1f70726 100644
--- a/manifest.json
+++ b/manifest.json
@@ -34,8 +34,7 @@
                 "savannah": "git:git://git.savannah.gnu.org/",
                 "debian": "git:git://anonscm.debian.org/",
                "netfilter": "git:git://git.netfilter.org/",
-               "cgwalters": "git:git://github.com/cgwalters/",
-                "anholt": "git:git://github.com/anholt/"},
+               "cgwalters": "git:git://github.com/cgwalters/"},
 
   "patches": {"src": "gnome:gnome-continuous",
               "subdir": "patches"},
@@ -272,9 +271,6 @@
 
                {"src": "fd:xorg/lib/libFS"},
 
-               {"src": "fd:xorg/lib/libxshmfence",
-                "patches": ["xorg-autogen-merged.patch"]},
-
                {"src": "fd-dbus:dbus",
                 "config-opts": ["--with-dbus-user=dbus",
                                 "--enable-inotify",
@@ -344,10 +340,8 @@
                                 "--with-xkb-base=/usr/share/X11/xkb"],
                 "patches": ["xkeyboard-config-autogen.patch"]},
 
-               {"src": "anholt:libepoxy"},
-
                {"src": "fd:xorg/xserver",
-                 "config-opts": ["--enable-xwayland"]},
+                "branch": "xwayland"},
 
                {"src": "fd:xcb/util"},
 
@@ -361,6 +355,9 @@
 
                {"src": "fd:xorg/driver/xf86-video-modesetting"},
 
+               {"src": "fd:xorg/driver/xf86-video-wayland",
+                "patches": ["xorg-autogen-merged.patch"]},
+
                 {"src": "git:git://github.com/xkbcommon/libxkbcommon",
                 "config-opts": ["--disable-x11"]},