From patchwork Tue Nov 29 08:26:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 10/23] xserver-xorg: only use --disable-dga in xserver-xorg-lite Date: Tue, 29 Nov 2011 08:26:41 -0000 From: Saul Wold X-Patchwork-Id: 15543 Message-Id: To: openembedded-core@openembedded.org From: Otavio Salvador 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 --- .../xorg-xserver/xserver-xorg-1.11.1.inc | 2 +- .../xorg-xserver/xserver-xorg-common.inc | 1 - .../xorg-xserver/xserver-xorg-lite.inc | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) 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 2c5bb0a..8b0808d 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 2559397..c1a552e 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 be84e9e..57615f5 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 \ "