From 189f053d044cf1f4615324bfb90d15f24ce2fe9d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 14 Apr 2013 18:56:10 +0200 Subject: [PATCH] xorg-server: forgot to merge pkg options. --- srcpkgs/xorg-server/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index cea6e1554f1..0df5dd8bddb 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -33,6 +33,22 @@ if [ "$CROSS_BUILD" ]; then makedepends+=" libfl-devel" fi +# Package build options +build_options="opengl" +desc_option_opengl="Enable support for OpenGL/GLX and DRI" + +# Enable gl by default on x86. +if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then + build_options_default="opengl" +fi + +if [ "$build_option_opengl" ]; then + configure_args+=" --enable-dri --enable-dri2 --enable-glx-tls --enable-glx" + makedepends+=" MesaLib-devel" +else + configure_args+=" --disable-dri --disable-dri2 --disable-glx" +fi + post_install() { vinstall ${FILESDIR}/11-quirks.conf 644 etc/X11/xorg.conf.d vinstall COPYING 644 usr/share/licenses/${pkgname}