diff options
| author |   Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2015-10-15 15:20:01 +0900 |
|---|---|---|
| committer | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2015-10-15 16:13:55 +0900 |
| commit | 4f7cf459dd3cdec72869cd40f4a1f6b02ba4faaf (patch) | |
| tree | 65b0b33dd515d045f1050082bab1fc9ce68372f3 /meta-rcar-gen2/recipes-multimedia | |
| parent | 9e0925569683e90eee9a07de76671457608b5597 (diff) | |
| parent | c7ca33aa5566636429f6b0ba9c959e2259acbc3e (diff) | |
[AGL] Merge genivi-7.0-bsp-1.8.0 into agl-1.0-bsp-1.8.0
* agl/genivi-7.0-bsp-1.8.0:
r-car e2 (alt/silk): mesa: Temporary workaround to upstream Mesa build issue
multimedia: Remove unnecessary do_install_append from omx-user-module
multimedia: gstreamer1.0-* fix configure for out of tree build on git recipes
r-car m2: set PREFERRED_VERSION_gstreamer1.0-omx* to 1.0.% when h/w acceleration enabled
multimedia: add RPROVIDES for multimedia kernel modules
Configure linux-renesas to build uinput
Conflicts:
meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb
Change-Id: Id8bf7749e75fa2cf5e418b81a33659285e46532c
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Diffstat (limited to 'meta-rcar-gen2/recipes-multimedia')
| -rw-r--r-- | meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb b/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb index 12b3f86..c8623cf 100644 --- a/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb +++ b/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb @@ -332,32 +332,6 @@ do_install() { fi } -do_install_append() { - if [ "X${MACHINE}" = "Xsilk" -o "X${MACHINE}" = "Xporter" ] ; then - cd ${S}/OMXR/lib/ - -# ln -sf libomxr_core.so.0.0.0 libomxr_core.so.2.0.0 -# ln -sf libomxr_core.so.0.0.0 libomxr_core.so.0 -# ln -sf libomxr_mc_cmn.so.0.0.0 libomxr_mc_cmn.so.2.0.0 -# ln -sf libomxr_mc_h264d.so.0.0.0 libomxr_mc_h264d.so.2.0.0 -# ln -sf libomxr_mc_h264d.so.0.0.0 libomxr_mc_h264d.so.0 -# ln -sf libomxr_mc_h264e.so.0.0.0 libomxr_mc_h264e.so.2.0.0 -# ln -sf libomxr_mc_h264e.so.0.0.0 libomxr_mc_h264e.so.0 -# ln -sf libomxr_mc_vecmn.so.0.0.0 libomxr_mc_vecmn.so.2.0.0 -# ln -sf libomxr_mc_vcmn.so.0.0.0 libomxr_mc_vcmn.so.2.0.0 -# ln -sf libomxr_mc_vdcmn.so.0.0.0 libomxr_mc_vdcmn.so.2.0.0 -# ln -sf libuvcs_dec.so.0.0.0 libuvcs_dec.so.1.0.0 -# ln -sf libuvcs_enc.so.0.0.0 libuvcs_enc.so.1.0.0 -# ln -sf libvcp3_avcd.so.0.0.0 libvcp3_avcd.so.1.0.0 -# ln -sf libvcp3_avce.so.0.0.0 libvcp3_avce.so.1.0.0 -# ln -sf libvcp3_mcvd.so.0.0.0 libvcp3_mcvd.so.1.0.0 -# ln -sf libvcp3_mcve.so.0.0.0 libvcp3_mcve.so.1.0.0 - - # Copy all the symbolic link and lib to destination - cp -Prf ${S}/OMXR/lib/* ${D}/usr/local/lib - fi -} - SYSROOT_PREPROCESS_FUNCS += "do_populate_share_lib" do_populate_share_lib () { |