From d251bc8f22dde9d9aa029793b3470496f5813815 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 30 Sep 2021 16:32:26 +0200 Subject: [PATCH] qtwayland: inherit pkgconfig Newer oe-core doesn't pull many default dependencies anymore: https://lists.openembedded.org/g/openembedded-core/message/156185 add explicit dependency on pkgconfig through pkgconfig.bbclass as we're using it here. Fixes: | ERROR: Feature "xcomposite_glx": Forcing to "ON" breaks its condition: | QT_FEATURE_wayland_client AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 AND QT_FEATURE_xlib AND XComposite_FOUND | Condition values dump: | QT_FEATURE_wayland_client = "ON" | QT_FEATURE_opengl = "ON" | QT_FEATURE_opengles2 = "OFF" | QT_FEATURE_xlib = "ON" | XComposite_FOUND = "0" Already fixed in meta-qt5 with: https://github.com/meta-qt5/meta-qt5/commit/51d1ed13f5ce75c0bbbaccdde1414a46aeb6a198 Pick-to: 6.2 Change-Id: I6b2895e0eb2ea4f26b3313de69475b069587af0b Reviewed-by: Samuli Piippo --- recipes-qt/qt6/qtwayland_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt6/qtwayland_git.bb b/recipes-qt/qt6/qtwayland_git.bb index 350ba0a..fe852aa 100644 --- a/recipes-qt/qt6/qtwayland_git.bb +++ b/recipes-qt/qt6/qtwayland_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -inherit qt6-cmake +inherit qt6-cmake pkgconfig include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc