From 4d0fbb1ff023e00a14494f7ec9b2970838b64037 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 7 Oct 2011 18:43:30 +0200
Subject: xserver-xorg: move shared EXTRA_OECONF entries to shared .inc

* after this xserver-xorg-lite.inc is disabling only dri/glx
  and xserver-xorg.inc is forcing dri/dri2 enabled
  the rest is defined in xserver-xorg-common.inc

(From OE-Core rev: eb381e05ff24ee2fed0b4e9675bd01dce662da07)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../xorg-xserver/xserver-xorg-common.inc           | 21 ++++++++++++++++++++-
 .../xorg-xserver/xserver-xorg-lite.inc             | 20 ++------------------
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 22 ++++------------------
 3 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 77c37613b5..0cc3dc0df2 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -94,7 +94,26 @@ FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
 FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
 FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
 
-EXTRA_OECONF = "--with-fop=no"
+EXTRA_OECONF += "--with-fop=no \
+                 --disable-static \
+                 --disable-acfb \
+                 --disable-ccfb \
+                 --disable-mcfb \
+                 --disable-dga \
+                 --disable-xinerama \
+                 --disable-xf86misc \
+                 --disable-xorgcfg \
+                 --disable-record \
+                 --disable-dmx \
+                 --disable-xnest \
+                 --disable-xvfb \
+                 --enable-composite \
+                 --sysconfdir=/etc/X11 \
+                 --localstatedir=/var \
+                 --with-fontdir=${datadir}/fonts/X11 \
+                 --with-xkb-output=/var/lib/xkb \
+                 ac_cv_file__usr_share_sgml_X11_defs_ent=no \
+"
 
 PACKAGECONFIG ??= "udev"
 PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index b82d1532b0..be84e9e3f7 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,22 +1,6 @@
 require xserver-xorg-common.inc
 
-EXTRA_OECONF += "--disable-static \
-                 --disable-acfb \
-                 --disable-ccfb \
-                 --disable-mcfb \
-                 --disable-dga \
-                 --disable-xinerama \
-                 --disable-xf86misc \
-                 --disable-xorgcfg \
-                 --disable-record \
-                 --disable-dmx \
-                 --disable-xnest \
-                 --disable-xvfb \
-                 --enable-composite \
+EXTRA_OECONF += "\
                  --disable-dri \
                  --disable-glx \
-                 --sysconfdir=/etc/X11 \
-                 --localstatedir=/var \
-                 --with-fontdir=${datadir}/fonts/X11 \
-                 --with-xkb-output=/var/lib/xkb \
-                 ac_cv_file__usr_share_sgml_X11_defs_ent=no"
+"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 726fbaa35e..f7348738ea 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -5,26 +5,12 @@ LIB_DEPS += "virtual/libgl"
 
 require ../mesa/glx-use-tls.inc
 
-EXTRA_OECONF += "--disable-static \
-                 --disable-acfb \
-                 --disable-ccfb \
-                 --disable-mcfb \
-                 --disable-dga \
-                 --disable-xinerama \
-                 --disable-xf86misc \
-                 --disable-xorgcfg \
-                 --disable-record \
-                 --disable-dmx \
-                 --disable-xnest \
-                 --disable-xvfb \
-                 --enable-composite \
-                 --sysconfdir=/etc/X11 \
-                 --localstatedir=/var \
+EXTRA_OECONF += "\
+                 --enable-dri \
+                 --enable-dri2 \
                  --with-pic \
                  --with-int10=x86emu \
-                 --with-fontdir=${datadir}/fonts/X11 \
-                 --with-xkb-output=/var/lib/xkb \
-                 ac_cv_file__usr_share_sgml_X11_defs_ent=no"
+"
 
 # Due to mesa-dri
 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
-- 
cgit v1.2.3-54-g00ecf