diff options
Diffstat (limited to 'recipes/xorg-xserver')
| -rw-r--r-- | 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 95cedae84a..af01a9024d 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 " |