From 6ff14c4d43ff2a65e45c15c027dddfd7293b41fc Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Mon, 31 Aug 2015 15:09:33 +0900 Subject: [AGL] Workaround to upstream meta-renesas build issue When building meta-renesas with enabling multimedia binary packages provided by Renesas, there are some build issue. This should be removed once upstream is fixed. Change-Id: Ia83cc3fa0b02ebfc660e1e2dd50f1a5c8e1fddc9 Signed-off-by: Tadao Tanikawa --- .../gstreamer/gstreamer1.0-omx_1.0.0.bbappend | 7 +++-- .../gstreamer1.0-plugins-bad_1.2.3.bbappend | 7 +++-- .../gstreamer1.0-plugins-base_1.2.3.bbappend | 7 +++-- .../gstreamer1.0-plugins-good_1.2.3.bbappend | 7 +++-- .../gstreamer1.0-plugins-ugly_1.2.3.bbappend | 7 +++-- .../omx-module/omx-user-module.bb | 34 +++++++++++----------- 6 files changed, 37 insertions(+), 32 deletions(-) (limited to 'meta-rcar-gen2/recipes-multimedia') 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 8a7128e..95706e5 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 @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM_remove_rcar-gen2 = " file://omx/gstomx.h;beginline=1;endline=21 LIC_FILES_CHKSUM_append_rcar-gen2 = " file://omx/gstomx.h;beginline=1;endline=22;md5=17e5f2943dace9e5cde4a8587a31e8f9" S = "${WORKDIR}/git" -do_configure() { - ./autogen.sh --noconfigure - oe_runconf +do_configure_prepend() { + cd ${S} + ./autogen.sh --noconfigure + cd ${B} } DEPENDS_append_rcar-gen2 = " omx-user-module mmngrbuf-user-module" diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend index ac9e52e..a881d76 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend @@ -9,9 +9,10 @@ LIC_FILES_CHKSUM_remove_rcar-gen2 = "\ S = "${WORKDIR}/git" -do_configure() { - ./autogen.sh --noconfigure - oe_runconf +do_configure_prepend() { + cd ${S} + ./autogen.sh --noconfigure + cd ${B} } # for wayland diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend index eee4b59..18d4b64 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM_remove_rcar-gen2 = "\ S = "${WORKDIR}/git" -do_configure() { - ./autogen.sh --noconfigure - oe_runconf +do_configure_prepend() { + cd ${S} + ./autogen.sh --noconfigure + cd ${B} } # For Common diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bbappend index 573f71a..5030a5c 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bbappend +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bbappend @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM_remove_rcar-gen2 = "\ S = "${WORKDIR}/git" -do_configure() { - ./autogen.sh --noconfigure - oe_runconf +do_configure_prepend() { + cd ${S} + ./autogen.sh --noconfigure + cd ${B} } diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bbappend index 6d43b52..73bbb5c 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bbappend +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bbappend @@ -6,7 +6,8 @@ PACKAGECONFIG ??= " \ a52dec lame mad mpeg2dec \ " -do_configure() { - ./autogen.sh --noconfigure - oe_runconf +do_configure_prepend() { + cd ${S} + ./autogen.sh --noconfigure + cd ${B} } 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 f4f0c8b..12b3f86 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 @@ -336,22 +336,22 @@ 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 +# 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 @@ -377,7 +377,7 @@ do_clean_sharedfiles() { rm -f ${LIBSHARED}/libRSACPDLA_L.so* rm -f ${LIBSHARED}/libRSACPDAL_L.so* rm -f ${STAGING_INCDIR}/RSACPD_ADL.h - + rm -f ${LIBSHARED}/libMP3DLA_L.so* rm -f ${STAGING_INCDIR}/mp3d_Lib.h -- cgit 1.2.3-korg