From c40482a68e964d6c1c24271c12e4d052df2efaf3 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 29 Apr 2019 15:37:56 +0800 Subject: waffle: supprt build waffle without x11 respect DISTRO_FEATURES to make waffle support different platform, gbm platform is supported by default. [YOCTO #6077] (From OE-Core rev: 37dc4ad4a87fb9042dc3e9bb389cedc8b5acadf7) Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- meta/recipes-graphics/waffle/waffle_1.5.2.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'meta/recipes-graphics/waffle') diff --git a/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/meta/recipes-graphics/waffle/waffle_1.5.2.bb index 43c3edc05a..31572f25f7 100644 --- a/meta/recipes-graphics/waffle/waffle_1.5.2.bb +++ b/meta/recipes-graphics/waffle/waffle_1.5.2.bb @@ -15,10 +15,9 @@ inherit cmake distro_features_check lib_package # This should be overridden per-machine to reflect the capabilities of the GL # stack. -PACKAGECONFIG ??= "glx" - -# libx11 requires x11 in DISTRO_FEATURES. -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ + gbm" # virtual/libgl requires opengl in DISTRO_FEATURES. REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}" -- cgit v1.2.3-54-g00ecf