[meta-fsl-demos][PATCH] packagegroup-fslc-gstreamer1.0: Fix DISTRO_FEATURE wayland check

[meta-fsl-demos][PATCH] packagegroup-fslc-gstreamer1.0: Fix DISTRO_FEATURE wayland check

[Daiane Angolini]

The BSP present in meta-fsl-arm provides hardware acceleration
for wayland only in case 'wayland' is present in DISTRO_FEATURES
and 'x11' is not.

The default poky DISTRO_FEATURE has both 'wayland' and 'x11' at
same time. For this scenario, and it is a X11 hardware acceleration
for BSP from meta-fsl-arm.

It means that, only verify if 'wayland' is in DISTRO_FEATURE is not enough
to deferminate a Wayland distribution, when working with meta-fsl-arm.
It is needed to check if 'x11' is not.

Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
---
 recipes-multimedia/packagegroups/packagegroup-fslc-gstreamer1.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-multimedia/packagegroups/packagegroup-fslc-gstreamer1.0.bb b/recipes-multimedia/packagegroups/packagegroup-fslc-gstreamer1.0.bb
index 1a61244..7380f0b 100644
--- a/recipes-multimedia/packagegroups/packagegroup-fslc-gstreamer1.0.bb
+++ b/recipes-multimedia/packagegroups/packagegroup-fslc-gstreamer1.0.bb
@@ -52,7 +52,9 @@ RDEPENDS_${PN}-base = " \
     gstreamer1.0-plugins-base-volume \
     gstreamer1.0-plugins-good-autodetect \
     ${@base_contains('DISTRO_FEATURES', 'x11', '${GST_X11_PACKAGES}', '', d)} \
-    ${@base_contains('DISTRO_FEATURES', 'wayland', '${GST_WAYLAND_PACKAGES}', '', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'x11', \
+                      base_contains('DISTRO_FEATURES', 'wayland', \
+                                    '', '${GST_WAYLAND_PACKAGES}', d), '', d)} \
 "
 
 # Basic audio plugins: parsers, demuxers, decoders
-- 
1.9.1

[meta-fsl-demos][PATCH] packagegroup-fslc-gstreamer1.0: Fix DISTRO_FEATURE wayland check

[Max Krummenacher]

The wayland packages should only be installed when DISTRO_FEATURE does
not contain x11 but does contain wayland.

This fixes a failed build when there is only x11 in DISTRO_FEATURE and
do_rootfs failes when trying to install gstreamer1.0-plugins-bad-waylandsink.

While at it replace base_contains with bb.utils.contains and combine
the x11 and wayland logic.

Signed-off-by: Max Krummenacher <max.oss.09@gmail.com>
---
 recipes-multimedia/packagegroups/packagegroup-fslc-gstreamer1.0.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/recipes-multimedia/packagegroups/packagegroup-fslc-gstreamer1.0.bb b/recipes-multimedia/packagegroups/packagegroup-fslc-gstreamer1.0.bb
index b6220ea..39d8bff 100644
--- a/recipes-multimedia/packagegroups/packagegroup-fslc-gstreamer1.0.bb
+++ b/recipes-multimedia/packagegroups/packagegroup-fslc-gstreamer1.0.bb
@@ -53,10 +53,9 @@ RDEPENDS_${PN}-base = " \
     gstreamer1.0-plugins-base-videoscale \
     gstreamer1.0-plugins-base-volume \
     gstreamer1.0-plugins-good-autodetect \
-    ${@base_contains('DISTRO_FEATURES', 'x11', '${GST_X11_PACKAGES}', '', d)} \
-    ${@base_contains('DISTRO_FEATURES', 'x11', \
-                      base_contains('DISTRO_FEATURES', 'wayland', \
-                                    '', '${GST_WAYLAND_PACKAGES}', d), '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${GST_X11_PACKAGES}', \
+                          bb.utils.contains('DISTRO_FEATURES', 'wayland', \
+                                            '${GST_WAYLAND_PACKAGES}', '', d), d)} \
 "
 
 # Basic audio plugins: parsers, demuxers, decoders
-- 
1.9.3