[gnome-ostree] manifest: Add more full wayland support, build mutter/wayland

[Colin Walters <walters src gnome org>]

commit 9958eb705b83094e6ffcb5a4253eb667bb309c2a
Author: Colin Walters <walters verbum org>
Date:   Sat Aug 17 18:04:05 2013 -0400

    manifest: Add more full wayland support, build mutter/wayland

 manifest.json                  |   20 +++++++++++++++-----
 patches/xwayland-autogen.patch |   24 ++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 5d4af78..33d71f8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -289,6 +289,9 @@
                {"src": "fd-mesa:drm",
                 "config-opts": ["--enable-nouveau-experimental-api"]},
 
+               {"src": "fd-wayland:wayland",
+                "config-opts": ["--disable-documentation"]},
+
                {"src": "fd-mesa:mesa",
                 "tag": "mesa-9.0.1", 
                 "patches": ["mesa-llvmpipe-dlopen.patch",
@@ -305,7 +308,7 @@
                     "--enable-gles1", 
                     "--enable-gles2", 
                     "--disable-gallium-egl", 
-                    "--with-egl-platforms=x11,drm",
+                    "--with-egl-platforms=wayland,x11,drm",
                     "--enable-shared-glapi",
                     "--enable-gbm",
                     "--enable-xa",
@@ -341,8 +344,10 @@
 
                 {"src": "git:git://github.com/xkbcommon/libxkbcommon"},
 
-               {"src": "fd-wayland:wayland",
-                "config-opts": ["--disable-documentation"]},
+               {"src": "fd:xorg/xserver",
+                "name": "xwayland",
+                "branch": "xwayland-1.12",
+                "patches": ["xwayland-autogen.patch"]},
 
                 {"src": "git:git://git.xiph.org/celt.git"},
 
@@ -545,10 +550,14 @@
                 "config-opts": ["--disable-gtk-theme"]},
 
                {"src": "gnome:cogl",
+                "config-opts": ["--enable-wayland-egl-platform",
+                                "--enable-wayland-egl-server"],
                 "branch": "cogl-1.16"},
 
                {"src": "gnome:clutter",
-                "config-opts": ["--enable-installed-tests"],
+                "config-opts": ["--enable-installed-tests",
+                                "--enable-wayland-backend",
+                                "--enable-wayland-compositor"],
                 "branch": "clutter-1.16"},
 
                {"src": "gnome:libnotify"},
@@ -731,7 +740,8 @@
                {"src": "gnome:mutter",
                 "name": "mutter-wayland",
                 "branch": "wayland",
-                "config-opts": ["--enable-compile-warnings=maximum"]},
+                "config-opts": ["--enable-compile-warnings=maximum",
+                                "--enable-wayland"]},
 
                {"src": "gnome:gjs",
                 "config-opts": ["--enable-installed-tests"]},
diff --git a/patches/xwayland-autogen.patch b/patches/xwayland-autogen.patch
new file mode 100644
index 0000000..94021eb
--- /dev/null
+++ b/patches/xwayland-autogen.patch
@@ -0,0 +1,24 @@
+From 520733c4a2610dea109f846ecccbaf2b4957b8f7 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sat, 17 Aug 2013 17:19:35 -0400
+Subject: [PATCH] autogen.sh: Honor NOCONFIGURE=1
+
+---
+ autogen.sh |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 4e8b11b..dbcce6d 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -9,4 +9,6 @@ cd $srcdir
+ autoreconf --force -v --install || exit 1
+ cd $ORIGDIR || exit $?
+ 
+-$srcdir/configure --enable-maintainer-mode "$@"
++if test -z "$NOCONFIGURE"; then
++    exec $srcdir/configure --enable-maintainer-mode "$@"
++fi
+-- 
+1.7.1
+