From 39902b66a174446a49e1083c357d86b74daef425 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 21 Apr 2017 16:32:43 +0200 Subject: BSP's should not ship files in /usr/local/ * replace /usr/local with path /usr/share/renesas using: RENESAS_DATADIR = "/usr/share/renesas" - meta-rcar-gen2/include/rcar-gen2-path-common.inc Bug-AGL: SPEC-533 Change-Id: I66350e850df385e901dc4a0ff56bf04452f90868 Signed-off-by: Ronan Le Martret --- .../gstreamer/gstreamer1.0-omx/gstomx.conf | 14 +++++++------- .../gstreamer/gstreamer1.0-omx_1.0.0.bbappend | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'meta-rcar-gen2/recipes-multimedia/gstreamer') diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf index 375e201..d36d3c4 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx/gstomx.conf @@ -1,6 +1,6 @@ [omxh263dec] type-name=GstOMXH263Dec -core-name=/usr/local/lib/libomxr_core.so +core-name=${RENESAS_DATADIR}/lib/libomxr_core.so component-name=OMX.RENESAS.VIDEO.DECODER.H263 rank=512 in-port-index=0 @@ -9,7 +9,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang [omxh264dec] type-name=GstOMXH264Dec -core-name=/usr/local/lib/libomxr_core.so +core-name=${RENESAS_DATADIR}/lib/libomxr_core.so component-name=OMX.RENESAS.VIDEO.DECODER.H264 rank=512 in-port-index=0 @@ -18,7 +18,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang [omxmpeg2videodec] type-name=GstOMXMPEG2VideoDec -core-name=/usr/local/lib/libomxr_core.so +core-name=${RENESAS_DATADIR}/lib/libomxr_core.so component-name=OMX.RENESAS.VIDEO.DECODER.MPEG2 rank=512 in-port-index=0 @@ -27,7 +27,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang [omxmpeg4videodec] type-name=GstOMXMPEG4VideoDec -core-name=/usr/local/lib/libomxr_core.so +core-name=${RENESAS_DATADIR}/lib/libomxr_core.so component-name=OMX.RENESAS.VIDEO.DECODER.MPEG4 rank=512 in-port-index=0 @@ -36,7 +36,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang [omxvc1videodec] type-name=GstOMXVC1VideoDec -core-name=/usr/local/lib/libomxr_core.so +core-name=${RENESAS_DATADIR}/lib/libomxr_core.so component-name=OMX.RENESAS.VIDEO.DECODER.VC1 rank=512 in-port-index=0 @@ -45,7 +45,7 @@ hacks=event-port-settings-changed-ndata-parameter-swap;event-port-settings-chang [omxaacdec] type-name=GstOMXAACDec -core-name=/usr/local/lib/libomxr_core.so +core-name=${RENESAS_DATADIR}/lib/libomxr_core.so component-name=OMX.RENESAS.AUDIO.DECODER.AAC rank=256 in-port-index=0 @@ -54,7 +54,7 @@ hacks= [omxh264enc] type-name=GstOMXH264Enc -core-name=/usr/local/lib/libomxr_core.so +core-name=${RENESAS_DATADIR}/lib/libomxr_core.so component-name=OMX.RENESAS.VIDEO.ENCODER.H264 rank=256 in-port-index=0 diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend index 426f0c4..6ff948c 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend @@ -1,4 +1,5 @@ require ../../include/gles-control.inc +require include/rcar-gen2-path-common.inc SRC_URI_rcar-gen2 = "git://github.com/renesas-devel/gst-omx.git;protocol=git;branch=RCAR-GEN2/1.0.0" SRCREV_rcar-gen2 = "${@'e0a23fb50ec211a8058eac223847bbcc574fb343' \ @@ -24,7 +25,7 @@ EXTRA_OECONF_append_rcar-gen2 = " \ # Overwrite do_install[postfuncs] += " set_omx_core_name " # because it will force the plugin to use bellagio instead of our config revert_omx_core_name() { - sed -i -e "s;^core-name=.*;core-name=/usr/local/lib/libomxr_core.so;" "${D}/etc/xdg/gstomx.conf" + sed -i -e "s;^core-name=.*;core-name=${RENESAS_DATADIR}/lib/libomxr_core.so;" "${D}/etc/xdg/gstomx.conf" } REVERT_OMX_CORE_NAME = "" -- cgit 1.2.3-korg