[oe-commits] Ross Burton : xserver-xorg: always enable DRI2 by default

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: e0c526017e895d768e8a4d09999242286b1f6ee9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e0c526017e895d768e8a4d09999242286b1f6ee9

Author: Ross Burton <ross.burton at intel.com>
Date:   Fri Jun  5 11:29:48 2015 +0100

xserver-xorg: always enable DRI2 by default

DRI2 is more abstract than the original DRI and isn't tied to OpenGL or any
other rendering system, and as such is being used by more than OpenGL support in
xserver.  In particular, the new modesettings driver uses DRI2 to accelerate
drawing, so enable DRI2 by default.

This was spotted because the "nodistro" DISTRO doesn't enable OpenGL, so xserver
failed to build as dri2proto wasn't built.

Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 04289f8..02a170a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -122,7 +122,7 @@ EXTRA_OECONF += "--with-fop=no \
                  ac_cv_file__usr_share_sgml_X11_defs_ent=no \
 "
 
-PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)} \
+PACKAGECONFIG ??= "dri2 udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \
                    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \
 "