[PATCH] xorg.modules: Drop external glamor.

[Eric Anholt]

It's been replaced by in-server glamor for a while.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 build.sh     |  1 -
 xorg.modules | 17 -----------------
 2 files changed, 18 deletions(-)

diff --git a/build.sh b/build.sh
index 6eac65d..a87263a 100755
--- a/build.sh
+++ b/build.sh
@@ -1174,7 +1174,6 @@ build_all_modules() {
         Darwin)
 	    ;;
 	*)
-	    build driver glamor
 	    build driver xf86-input-keyboard
 	    build driver xf86-input-mouse
 	    build driver xf86-input-synaptics
diff --git a/xorg.modules b/xorg.modules
index c2f811f..2a5082d 100644
--- a/xorg.modules
+++ b/xorg.modules
@@ -253,7 +253,6 @@
   <!-- X Input and Video Drivers - Meta Module -->
   <metamodule id="The X Video Drivers">
     <dependencies>
-      <dep package="glamor"/>
       <dep package="xf86-video-apm"/>
       <dep package="xf86-video-ark"/>
       <dep package="xf86-video-ast"/>
@@ -2000,20 +1999,6 @@
   </autotools>
 
   <!-- X Video Drivers - Modules Definition -->
-  <autotools id="glamor">
-    <branch module="xorg/driver/glamor"
-            checkoutdir="xorg/driver/glamor"/>
-    <dependencies>
-      <dep package="util-macros"/>
-      <dep package="mesa-drm"/>
-      <dep package="xserver"/>
-    </dependencies>
-    <suggests>
-      <dep package="dri2proto"/>
-      <dep package="mesa-mesa"/>
-    </suggests>
-  </autotools>
-
   <autotools id="xf86-video-apm">
     <branch module="xorg/driver/xf86-video-apm"
             checkoutdir="xorg/driver/xf86-video-apm"/>
@@ -2081,7 +2066,6 @@
       <dep package="xserver"/>
     </dependencies>
     <suggests>
-      <dep package="glamor"/>
       <dep package="videoproto"/>
     </suggests>
   </autotools>
@@ -2247,7 +2231,6 @@
       <dep package="xserver"/>
     </dependencies>
     <suggests>
-      <dep package="glamor"/>
       <dep package="dri2proto"/>
       <dep package="xf86driproto"/>
       <dep package="libX11"/>
-- 
2.1.4