[PATCH util/modular] jhbuildrc: Restore mesa-demos, mesa-glut, mesa-glu

[Jon TURNEY]

On 14/03/2014 20:03, Jon TURNEY wrote:
> As of 9167c5e7177a758fce55afe759fa48c47a4f7f4e we had mesa-demos, mesa-glut and
> mesa-glu modules.
> 
> 9167c5e7177a758fce55afe759fa48c47a4f7f4e "add missing modules and meta modules"
> (confusingly) removes them.
> 
> Restore mesa-demos, mesa-glut, mesa-glu so they get tinderboxed.

Sorry, that was completely the wrong patch.  Try the attached, instead.

-------------- next part --------------
>From da25db3c95a84ad3230bbf5ed7fffa698f5ef9c6 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Fri, 14 Mar 2014 22:53:53 +0000
Subject: [PATCH util/modular] jhbuildrc: Restore mesa-demos, mesa-glut,
 mesa-glu

As of 9167c5e7177a758fce55afe759fa48c47a4f7f4e we had mesa-demos, mesa-glut and
mesa-glu modules.

9167c5e7177a758fce55afe759fa48c47a4f7f4e "add missing modules and meta modules"
(confusingly) removes them.

Restore mesa-demos, mesa-glut, mesa-glu so they get tinderboxed.

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Cc: Gaetan Nadon <memsize at videotron.ca>
---
 xorg.modules | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/xorg.modules b/xorg.modules
index 46e67d4..06399e5 100644
--- a/xorg.modules
+++ b/xorg.modules
@@ -179,6 +179,9 @@
     <dependencies>
       <dep package="mesa-drm"/>
       <dep package="mesa-mesa"/>
+      <dep package="mesa-demos"/>
+      <dep package="mesa-glut"/>
+      <dep package="mesa-glu"/>
     </dependencies>
   </metamodule>
 
@@ -3383,6 +3386,33 @@
     </dependencies>
   </autotools>
 
+  <autotools id="mesa-demos">
+    <branch module="mesa/demos"
+            checkoutdir="mesa/demos"/>
+    <dependencies>
+      <dep package="mesa-mesa"/>
+      <dep package="mesa-glut"/>
+      <dep package="mesa-glu"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="mesa-glut" supports-non-srcdir-builds="no" check-target="false"
+             skip-autogen="never">
+    <branch module="mesa/glut"
+            checkoutdir="mesa/glut"/>
+    <dependencies>
+      <dep package="mesa-mesa"/>
+      <dep package="util-makedepend"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="mesa-glu">
+    <branch module="mesa/glu" checkoutdir="mesa/glu"/>
+    <dependencies>
+      <dep package="mesa-mesa"/>
+    </dependencies>
+  </autotools>
+
   <!-- X Build Utilities (util-macros) -->
   <autotools id="util-macros">
     <branch module="xorg/util/macros"
-- 
1.8.3.4