[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4394/8267] xserver-xorg: Enable glamor by default

[Emmanuele Bassi <ebassi src gnome org>]

commit 837fd055117f2e4c5c40162abe2e04eaabfeacde
Author: Saul Wold <sgw linux intel com>
Date:   Fri Jan 20 13:50:27 2017 -0800

    xserver-xorg: Enable glamor by default
    
    To enable glamor, we need to also enable both dri3 and xshmfence as dependencies.
    
    (From OE-Core rev: 33864ddc1ca5326e0b2bb7443410069a8cd9f57b)
    
    Signed-off-by: Saul Wold <sgw linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc 
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 216ae64..7717802 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -120,8 +120,9 @@ EXTRA_OECONF += "--with-fop=no \
                  WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \
 "
 
+OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
 PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \
                    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \
                    ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \
 "