From 948165dce7475b815a344fd3c3d58165e6865d48 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Tue, 9 Feb 2016 11:07:03 -0800 Subject: gstreamer1.0-meta-base: make gstreamer1.0-plugins-base-alsa conditional Include gstreamer1.0-plugins-base-alsa in gstreamer1.0-meta-base only if "alsa" is present in both MACHINE and DISTRO features. Note that building of the plugin by gstreamer1.0-plugins-base is already conditional (based on the "alsa" DISTRO feature). Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-multimedia/gstreamer') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb index ffffa63d5d..ecfd082517 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb @@ -26,7 +26,7 @@ RDEPENDS_gstreamer1.0-meta-base = "\ gstreamer1.0 \ gstreamer1.0-plugins-base-playback \ gstreamer1.0-plugins-base-gio \ - gstreamer1.0-plugins-base-alsa \ + ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'gstreamer1.0-plugins-base-alsa', '',d)} \ gstreamer1.0-plugins-base-volume \ gstreamer1.0-plugins-base-audioconvert \ gstreamer1.0-plugins-base-audioresample \ -- cgit 1.2.3-korg