[meta-freescale] [meta-fsl-demos][PATCH] packagegroup-fslc-gstreamer1.0: Fix DISTRO_FEATURE wayland check
Max Krummenacher
max.oss.09 at gmail.com
Mon Mar 23 04:23:26 PDT 2015
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 at 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
More information about the meta-freescale
mailing list