[jhbuild] 3.12: Use xwayland DDX

[Jasper St. Pierre <jstpierre src gnome org>]

commit 83d12b5fc08725a7f71dcaab07c0caf42100a827
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Apr 3 20:30:54 2014 -0400

    3.12: Use xwayland DDX

 modulesets/gnome-suites-core-deps-3.12.modules |   23 ++++++++---------------
 1 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index 8c4f37e..c326e8e 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -1211,27 +1211,20 @@
     </dependencies>
   </autotools>
 
-  <autotools id="xwayland" autogenargs="--with-xkb-bin-directory=/usr/bin --with-xkb-path=/usr/share/X11/xkb 
--with-xkb-output=${prefix}/share/X11/xkb/compiled">
-    <branch repo="xorg.freedesktop.org" checkoutdir="xwayland" module="xserver" revision="xwayland"/>
+  <autotools id="libepoxy">
+    <branch repo="github.com" checkoutdir="libepoxy" module="anholt/libepoxy.git"/>
     <dependencies>
-      <dep package="xfont"/>
       <dep package="xtrans"/>
-      <dep package="wayland"/>
     </dependencies>
   </autotools>
 
-  <autotools id="xf86-video-intel">
-    <branch repo="xorg.freedesktop.org" checkoutdir="xf86-video-intel" module="driver/xf86-video-intel" 
revision="xwayland"/>
+  <autotools id="xwayland" autogenargs="--with-xkb-bin-directory=/usr/bin --with-xkb-path=/usr/share/X11/xkb 
--with-xkb-output=${prefix}/share/X11/xkb/compiled --enable-xwayland">
+    <branch repo="xorg.freedesktop.org" checkoutdir="xwayland" module="xserver"/>
     <dependencies>
-      <dep package="xwayland"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="xf86-video-wayland">
-    <branch repo="xorg.freedesktop.org"
-            module="driver/xf86-video-wayland"/>
-    <dependencies>
-      <dep package="xwayland"/>
+      <dep package="xfont"/>
+      <dep package="xtrans"/>
+      <dep package="wayland"/>
+      <dep package="libepoxy"/>
     </dependencies>
   </autotools>