xorg-server: added dri and dri2 options; enable dri on x86 and dri2 in all platforms.

srcpkgs/xorg-server/template

@@ -1,7 +1,7 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
 version=1.14.5
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
  --enable-xnest --enable-xephyr --enable-composite --enable-xvfb
@@ -32,19 +32,44 @@ depends="xkeyboard-config"
 provides="xserver-abi-extension-7_1 xserver-abi-input-19_1 xserver-abi-video-14_1"
 
 # Package build options
-build_options="opengl"
+build_options="dri dri2 opengl"
+desc_option_dri="Enable support for the DRI extension"
+desc_option_dri2="Enable support for the DRI2 extension"
 desc_option_opengl="Enable support for OpenGL/GLX and DRI"
 
-# Enable gl by default on x86.
+# enable dri2 for all platforms via libdri2.
+build_options_default="dri2"
+
 if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	build_options_default="opengl"
+	# Enable dri/opengl by default on x86.
+	build_options_default+=" dri opengl"
+fi
+
+if [ "$build_option_dri" ]; then
+	configure_args+=" --enable-dri"
+	case "$XBPS_TARGET_MACHINE" in
+		i686*|x86_64*) makedepends+=" MesaLib-devel>=10.0";;
+		*) makedepends+=" dri2proto libdri2-devel-git";;
+	esac
+else
+	configure_args+=" --disable-dri2"
+fi
+
+if [ "$build_option_dri2" ]; then
+	configure_args+=" --enable-dri2"
+	case "$XBPS_TARGET_MACHINE" in
+		i686*|x86_64*) makedepends+=" MesaLib-devel>=10.0";;
+		*) makedepends+=" dri2proto libdri2-devel-git";;
+	esac
+else
+	configure_args+=" --disable-dri2"
 fi
 
 if [ "$build_option_opengl" ]; then
-	configure_args+=" --enable-dri --enable-dri2 --enable-glx-tls --enable-glx"
+	configure_args+=" --enable-glx-tls --enable-glx"
 	makedepends+=" MesaLib-devel>=10.0"
 else
-	configure_args+=" --disable-dri --disable-dri2 --disable-glx"
+	configure_args+=" --disable-glx"
 fi
 
 post_install() {