From 9a7b5c9ad45685f3ea7e014d1dd6d4bd27a94a93 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 25 Feb 2019 15:47:17 -0800 Subject: qtbase: Enabel gbm always and add userland to depends When using userland graphics, we need to install both userland and mesa-gl to complete the stack needed to build wayland support Signed-off-by: Khem Raj --- dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'dynamic-layers/qt5-layer') diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 58b7b47..4202651 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -1,7 +1,8 @@ PACKAGECONFIG_GL_rpi = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', \ '', d), d)}" -PACKAGECONFIG_GL_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' gbm kms', '', d)}" +PACKAGECONFIG_GL_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' kms', '', d)}" +PACKAGECONFIG_GL_append_rpi = " gbm" PACKAGECONFIG_FONTS_rpi = "fontconfig" PACKAGECONFIG_append_rpi = " libinput examples tslib xkb xkbcommon-evdev" PACKAGECONFIG_remove_rpi = "tests" @@ -15,3 +16,4 @@ do_configure_prepend_rpi() { fi } RDEPENDS_${PN}_append_rpi = " userland" +DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" -- cgit v1.2.3-54-g00ecf