Signed-off-by: Jacob Stiffler <[email protected]>
---
.../packagegroups/packagegroup-arago-qte.bb | 4 ++--
.../packagegroup-arago-tisdk-graphics.bb | 4 ++--
.../packagegroups/packagegroup-arago-tisdk-qte.bb | 4 ++--
.../packagegroups/packagegroup-linaro-tc-test.bb | 5 +++--
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
index 9618de5..149dfac 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to add Qt embedded related packages"
LICENSE = "MIT"
-PR = "r8"
+PR = "r9"
inherit packagegroup
@@ -34,7 +34,7 @@ QT5_ESSENTIALS = "\
qtlocation-qmlplugins \
qtmultimedia-plugins \
qtmultimedia-qmlplugins \
- qtwayland-plugins \
+ ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-plugins', '',
d)} \
qt3d-qmlplugins \
qtwebkit-qmlplugins \
qtquick1-plugins \
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
index 74b8417..327a11b 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to install graphics binaries"
LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
inherit packagegroup
@@ -43,6 +43,6 @@ GRAPHICS_RDEPENDS_omap-a15 = "\
# omapdrm-pvr
RDEPENDS_${PN} = "\
- ${@base_conditional('QT_PROVIDER', 'qt4e', "", "${GRAPHICS_WESTON}", d)} \
+ ${@base_contains('DISTRO_FEATURES', 'wayland', "${GRAPHICS_WESTON}", '',
d)} \
${GRAPHICS_RDEPENDS} \
"
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
index eeb32fb..ac84008 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to add Qt embedded related packages"
LICENSE = "MIT"
-PR = "r11"
+PR = "r12"
inherit packagegroup
@@ -22,7 +22,7 @@ QT5_DEMOS = "\
qtlocation-examples \
qtmultimedia-examples \
qtscript-examples \
- qtwayland-examples \
+ ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '',
d)} \
qtwebkit-examples-examples \
qtquick1-examples \
"
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-linaro-tc-test.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-linaro-tc-test.bb
index 8fd863e..68e7ab0 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-linaro-tc-test.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-linaro-tc-test.bb
@@ -1,6 +1,8 @@
DESCRIPTION = "Group of packages to build with Linaro toolchain for testing"
LICENSE = "MIT"
+PR = "r1"
+
inherit packagegroup
RDEPENDS_${PN} = "\
@@ -10,8 +12,7 @@ RDEPENDS_${PN} = "\
bash \
coreutils \
apache \
- wayland \
- weston \
+ ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland weston', '', d)} \
gstreamer \
openssl \
openssh \
--
1.7.9.5
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
