diff options
| author |   Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2016-06-21 12:19:58 +0900 |
|---|---|---|
| committer | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2016-06-21 12:21:44 +0900 |
| commit | b20896675dca7a5c3a6da6486f4ea708a23b3b12 (patch) | |
| tree | 59bd37feda3c605601758bccfc55a16c9b52d62c /meta-rcar-gen2/recipes-graphics/images | |
| parent | 25217cd6b38c20a0b1acee46a9ad12c3ff0b445e (diff) | |
| parent | a29b1deff4f828987ab22562e6c0cd60a95be1ab (diff) | |
[AGL] Merge 'genivi-7.0-bsp-1.8.0' into 'agl-1.0-bsp-1.8.0'
* genivi-7.0-bsp-1.8.0:
gstreamer: Fix a long list of build dependency QA warnings
gstreamer: Fix runtime CMA error
gdp: Fix missing gst faad plugin build error when s/w mmp is used.
multimedia: Set PREFERRED_VERSION for gstreamer1.0-* to 1.2.% for all Gen 2 boards
gdp: Add gfx and multimedia packages to GDP image when enabled
Change-Id: I68459885ebdfbe7b3ad22efcea3ec9b82c8d5aa9
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Diffstat (limited to 'meta-rcar-gen2/recipes-graphics/images')
3 files changed, 8 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 169c5f6..bea1510 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", " \ diff --git a/meta-rcar-gen2/recipes-graphics/images/genivi-demo-platform.bbappend b/meta-rcar-gen2/recipes-graphics/images/genivi-demo-platform.bbappend new file mode 100644 index 0000000..5c4ad5d --- /dev/null +++ b/meta-rcar-gen2/recipes-graphics/images/genivi-demo-platform.bbappend @@ -0,0 +1,2 @@ +# Add R-Car gfx and multimedia packages to the image when enabled +include core-image-weston.inc |