From ca0b585c578f0c172d3cbef4a640e62412732d1e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 18 Jul 2014 13:06:42 +0200
Subject: [PATCH] xorg-server: enable glamor on x86; replace glamor.

---
 srcpkgs/xorg-server/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 53a89e8306..d0642b26f1 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
 version=1.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
  --enable-xnest --enable-xephyr --enable-composite --enable-xvfb
@@ -50,9 +50,10 @@ else
 fi
 
 if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	# Enable dri/opengl by default on x86.
-	configure_args+=" --enable-dri2 --enable-dri3 --enable-glx-tls --enable-glx"
+	# Enable glamor/dri/opengl by default on x86.
+	configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx-tls --enable-glx"
 	makedepends+=" MesaLib-devel>=10"
+	replaces="glamor>=0"
 else
 	# Enable dri2 on !x86 via libdri.
 	configure_args+=" --disable-glx --disable-dri --enable-dri2 --enable-dri3"