diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-07 18:43:30 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-11 18:08:34 +0100 |
commit | 4d0fbb1ff023e00a14494f7ec9b2970838b64037 (patch) | |
tree | 50ecfa79f3c13bd10481f37dfc9666e25c339b99 /meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |
parent | 8c4b9ae0bdfac38b5da59dbc47c9d7864be56573 (diff) | |
download | poky-4d0fbb1ff023e00a14494f7ec9b2970838b64037.tar.gz |
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>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 22 |
1 files changed, 4 insertions, 18 deletions
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" | |||
5 | 5 | ||
6 | require ../mesa/glx-use-tls.inc | 6 | require ../mesa/glx-use-tls.inc |
7 | 7 | ||
8 | EXTRA_OECONF += "--disable-static \ | 8 | EXTRA_OECONF += "\ |
9 | --disable-acfb \ | 9 | --enable-dri \ |
10 | --disable-ccfb \ | 10 | --enable-dri2 \ |
11 | --disable-mcfb \ | ||
12 | --disable-dga \ | ||
13 | --disable-xinerama \ | ||
14 | --disable-xf86misc \ | ||
15 | --disable-xorgcfg \ | ||
16 | --disable-record \ | ||
17 | --disable-dmx \ | ||
18 | --disable-xnest \ | ||
19 | --disable-xvfb \ | ||
20 | --enable-composite \ | ||
21 | --sysconfdir=/etc/X11 \ | ||
22 | --localstatedir=/var \ | ||
23 | --with-pic \ | 11 | --with-pic \ |
24 | --with-int10=x86emu \ | 12 | --with-int10=x86emu \ |
25 | --with-fontdir=${datadir}/fonts/X11 \ | 13 | " |
26 | --with-xkb-output=/var/lib/xkb \ | ||
27 | ac_cv_file__usr_share_sgml_X11_defs_ent=no" | ||
28 | 14 | ||
29 | # Due to mesa-dri | 15 | # Due to mesa-dri |
30 | COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' | 16 | COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' |