From 4e48ac91f620c296837e57e1d9e2e480a93197e1 Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Wed, 15 May 2013 11:29:00 +0200
Subject: [PATCH] meta-digi-del: Fix del-gstreamer for non mx5 platforms.

https://jira.digi.com/browse/DEL-279

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 .../recipes-core/images/del-image-graphical.bb         |  2 +-
 .../packagegroups/packagegroup-del-gstreamer.bb        | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/meta-digi-del/recipes-core/images/del-image-graphical.bb b/meta-digi-del/recipes-core/images/del-image-graphical.bb
index c3bae4021..6b8956b49 100644
--- a/meta-digi-del/recipes-core/images/del-image-graphical.bb
+++ b/meta-digi-del/recipes-core/images/del-image-graphical.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Graphical image based on SATO, a gnome mobile environment visual
 
 PR = "${INC_PR}.0"
 
-IMAGE_FEATURES += "splash package-management x11-base x11-sato"
+IMAGE_FEATURES += "splash package-management del-gstreamer x11-base x11-sato"
 
 LICENSE = "MIT"
 
diff --git a/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-gstreamer.bb b/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-gstreamer.bb
index 0781e29ee..ea9e964e0 100644
--- a/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-gstreamer.bb
+++ b/meta-digi-del/recipes-multimedia/packagegroups/packagegroup-del-gstreamer.bb
@@ -10,7 +10,8 @@ PR = "r0"
 
 inherit packagegroup
 
-VIRTUAL_RUNTIME_gst-fsl-plugin = "\
+VIRTUAL_RUNTIME_gst-fsl-plugin ?= ""
+VIRTUAL_RUNTIME_gst-fsl-plugin_append_mx5 = " \
 	gst-fsl-plugin \
 	gst-fsl-plugin-gplay \
 	"
@@ -195,9 +196,12 @@ VIRTUAL_RUNTIME_gst-plugins-ugly = "\
 	${PACKAGE_gst-plugins-ugly-video} \
 	"
 
+VIRTUAL_RUNTIME_gst-plugins-ugly_append_ccardimx28js = " \
+	${@base_contains('DISTRO_FEATURES', 'del-audio', '${PACKAGE_gst-plugins-ugly-audio}', '', d)} \
+	"
+
 RDEPENDS_${PN} = "\
     ${VIRTUAL_RUNTIME_gst-fsl-plugin} \
-    imx-lib \
     ${MACHINE_FIRMWARE} \
     gstreamer \
     ${VIRTUAL_RUNTIME_gst-plugins-base} \
@@ -207,5 +211,7 @@ RDEPENDS_${PN} = "\
     gst-ffmpeg \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
 
+RDEPENDS_${PN}_append_mx5 = " imx-lib"
+
 RRECOMMENDS_${PN} = "\
     ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"