[jhbuild] Removed autogenargs from the moduleset and included a sample jhbuildrc



commit abf246bccd12df5cf3317c127cdaf29e6de31752
Author: Alberto Ruiz <aruiz gnome org>
Date:   Fri Apr 15 17:25:49 2011 +0100

    Removed autogenargs from the moduleset and included a sample jhbuildrc

 examples/wayland.jhbuildrc       |   19 +++++++++++++++++++
 modulesets/other/wayland.modules |   13 ++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
---
diff --git a/examples/wayland.jhbuildrc b/examples/wayland.jhbuildrc
new file mode 100644
index 0000000..3ce2a15
--- /dev/null
+++ b/examples/wayland.jhbuildrc
@@ -0,0 +1,19 @@
+# -*- mode: python -*-
+moduleset = 'other/wayland'
+modules = ['wayland-demos']
+checkoutroot = os.path.expanduser('~/checkout/wayland')
+prefix = os.path.expanduser('~/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 57b3ac2..9386ea8 100644
--- a/modulesets/other/wayland.modules
+++ b/modulesets/other/wayland.modules
@@ -17,11 +17,12 @@
       href="git://anongit.freedesktop.org/git/xorg/lib"/>
   <repository type="git" name="xorg-doc" default="yes"
       href="git://anongit.freedesktop.org/git/xorg/doc"/>
+
   <autotools id="pixman">
     <branch repo="freedesktop"/>
   </autotools>
   
-  <autotools id="cairo" autogenargs="--enable-gl --enable-xcb --enable-egl">
+  <autotools id="cairo">
     <branch repo="freedesktop"/>
     <dependencies>
       <dep package="pixman"/>
@@ -29,11 +30,11 @@
     </dependencies>
   </autotools>
 
-  <autotools id="drm" autogenargs="--enable-nouveau-experimental-api ">
+  <autotools id="drm">
     <branch repo="mesa"/>
   </autotools>
   
-  <autotools id="mesa" autogenargs="--enable-gles2 --disable-gallium-egl --enable-gallium-nouveau --enable-gallium-r600 --with-egl-platforms=x11,wayland,drm">
+  <autotools id="mesa">
     <branch repo="mesa"/>
     <dependencies>
       <dep package="drm"/>
@@ -41,9 +42,11 @@
     </dependencies>
   </autotools>
   
-  <autotools id="wayland" autogenargs="--with-egl-platforms=wayland,drm ">
+  <autotools id="wayland">
     <branch repo="wayland"/>
-    <!-- just depends on ffi -->
+    <dependencies>
+      <dep package="gdk-pixbuf"/>
+    </dependencies>
   </autotools>
 
   <autotools id="wayland-demos">



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]