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 \ "