[PATCH util/modular 5/7] xorg.modules: Add mesa metamodule

[Jon TURNEY]

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 xorg.modules |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/xorg.modules b/xorg.modules
index 824c719..ada28b1 100644
--- a/xorg.modules
+++ b/xorg.modules
@@ -42,16 +42,6 @@
     </dependencies>
   </autotools>
 
-  <!-- Need nouveau API to build xf86-video-nouveau -->
-  <autotools id="libdrm" autogenargs="--enable-nouveau-experimental-api">
-    <branch module="mesa/drm"
-            checkoutdir="mesa/drm"/>
-    <dependencies>
-      <dep package="macros"/>
-      <dep package="libpciaccess"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="pixman">
     <branch module="pixman"
             checkoutdir="xorg/lib/pixman"/>
@@ -64,6 +54,18 @@
     <dependencies/>
   </autotools>
 
+  <!-- mesa -->
+
+  <!-- Need nouveau API to build xf86-video-nouveau -->
+  <autotools id="libdrm" autogenargs="--enable-nouveau-experimental-api">
+    <branch module="mesa/drm"
+            checkoutdir="mesa/drm"/>
+    <dependencies>
+      <dep package="macros"/>
+      <dep package="libpciaccess"/>
+    </dependencies>
+  </autotools>
+
   <!-- the Mesa module, which provides libGL and DRI drivers -->
   <autotools id="libGL">
     <branch module="mesa/mesa"
@@ -109,6 +111,16 @@
     </dependencies>
   </autotools>
 
+  <metamodule id="mesa">
+    <dependencies>
+      <dep package="libdrm"/>
+      <dep package="libGL"/>
+      <dep package="mesa-demos"/>
+      <dep package="mesa-glut"/>
+      <dep package="mesa-glu"/>
+    </dependencies>
+  </metamodule>
+
   <!-- util -->
   <autotools id="macros">
     <branch module="xorg/util/macros"
-- 
1.7.9