[PATCH 1/2 v2] xserver-xf86-config: add glamoregl

[PATCH 1/2 v2] xserver-xf86-config: add glamoregl

[Saul Wold]

When using the modesetting with glamor and MUSL, the glamoregl
library needs to be pre-loaded, so add it to the list here.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../xorg-xserver/xserver-xf86-config/10-preload-modules.conf             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf
index 72e4fbf..23fcdc7 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf
@@ -6,4 +6,5 @@ Section "Module"
     Load "int10"
     Load "vbe"
     Load "vgahw"
+    Load "glamoregl"
 EndSection
-- 
2.7.4

[PATCH 2/2 v2] xserver-xorg: Enable glamor by default

[Saul Wold]

To enable glamor, we need to also enable both dri3 and xshmfence as dependencies.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 6a13380..0d3022f 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -121,8 +121,9 @@ EXTRA_OECONF += "--with-fop=no \
 "
 EXTRA_OECONF[vardepsexclude] = "MACHINE"
 
+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)} \
 "
-- 
2.7.4