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 17:04:31 +0100 |
| commit | eb381e05ff24ee2fed0b4e9675bd01dce662da07 (patch) | |
| tree | 25fe4101566bf7cc0391f9aa2519823282504e02 | |
| parent | 9e5c8cb78fcc5d26e1b91172aa6e98890d9ea75c (diff) | |
| download | openembedded-core-eb381e05ff24ee2fed0b4e9675bd01dce662da07.tar.gz openembedded-core-eb381e05ff24ee2fed0b4e9675bd01dce662da07.tar.bz2 openembedded-core-eb381e05ff24ee2fed0b4e9675bd01dce662da07.zip | |
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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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)' |