summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2014-03-14 21:49:33 +0000
committerJon TURNEY <jon.turney@dronecode.org.uk>2014-03-14 21:56:14 +0000
commitef58899ccf14471b332bf0046a90713936839d1a (patch)
treea464a1d556776dbc10b259aa3e32af9af0756b1b
parent9981a5881332daae8b12dff303b449d9c57725d7 (diff)
Remove unneeded cairo, xcb-test and libGL-indirect-only modules
-rwxr-xr-xxorg.modules43
1 files changed, 1 insertions, 42 deletions
diff --git a/xorg.modules b/xorg.modules
index 3ac0814..bdf641f 100755
--- a/xorg.modules
+++ b/xorg.modules
@@ -9,7 +9,6 @@
<repository type="git" name="jturney" href="git://people.freedesktop.org/~jturney/"/>
<repository type="git" name="git.freedesktop.org" href="git://anongit.freedesktop.org/git/"/>
<repository type="git" name="sourceforge" href="git://git.code.sf.net/p/"/>
- <repository type="git" name="cairo" href="git://anongit.freedesktop.org/git/cairo"/>
<testmodule id="startup-test" type="script">
<branch repo="jturney" module="tests/startup-test" checkoutdir="tests/startup"/>
@@ -28,7 +27,7 @@
<autotools id="glean" supports-non-srcdir-builds="no" skip-autogen="true">
<branch repo="sourceforge" module="glean/code" checkoutdir="glean"/>
- <dependencies>
+ <dependencies>
<dep package="libGL"/>
<dep package="mesa-glut"/>
</dependencies>
@@ -38,52 +37,12 @@
<branch repo="sourceforge" module="glew/code" checkoutdir="glew"/>
</autotools>
- <autotools id="xcb-test">
- <branch repo="jturney" module="xcb-test" checkoutdir="tests/xcb-test"/>
- <dependencies>
- <dep package="xcb"/>
- </dependencies>
- </autotools>
-
- <autotools id="cairo">
- <branch repo="cairo" module="cairo" checkoutdir="cario"/>
- </autotools>
-
<cmake id="piglit" cmakeargs="-DOPENGL_gl_LIBRARY=/usr/lib/libGL.dll.a -DOPENGL_glu_LIBRARY=/usr/lib/libGLU.dll.a">
<!-- we need to provide paths to libGL, libGLU, otherwise cmake decides to use the w32api ones -->
<!-- really this should point to the libs we have built, but we don't have libdir here -->
<branch repo="git.freedesktop.org" module="piglit" checkoutdir="piglit"/>
</cmake>
- <autotools id="libGL-indirect-only" supports-non-srcdir-builds="no" check-target="false" skip-autogen="never">
- <branch repo="git.freedesktop.org" module="mesa/mesa" checkoutdir="mesa/mesa-indirect-only"/>
- <dependencies>
- <dep package="glproto"/>
- <dep package="libXdamage"/>
- <dep package="libX11"/>
- <dep package="libXext"/>
- <dep package="libXi"/>
- <dep package="libXmu"/>
- </dependencies>
- </autotools>
-
-
- <autotools id="libGL-indirect-only">
- <branch repo="git.freedesktop.org" module="mesa/mesa" checkoutdir="mesa/mesa-indirect-only"/>
- <dependencies>
- <dep package="xf86driproto"/>
- <dep package="dri2proto"/>
- <dep package="glproto"/>
- <dep package="libXxf86vm"/>
- <dep package="libXdamage"/>
- <dep package="libdrm"/>
- <dep package="libX11"/>
- <dep package="libXext"/>
- <dep package="libXi"/>
- <dep package="libXmu"/>
- </dependencies>
- </autotools>
-
<metamodule id="xwin">
<dependencies>
<dep package="libWindowsWM"/>