From e23e2284b04396ed77ffc922a74f76a9aed322b9 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 12 Feb 2020 10:41:11 +0200
Subject: [PATCH] Add single PACKAGECONFIG variable for all graphics api

---
 recipes-qt/qt6/qtbase_git.bb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb
index da05320..79876e1 100644
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@@ -22,8 +22,7 @@ PACKAGECONFIG_class-native ?= "gui widgets dbus"
 PACKAGECONFIG_class-nativesdk ?= "gui widgets dbus"
 PACKAGECONFIG_class-target ?= "\
     ${PACKAGECONFIG_DEFAULT} \
-    ${PACKAGECONFIG_GL} \
-    ${PACKAGECONFIG_FB} \
+    ${PACKAGECONFIG_GRAPHICS} \
     ${PACKAGECONFIG_X11} \
     ${PACKAGECONFIG_KDE} \
     ${PACKAGECONFIG_FONTS} \
@@ -31,11 +30,14 @@ PACKAGECONFIG_class-target ?= "\
     ${PACKAGECONFIG_DISTRO} \
 "
 
-PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
-                        bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'gles2', d), '', d)}"
-PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
+PACKAGECONFIG_GRAPHICS ?= "\
+    ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
+        bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', 'gles2', d), '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
+"
 PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xkbcommon glib', '', d)}"
-PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups kms gbm libinput sql-sqlite', '', d)}"
+PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups kms gbm sql-sqlite', '', d)}"
 PACKAGECONFIG_FONTS ?= ""
 PACKAGECONFIG_SYSTEM ?= ""
 PACKAGECONFIG_DISTRO ?= ""