From 15bc6db53647e814592481bca62b5eb5fa45f5aa Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Wed, 17 Sep 2014 20:07:36 +0200
Subject: [PATCH] meta-digi-dey: rework dey-image-graphical image to save space

* Remove inconditional inclusion of dey-gstreamer: dey-image-minimal
  includes dey-gstreamer if MACHINE_FEATURES contains 'accel-video'
  so dey-image-graphical inherits this from dey-image-minimal.
  This does not make any difference for IMX platforms but allows to
  remove inconditional inclusion of dey-gstreamer for MXS. To allow
  'gaku' (sato audio player) playing MP3 files COMMERCIAL_AUDIO_PLUGINS
  is added to the distro config file.

* Only include 'owl-video' if MACHINE_FEATURES contains 'accel-video'.

* Remove inconditional inclusion of qt4-examples from dey-qt
  packagegroup. Package qt4-examples is part of the RRECOMMENDS for
  package qt4-demos, so it will be included anyway and not having it
  hard-coded allows to bad-recommend it for some platforms and not
  for others.

* Use BAD_RECOMMENDATIONS to avoid inclusion of 'qt4-demos-doc' package
  for all platforms (this package does not add any value and weights
  about 50MB) and 'qt4-examples' for ccardimx28js.

With all those changes, we get a graphical image with GTK + QT that fits
in the standard rootfs partition for ccardimx28js.

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

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-dey/conf/distro/dey.conf                        | 3 +++
 meta-digi-dey/recipes-core/images/dey-image-graphical.bb  | 8 ++++++--
 .../recipes-graphics/packagegroups/packagegroup-dey-qt.bb | 7 +++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf
index 411219c68..6ecacc699 100644
--- a/meta-digi-dey/conf/distro/dey.conf
+++ b/meta-digi-dey/conf/distro/dey.conf
@@ -71,6 +71,9 @@ TCLIBCAPPEND = ""
 QEMU_TARGETS ?= "arm i386 mips mipsel ppc x86_64"
 # Other QEMU_TARGETS "mips64 mips64el sh4"
 
+# Support MP3 audio files
+COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
+
 # Some packages like gst-plugins-ugly need this
 LICENSE_FLAGS_WHITELIST += "commercial"
 
diff --git a/meta-digi-dey/recipes-core/images/dey-image-graphical.bb b/meta-digi-dey/recipes-core/images/dey-image-graphical.bb
index a29db7ce7..c2c0417bd 100644
--- a/meta-digi-dey/recipes-core/images/dey-image-graphical.bb
+++ b/meta-digi-dey/recipes-core/images/dey-image-graphical.bb
@@ -6,7 +6,6 @@ DESCRIPTION = "Graphical image based on SATO, a gnome mobile environment visual
 PR = "${INC_PR}.0"
 
 IMAGE_FEATURES += " \
-    dey-gstreamer \
     dey-qt \
     package-management \
     x11-base \
@@ -27,6 +26,11 @@ SOC_IMAGE_INSTALL_mx6 = "gpu-viv-bin-mx6q gpu-viv-g2d"
 
 IMAGE_INSTALL += " \
     ${SOC_IMAGE_INSTALL} \
-    owl-video \
+    ${@base_contains("MACHINE_FEATURES", "accel-video", "owl-video", "", d)} \
     pointercal-xinput \
 "
+
+# Do not install some of the 'RRECOMMENDS_qt4-demos' to save space:
+# 'qt4-demos-doc' for all platforms and 'qt4-examples' for ccardimx28
+BAD_RECOMMENDATIONS += "qt4-demos-doc"
+BAD_RECOMMENDATIONS_append_ccardimx28 = " qt4-examples"
diff --git a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb
index 9c8089475..2b4bd95a8 100644
--- a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb
+++ b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-qt.bb
@@ -11,8 +11,7 @@ PR = "r0"
 inherit packagegroup
 
 RDEPENDS_${PN} = "\
-	packagegroup-core-qt-demoapps \
-	qt4-plugin-phonon-backend-gstreamer \
-	qt4-demos \
-	qt4-examples \
+    packagegroup-core-qt-demoapps \
+    qt4-plugin-phonon-backend-gstreamer \
+    qt4-demos \
 "