diff options
| author | Ivan Sergio Borgonovo <mail@webthatworks.it> | 2015-10-22 19:56:07 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-27 12:03:01 +0100 |
| commit | cbec759ffffd021b3daf786ea7965961ea708152 (patch) | |
| tree | 42396cfcb57edccaa8b11e5892dab3d63a9814c0 /recipes-qt/packagegroups | |
| parent | 89038bffd224a0d43aa8627472374503b3023f61 (diff) | |
packagegroup-qt5-toolchain-target: respect opengl DISTRO_FEATURE
conditionally add to RDEPENDS all qt3d and -qmlplugins that
depends on opengl
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/packagegroups')
| -rw-r--r-- | recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index 41c467cf..37e96490 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 \ @@ -50,30 +50,30 @@ RDEPENDS_${PN} += " \ qttranslations-qthelp \ qtconnectivity-dev \ qtconnectivity-mkspecs \ - qtconnectivity-qmlplugins \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtconnectivity-qmlplugins', '', d)} \ qttranslations-qtconnectivity \ 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 \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtlocation-qmlplugins', '', d)} \ qttranslations-qtlocation \ qtmultimedia-dev \ qtmultimedia-mkspecs \ qtmultimedia-plugins \ - qtmultimedia-qmlplugins \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtmultimedia-qmlplugins', '', d)} \ qttranslations-qtmultimedia \ qtscript-dev \ qtscript-mkspecs \ @@ -81,7 +81,7 @@ RDEPENDS_${PN} += " \ qtsensors-dev \ qtsensors-mkspecs \ qtsensors-plugins \ - qtsensors-qmlplugins \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtsensors-qmlplugins', '', d)} \ qtserialport-dev \ qtserialport-mkspecs \ qtsvg-dev \ @@ -89,7 +89,7 @@ RDEPENDS_${PN} += " \ qtsvg-plugins \ qtsystems-dev \ qtsystems-mkspecs \ - qtsystems-qmlplugins \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtsystems-qmlplugins', '', d)} \ qttools-dev \ qttools-mkspecs \ qttools-plugins \ @@ -100,11 +100,11 @@ RDEPENDS_${PN} += " \ ${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \ qtwebsockets-dev \ qtwebsockets-mkspecs \ - qtwebsockets-qmlplugins \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtwebsockets-qmlplugins', '', d)} \ qttranslations-qtwebsockets \ qtwebchannel-dev \ qtwebchannel-mkspecs \ - qtwebchannel-qmlplugins \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'qtwebchannel-qmlplugins', '', d)} \ qtxmlpatterns-dev \ qtxmlpatterns-mkspecs \ qttranslations-qtxmlpatterns \ |