summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2014-03-14 22:53:53 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2014-03-14 22:53:53 +0000
commit938433f6a215e5d250c97e32ea7d3e9cb05e1ed6 (patch)
tree72ec00a739fc3ef1cc11f8de87b48ebdc22a2cde
parent14c5d18ef4566d16ef2d22122aafbd188dc78a91 (diff)
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@dronecode.org.uk> Cc: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--xorg.modules30
1 files changed, 30 insertions, 0 deletions
diff --git a/xorg.modules b/xorg.modules
index 46e67d4..aa03fbe 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="libGL"/>
+ <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="libGL"/>
+ <dep package="makedepend"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="mesa-glu">
+ <branch module="mesa/glu" checkoutdir="mesa/glu"/>
+ <dependencies>
+ <dep package="libGL"/>
+ </dependencies>
+ </autotools>
+
<!-- X Build Utilities (util-macros) -->
<autotools id="util-macros">
<branch module="xorg/util/macros"