[oe] [meta-qt5][PATCH] Make possible to bake meta-toolchain-qt5 without opengl
Ivan Sergio Borgonovo
ivan at gloom.home.webthatworks.it
Sat Oct 17 00:10:14 UTC 2015
From: Ivan Sergio Borgonovo <mail at webthatworks.it>
---
.../packagegroup-qt5-toolchain-target.bb | 56 +++++++++++-----------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index 41c467c..22da7a3 100644
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -12,11 +12,11 @@ USE_RUBY = " \
qtquick1-dev \
qtquick1-mkspecs \
qtquick1-plugins \
- qtquick1-qmlplugins \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtquick1-qmlplugins', '', d)} \
qttranslations-qtquick1 \
qtwebkit-dev \
qtwebkit-mkspecs \
- qtwebkit-qmlplugins \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtwebkit-qmlplugins', '', d)} \
"
# Requires Wayland to work
@@ -36,9 +36,9 @@ USE_X11 = " \
RDEPENDS_${PN} += " \
packagegroup-core-standalone-sdk-target \
libsqlite3-dev \
- qt3d-dev \
- qt3d-mkspecs \
- qt3d-qmlplugins \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qt3d-dev', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qt3d-mkspecs', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qt3d-qmlplugins', '', d)} \
qtbase-dev \
qtbase-fonts \
qtbase-mkspecs \
@@ -48,40 +48,40 @@ RDEPENDS_${PN} += " \
qttranslations-qtbase \
qttranslations-qtconfig \
qttranslations-qthelp \
- qtconnectivity-dev \
- qtconnectivity-mkspecs \
- qtconnectivity-qmlplugins \
- qttranslations-qtconnectivity \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtconnectivity-dev', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtconnectivity-mkspecs', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtconnectivity-qmlplugins', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qttranslations-qtconnectivity', '', d)} \
qtdeclarative-dev \
qtdeclarative-mkspecs \
qtdeclarative-plugins \
- qtdeclarative-qmlplugins \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtdeclarative-qmlplugins', '', d)} \
qtdeclarative-staticdev \
qttranslations-qmlviewer \
qttranslations-qtdeclarative \
qtenginio-dev \
qtenginio-mkspecs \
- qtenginio-qmlplugins \
- qtgraphicaleffects-qmlplugins \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtenginio-qmlplugins', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtgraphicaleffects-qmlplugins', '', d)} \
qtimageformats-dev \
qtimageformats-plugins \
- qtlocation-dev \
- qtlocation-mkspecs \
- qtlocation-plugins \
- qtlocation-qmlplugins \
- qttranslations-qtlocation \
- qtmultimedia-dev \
- qtmultimedia-mkspecs \
- qtmultimedia-plugins \
- qtmultimedia-qmlplugins \
- qttranslations-qtmultimedia \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtlocation-dev', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtlocation-mkspecs', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtlocation-plugins', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtlocation-qmlplugins', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qttranslations-qtlocation', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtmultimedia-dev', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtmultimedia-mkspecs', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtmultimedia-plugins', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtmultimedia-qmlplugins', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qttranslations-qtmultimedia', '', d)} \
qtscript-dev \
qtscript-mkspecs \
qttranslations-qtscript \
qtsensors-dev \
qtsensors-mkspecs \
qtsensors-plugins \
- qtsensors-qmlplugins \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtsensors-qmlplugins', '', d)} \
qtserialport-dev \
qtserialport-mkspecs \
qtsvg-dev \
@@ -89,10 +89,10 @@ RDEPENDS_${PN} += " \
qtsvg-plugins \
qtsystems-dev \
qtsystems-mkspecs \
- qtsystems-qmlplugins \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtsystems-qmlplugins', '', d)} \
qttools-dev \
qttools-mkspecs \
- qttools-plugins \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qttools-plugins', '', d)} \
qttools-staticdev \
qttools-tools \
${@base_contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \
@@ -100,11 +100,11 @@ RDEPENDS_${PN} += " \
${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \
qtwebsockets-dev \
qtwebsockets-mkspecs \
- qtwebsockets-qmlplugins \
- qttranslations-qtwebsockets \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtwebsockets-qmlplugins', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qttranslations-qtwebsockets', '', d)} \
qtwebchannel-dev \
qtwebchannel-mkspecs \
- qtwebchannel-qmlplugins \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtwebchannel-qmlplugins', '', d)} \
qtxmlpatterns-dev \
qtxmlpatterns-mkspecs \
qttranslations-qtxmlpatterns \
--
2.6.1
More information about the Openembedded-devel
mailing list