Some recipes require opengl

Qt3d, QtQuick3d and QtGraphicalEffects can be used only if
we have opengl. Limit recipes and include them on packagegroups
only when possible.
This commit is contained in:
Samuli Piippo 2020-08-26 09:06:44 +03:00
parent 69b4e15f1c
commit 5d294b331d
4 changed files with 11 additions and 4 deletions

View File

@ -8,18 +8,18 @@ inherit packagegroup
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS_${PN} += " \
qt3d \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
qt5compat \
qtbase \
qtcoap \
qtconnectivity \
qtdeclarative \
qtgraphicaleffects \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtgraphicaleffects', '', d)} \
qtimageformats \
qtmqtt \
qtnetworkauth \
qtopcua \
qtquick3d \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtquick3d', '', d)} \
qtquickcontrols2 \
qtquicktimeline \
qtremoteobjects \

View File

@ -9,7 +9,7 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS_${PN} += "\
qt3d-dev \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \
qt5compat-dev \
qtbase-dev \
qtcoap-dev \
@ -20,6 +20,7 @@ RDEPENDS_${PN} += "\
qtmqtt-dev \
qtnetworkauth-dev \
qtopcua-dev \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtquick3d-dev', '', d)} \
qtquick3d-dev \
qtquickcontrols2-dev \
qtquicktimeline-dev \

View File

@ -6,6 +6,9 @@ LIC_FILES_CHKSUM = " \
"
inherit qt6-cmake
inherit features_check
REQUIRED_DISTRO_FEATURES = "opengl"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc

View File

@ -4,6 +4,9 @@ LIC_FILES_CHKSUM = " \
"
inherit qt6-cmake
inherit features_check
REQUIRED_DISTRO_FEATURES = "opengl"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc