summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Lawrence <stephen.lawrence@renesas.com>2016-02-10 16:55:56 +0000
committerStephen Lawrence <stephen.lawrence@renesas.com>2016-02-22 14:44:32 +0000
commit1f292799192d0386fa022423fc872a90aae155b0 (patch)
tree640a4953443eadeac01b30fe3d2b3945abbe0705
parente533bf0221e7e377172de8676d04c908c6151b93 (diff)
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
-rw-r--r--meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc4
-rw-r--r--meta-rcar-gen2/recipes-graphics/images/core-image-weston.inc6
2 files changed, 6 insertions, 4 deletions
diff --git a/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc b/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc
index 4f99a90..183d2a9 100644
--- a/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc
+++ b/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc
@@ -8,7 +8,7 @@ IMAGE_INSTALL_append_rcar-gen2 = " \
bash \
"
-IMAGE_INSTALL_append_rcar-gen2 = " \
+IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_conditional("USE_MULTIMEDIA", "1", " \
gstreamer1.0-plugins-base-videorate \
gstreamer1.0-plugins-base-videotestsrc \
gstreamer1.0-plugins-base-audiotestsrc \
@@ -21,7 +21,7 @@ IMAGE_INSTALL_append_rcar-gen2 = " \
gstreamer1.0-plugins-bad-fbdevsink \
gstreamer1.0-plugins-bad-faad \
gstreamer1.0-plugins-bad-videoparsersbad \
-"
+ ", "", d)}'
IMAGE_INSTALL_append_rcar-gen2 = '${@base_conditional("USE_GLES", "1", \
"gles-kernel-module gles-user-module", "", d)}'
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", " \