[jhbuild] Update wayland module set

[Colin Walters <walters src gnome org>]

commit 1f378e616e0846b4f1262c48d32381796f498f46
Author: Darxus <darxus chaosreigns com>
Date:   Thu Oct 25 22:47:44 2012 -0400

    Update wayland module set
    
    Update to weston repo's current name, instead of no-longer existing
    "wayland-demos".  Update some build flags.  Add gtk - although not
    verified due to bug 686904.

 examples/wayland.jhbuildrc       |   13 +-------
 modulesets/other/wayland.modules |   63 ++++++++++++++++++++++++++++++++++---
 2 files changed, 58 insertions(+), 18 deletions(-)
---
diff --git a/examples/wayland.jhbuildrc b/examples/wayland.jhbuildrc
index 0698d7f..59f951b 100644
--- a/examples/wayland.jhbuildrc
+++ b/examples/wayland.jhbuildrc
@@ -1,19 +1,8 @@
 # -*- mode: python -*-
 moduleset = 'other/wayland'
-modules = ['wayland-demos']
+modules = ['weston']
 checkoutroot = '~/checkout/wayland'
 prefix = '~/wayland'
 autogenargs=''
-makeargs = '-j2'
 
 os.environ['EGL_PLATFORM'] = 'wayland'
-
-module_autogenargs['drm'] = '--enable-nouveau-experimental-api'
-module_autogenargs['wayland'] = '--with-egl-platforms=wayland,drm,x11'
-module_autogenargs['cairo'] ='--enable-gl --enable-xcb --enable-egl'
-
-#The options here very much depend on the graphics card
-module_autogenargs['mesa'] = '--enable-gles2 ' \
-                             '--disable-gallium-egl '\
-                             '--with-dri-drivers=i915 '\
-                             '--with-egl-platforms=wayland,drm,x11'
diff --git a/modulesets/other/wayland.modules b/modulesets/other/wayland.modules
index afcead1..35aac3d 100644
--- a/modulesets/other/wayland.modules
+++ b/modulesets/other/wayland.modules
@@ -17,24 +17,27 @@
       href="git://anongit.freedesktop.org/git/xorg/lib"/>
   <repository type="git" name="xorg-doc" default="yes"
       href="git://anongit.freedesktop.org/git/xorg/doc"/>
+  <repository type="git" name="gnome" default="yes"
+      href="git://git.gnome.org"/>
 
   <autotools id="pixman">
     <branch repo="freedesktop"/>
   </autotools>
   
-  <autotools id="cairo">
+  <autotools id="cairo" autogenargs="--enable-gl --enable-xcb --enable-egl">
     <branch repo="freedesktop"/>
     <dependencies>
       <dep package="pixman"/>
       <dep package="mesa"/>
+      <dep package="glib"/>
     </dependencies>
   </autotools>
 
-  <autotools id="drm">
+  <autotools id="drm" autogenargs="--enable-nouveau-experimental-api">
     <branch repo="mesa"/>
   </autotools>
   
-  <autotools id="mesa"  skip-autogen="never">
+  <autotools id="mesa" skip-autogen="never" autogenargs="--enable-gles2 --disable-gallium-egl --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=r300,r600,swrast,nouveau">
     <branch repo="mesa"/>
     <dependencies>
       <dep package="drm"/>
@@ -43,11 +46,11 @@
     </dependencies>
   </autotools>
   
-  <autotools id="wayland">
+  <autotools id="wayland" autogenargs="--with-egl-platforms=wayland,drm,x11">
     <branch repo="wayland"/>
   </autotools>
 
-  <autotools id="wayland-demos">
+  <autotools id="weston" autogenargs="--disable-setuid-install">
     <branch repo="wayland"/>
     <dependencies>
       <dep package="wayland"/>
@@ -91,7 +94,7 @@
     <branch repo="xorg-lib"/>
   </autotools>
 
-  <autotools id="libxkbcommon" >
+  <autotools id="libxkbcommon" autogenargs="--with-xkb-config-root=/usr/share/X11/xkb">
     <branch repo="xorg-lib"/>
     <dependencies>
       <dep package="macros"/>
@@ -100,4 +103,52 @@
       <dep package="libX11"/>    
     </dependencies>
   </autotools>
+
+
+  <autotools id="glib">
+    <branch repo="gnome"/>
+  </autotools>
+  
+  <autotools id="gobject-introspection">
+    <branch repo="gnome"/>
+    <dependencies>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+  
+  <autotools id="atk">
+    <branch repo="gnome"/>
+  </autotools>
+
+  <autotools id="harfbuzz">
+    <branch repo="freedesktop"/>
+  </autotools>
+  
+  <autotools id="pango">
+    <branch repo="gnome"/>
+    <dependencies>
+      <dep package="harfbuzz"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gdk-pixbuf" autogenargs="--without-libtiff">
+    <branch repo="gnome"/>
+  </autotools>
+  
+  <autotools id="at-spi2-atk">
+    <branch repo="gnome"/>
+  </autotools>
+  
+  <autotools id="gtk+" autogenargs="--enable-wayland-backend --enable-x11-backend">
+    <branch repo="gnome"/>
+    <dependencies>
+      <dep package="wayland"/>
+      <dep package="gobject-introspection"/>
+      <dep package="atk"/>
+      <dep package="pango"/>
+      <dep package="at-spi2-atk"/>
+      <dep package="gdk-pixbuf"/>
+      <dep package="libxkbcommon"/>
+    </dependencies>
+  </autotools>
 </moduleset>