From 5a852181318e0254c8a9d86706db93d4dd25da73 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Thu, 11 Mar 2010 01:28:04 +0100
Subject: [PATCH] xorg-server: - build with xinerama support only if requested

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

diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index 0f6dab84ef..8a7d8249e1 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -19,7 +19,6 @@ $SCRIPTS/build libX11
 $SCRIPTS/build libXfont
 $SCRIPTS/build libxkbfile
 $SCRIPTS/build libXv
-$SCRIPTS/build libXinerama
 $SCRIPTS/build $LIBDRM
 $SCRIPTS/build $MESA
 $SCRIPTS/build openssl
@@ -30,6 +29,13 @@ $SCRIPTS/build fontsproto
 $SCRIPTS/build xf86bigfontproto
 $SCRIPTS/build udev
 
+if test "$XINERAMA_SUPPORT" = "yes" ; then
+  $SCRIPTS/build libXinerama
+  XORG_XINERAMA="--enable-xinerama"
+else
+  XORG_XINERAMA="--disable-xinerama"
+fi
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -50,7 +56,7 @@ cd $PKG_BUILD
             --enable-glx-tls \
             --enable-registry \
             --disable-composite \
-            --enable-xinerama \
+            $XORG_XINERAMA \
             --enable-mitshm \
             --disable-xres \
             --disable-record \
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index d51ab4067d..a781274106 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -8,12 +8,13 @@ $SCRIPTS/install openssl
 $SCRIPTS/install libX11
 $SCRIPTS/install libXfont
 $SCRIPTS/install libXv
-$SCRIPTS/install libXinerama
 $SCRIPTS/install $LIBDRM
 $SCRIPTS/install $MESA
 $SCRIPTS/install pixman
 $SCRIPTS/install udev
 
+[ "$XINERAMA_SUPPORT" = "yes" ] && $SCRIPTS/install libXinerama
+
 XORG_SRC="$PKG_BUILD/hw/xfree86"
 XORG_DST="$INSTALL/$XORG_PATH_MODULES"
 PKG_DIR=`find $PACKAGES -type d -name $1`