From 3d5434a1ed49edf1bdc81f8cf6a3111bff5c5f7b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@mobile.openelec.tv>
Date: Wed, 23 Sep 2009 06:44:54 +0200
Subject: [PATCH] xorg-server: - build and install xinerama support only if
 needed

---
 packages/x11/xserver/xorg-server/build   | 10 ++++++++--
 packages/x11/xserver/xorg-server/install |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index a3173e62d9..bfd1d18d01 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -22,7 +22,6 @@ $SCRIPTS/build libXfont
 $SCRIPTS/build libxkbfile
 $SCRIPTS/build libXv
 $SCRIPTS/build libXvMC
-$SCRIPTS/build libXinerama
 $SCRIPTS/build $LIBDRM
 $SCRIPTS/build $MESA
 $SCRIPTS/build openssl
@@ -34,6 +33,13 @@ $SCRIPTS/build xf86bigfontproto
 $SCRIPTS/build dbus
 $SCRIPTS/build hal
 
+if [ $XINERAMA = yes ]; then
+  $SCRIPTS/build libXinerama
+  XORG_CONFIG="$XORG_CONFIG --enable-xinerama"
+else
+  XORG_CONFIG="$XORG_CONFIG --disable-xinerama"
+fi
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -67,7 +73,6 @@ cd $PKG_BUILD
             --enable-glx \
             --enable-dri \
             --enable-dri2 \
-            --enable-xinerama \
             --enable-xf86vidmode \
             --enable-xace \
             --disable-xcsecurity \
@@ -105,6 +110,7 @@ cd $PKG_BUILD
             --with-dri-driver-path=$XORG_PATH_DRI \
             --with-fontdir=$XORG_PATH_FONTS \
             --with-default-font-path="$XORG_PATH_FONTS/liberation,$XORG_PATH_FONTS/misc" \
+            $XORG_CONFIG \
 
 make
 
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index d6ce9993a6..8e326f9a48 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -6,7 +6,6 @@ $SCRIPTS/install libpciaccess
 $SCRIPTS/install freetype
 $SCRIPTS/install libX11
 $SCRIPTS/install libXfont
-$SCRIPTS/install libXinerama
 $SCRIPTS/install libXv
 $SCRIPTS/install $LIBDRM
 $SCRIPTS/install $MESA
@@ -14,6 +13,10 @@ $SCRIPTS/install pixman
 $SCRIPTS/install dbus
 $SCRIPTS/install hal
 
+if [ $XINERAMA = yes ]; then
+  $SCRIPTS/install libXinerama
+fi
+
 XORG_SRC="$PKG_BUILD/hw/xfree86"
 XORG_DST="$INSTALL/$XORG_PATH_MODULES"