From f5546a175384de338edc23a248b19a23fb7d7017 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 23 Nov 2011 18:50:20 +0000 Subject: xserver-xorg: only use --disable-dga in xserver-xorg-lite Xorg VESA driver calls DGAInit enforcing this symbol to be available to the driver to work so we revert back to only disable DGA for lite flavor of Xorg. Signed-off-by: Otavio Salvador --- meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc | 2 +- meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc | 1 - meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc index 2c5bb0aa57..8b0808d8de 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc @@ -3,7 +3,7 @@ SRC_URI += "file://crosscompile.patch" # Misc build failure for master HEAD SRC_URI += "file://fix_open_max_preprocessor_error.patch" -PR = "r1" +PR = "r2" SRC_URI[md5sum] = "4cdf54dc569b6a5548257c93a45dcd3d" SRC_URI[sha256sum] = "c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc index 255939718e..c1a552ec72 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc @@ -100,7 +100,6 @@ EXTRA_OECONF += "--with-fop=no \ --disable-acfb \ --disable-ccfb \ --disable-mcfb \ - --disable-dga \ --disable-xinerama \ --disable-xf86misc \ --disable-xorgcfg \ diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc index be84e9e3f7..57615f5299 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc @@ -3,4 +3,5 @@ require xserver-xorg-common.inc EXTRA_OECONF += "\ --disable-dri \ --disable-glx \ + --disable-dga \ " -- cgit v1.2.3