1 files changed, 3 insertions, 4 deletions
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"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
-# libx11 requires x11 in DISTRO_FEATURES.
+                   gbm"
-REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}"
 # virtual/libgl requires opengl in DISTRO_FEATURES.
 REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}"

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
15		15
16	# This should be overridden per-machine to reflect the capabilities of the GL	16	# This should be overridden per-machine to reflect the capabilities of the GL
17	# stack.	17	# stack.
18	PACKAGECONFIG ??= "glx"	18	PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \
19		19	${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
20	# libx11 requires x11 in DISTRO_FEATURES.	20	gbm"
21	REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'glx', 'x11', '', d)}"
22		21
23	# virtual/libgl requires opengl in DISTRO_FEATURES.	22	# virtual/libgl requires opengl in DISTRO_FEATURES.
24	REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}"	23	REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}"