summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2013-02-21 18:43:19 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2013-03-05 13:11:25 +0000
commit9167c5e7177a758fce55afe759fa48c47a4f7f4e (patch)
tree8e9327b9e2744abef5f01014fb30b722f6daffca
parent6a3946ca63b2c977445c2d16ba1567841b35a757 (diff)
xorg.modules: Add mesa metamodule
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
-rw-r--r--xorg.modules32
1 files changed, 22 insertions, 10 deletions
diff --git a/xorg.modules b/xorg.modules
index f5385db..d9f8485 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"