From 2b3b60ee6afdca30f11db6f5136f093271d7e8d1 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 9 Jun 2012 11:52:20 +0200
Subject: [PATCH] xorg-server: make OPENGL support optional

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/xserver/xorg-server/build   |  9 +++++++--
 packages/x11/xserver/xorg-server/install | 11 ++++++++---
 packages/x11/xserver/xorg-server/meta    |  9 +++++++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index cf1bd2a774..3065a91938 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -38,6 +38,12 @@ else
   XORG_XINERAMA="--disable-xinerama"
 fi
 
+if [ "$OPENGL" = "Mesa" ]; then
+  XORG_MESA="--enable-glx --enable-dri"
+else
+  XORG_MESA="--disable-glx --disable-dri"
+fi
+
 # hack to prevent a build error
   CFLAGS=`echo $CFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"`
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"`
@@ -75,8 +81,7 @@ cd $PKG_BUILD
             --disable-screensaver \
             --disable-xdmcp \
             --disable-xdm-auth-1 \
-            --enable-glx \
-            --enable-dri \
+            $XORG_MESA \
             --enable-dri2 \
             --enable-xf86vidmode \
             --disable-xace \
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index dc53ecc1ef..db5d7c1354 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -48,11 +48,16 @@ mkdir -p $XORG_DST
 mkdir -p $XORG_DST/extensions
   cp -P $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions
   cp -P $XORG_SRC/dixmods/.libs/librecord.so $XORG_DST/extensions
-  cp -P $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions
   cp -P $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions
   cp -P $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions
-  cp -P $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers
-  ln -sf /var/lib/libglx.so $XORG_DST/extensions/libglx.so
+
+  if [ -f $XORG_SRC/dri/.libs/libdri.so ]; then
+    cp -P $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions
+  fi
+  if [ -f $XORG_SRC/dixmods/.libs/libglx.so ]; then
+    cp -P $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers
+    ln -sf /var/lib/libglx.so $XORG_DST/extensions/libglx.so
+  fi
 
 mkdir -p $XORG_DST/multimedia
   cp -P $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia
diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta
index 78e670a70b..3efc0c008c 100644
--- a/packages/x11/xserver/xorg-server/meta
+++ b/packages/x11/xserver/xorg-server/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libpciaccess libX11 libXfont libdrm Mesa openssl pixman systemd"
-PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa openssl freetype pixman fontsproto systemd"
+PKG_DEPENDS="libpciaccess libX11 libXfont libdrm openssl pixman systemd"
+PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm openssl freetype pixman fontsproto systemd"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/xserver"
 PKG_SHORTDESC="xorg-server: The Xorg X server"
@@ -46,6 +46,11 @@ if [ "$XINERAMA_SUPPORT" = "yes" ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXinerama"
 fi
 
+if [ "$OPENGL" = "Mesa" ]; then
+  PKG_DEPENDS="$PKG_DEPENDS Mesa"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS Mesa"
+fi
+
 # Additional packages we need for using xorg-server:
 # Fonts
   PKG_DEPENDS="$PKG_DEPENDS encodings font-xfree86-type1 font-bitstream-type1 font-misc-misc"