From 1f292799192d0386fa022423fc872a90aae155b0 Mon Sep 17 00:00:00 2001 From: Stephen Lawrence Date: Wed, 10 Feb 2016 16:55:56 +0000 Subject: gdp: Fix missing gst faad plugin build error when s/w mmp is used. Only add gfx or mmp to image when h/w acceleration enabled. This fixes an issue reported on list [1] where the GDP do_rootfs fails: 'ERROR: gstreamer1.0-plugins-bad-faad not found in the base feeds (koelsch cortexa15hf-vfp-neon cortexa15hf-vfp armv7ahf-vfp-neon armv7ahf-vfp armv6hf-vfp armv5ehf-vfp armv5hf-vfp noarch any all)' The issue was introduced with meta-renesas commit 632f4b7e7c05db which integrated a mechanism to add gfx and multimedia packages as needed to the IMAGE. Faad requires it be added to the image dependencies and is found in meta-openembedded/meta-multimedia/. By default the R-Car M2 Koeslch board local.conf and bblayers.conf in GDP do not enable h/w multimedia acceleration and so those requirements were not met. Resulting in the error as nothing was causing a Gst 1.4.x Faad plug-in to be built. However for GDP and the general case the BSP should only be adding packages it requires when h/w acceleration is enabled. Therefore modify the mechanism to do just that. When s/w rendering is used it should be left to layers outside of the BSP to do what is required. [1] http://lists.genivi.org/pipermail/genivi-projects/2016-January/001360.html --- meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc') diff --git a/meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc b/meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc index 782752c..8c1342a 100644 --- a/meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc +++ b/meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc @@ -1,8 +1,10 @@ include core-image-renesas-base.inc IMAGE_INSTALL_append_rcar-gen2 = '${@base_conditional("USE_GLES", "1", \ - " libegl libegl-dev libgbm-dev", "", d)} \ - gstreamer1.0-plugins-bad-waylandsink' + " libegl libegl-dev libgbm-dev", "", d)}' + +IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_conditional("USE_MULTIMEDIA", "1", \ + " gstreamer1.0-plugins-bad-waylandsink", "", d)}' # pkg groups for oss codecs IMAGE_INSTALL_append_silk = ' ${@base_conditional("USE_MULTIMEDIA", "1", " \ -- cgit 1.2.3-korg