[oe-commits] Leon Woestenberg : xserver-xorg-1.7.3: Enable Xinerama for MACHINE ion, due to NVidia.

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 7fce34d3db504e36410479c2febfe4c3b32f8bb5
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7fce34d3db504e36410479c2febfe4c3b32f8bb5

Author: Leon Woestenberg <leon at sidebranch.com>
Date:   Sat Jan  2 01:59:04 2010 +0100

xserver-xorg-1.7.3: Enable Xinerama for MACHINE ion, due to NVidia.

The NVidia display driver requires Xinerama to be enabled. Ion
uses that driver.

Signed-off-by: Leon Woestenberg <leon at sidebranch.com>

---

 recipes/xorg-xserver/xserver-xorg_1.7.3.bb |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
index 95cedae..af01a90 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
 PE = "2"
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://sysroot_fix.patch;patch=1 \
             file://dolt-fix-1.7.0.patch;patch=1 \
@@ -17,7 +17,10 @@ do_install_prepend() {
         mkdir -p ${D}/${libdir}/X11/fonts
 }
 
-EXTRA_OECONF += "--disable-xephyr --disable-config-hal --disable-xinerama --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+# The NVidia driver requires Xinerama support in the X server. Ion uses it.
+XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
+
+EXTRA_OECONF += "--disable-xephyr --disable-config-hal ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
 EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests "
 
 export LDFLAGS += " -ldl "