From bb89e2aae91459f91fc28c83befd5abd1cbaea2c Mon Sep 17 00:00:00 2001 From: Thuy Tran Date: Fri, 17 May 2019 17:06:56 +0700 Subject: rcar-gen3: gstreamer: Upgrade gstreamer to v1.14.4 Gstreamer upstream has been upgraded to 1.14.4 in YP2.6.2. This commit also upgrades renesas rcar gstreamer recipes to follow upstream version. Signed-off-by: Thuy Tran Signed-off-by: Takamitsu Honda --- .../gstreamer/gstreamer1.0-omx_1.14.%.bbappend | 38 ---------------------- .../gstreamer/gstreamer1.0-omx_1.14.4.bbappend | 38 ++++++++++++++++++++++ .../gstreamer1.0-plugin-vspfilter_1.0.1.bb | 2 +- .../gstreamer1.0-plugins-bad_1.14.%.bbappend | 27 --------------- .../gstreamer1.0-plugins-bad_1.14.4.bbappend | 27 +++++++++++++++ .../gstreamer1.0-plugins-good_1.14.%.bbappend | 32 ------------------ .../gstreamer1.0-plugins-good_1.14.4.bbappend | 32 ++++++++++++++++++ 7 files changed, 98 insertions(+), 98 deletions(-) delete mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.%.bbappend create mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.4.bbappend delete mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.%.bbappend create mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.4.bbappend delete mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.%.bbappend create mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.4.bbappend (limited to 'meta-rcar-gen3') diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.%.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.%.bbappend deleted file mode 100644 index c5052fb..0000000 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.%.bbappend +++ /dev/null @@ -1,38 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/:" - -SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" -SRC_URI_append = " \ - git://github.com/renesas-rcar/gst-omx.git;branch=RCAR-GEN3/1.14.2 \ - file://gstomx.conf \ -" - -require include/rcar-gen3-path-common.inc - -DEPENDS += "omx-user-module mmngrbuf-user-module" - -SRCREV = "9e1d2ad0790111af7d131ec98b1204e27eca19bc" - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://omx/gstomx.h;beginline=1;endline=22;md5=e2c6664eda77dc22095adbed9cb6c6e4 \ -" - -S = "${WORKDIR}/git" - -GSTREAMER_1_0_OMX_TARGET = "rcar" -GSTREAMER_1_0_OMX_CORE_NAME = "${libdir}/libomxr_core.so" -EXTRA_OECONF_append = " --enable-experimental" - -do_configure_prepend() { - export http_proxy=${http_proxy} - export https_proxy=${https_proxy} - export HTTP_PROXY=${HTTP_PROXY} - export HTTPS_PROXY=${HTTPS_PROXY} - cd ${S} - install -m 0644 ${WORKDIR}/gstomx.conf ${S}/config/rcar/ - sed -i 's,@RENESAS_DATADIR@,${RENESAS_DATADIR},g' ${S}/config/rcar/gstomx.conf - ./autogen.sh --noconfigure - cd ${B} -} - -RDEPENDS_${PN}_append = " omx-user-module" -RDEPENDS_${PN}_remove = "libomxil" diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.4.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.4.bbappend new file mode 100644 index 0000000..ae6da2a --- /dev/null +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.4.bbappend @@ -0,0 +1,38 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/:" + +SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" +SRC_URI_append = " \ + git://github.com/renesas-rcar/gst-omx.git;branch=RCAR-GEN3/1.14.4 \ + file://gstomx.conf \ +" + +require include/rcar-gen3-path-common.inc + +DEPENDS += "omx-user-module mmngrbuf-user-module" + +SRCREV = "662d998ed4ab887fd41fe6b9e65ab51386278a68" + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://omx/gstomx.h;beginline=1;endline=22;md5=e2c6664eda77dc22095adbed9cb6c6e4 \ +" + +S = "${WORKDIR}/git" + +GSTREAMER_1_0_OMX_TARGET = "rcar" +GSTREAMER_1_0_OMX_CORE_NAME = "${libdir}/libomxr_core.so" +EXTRA_OECONF_append = " --enable-experimental" + +do_configure_prepend() { + export http_proxy=${http_proxy} + export https_proxy=${https_proxy} + export HTTP_PROXY=${HTTP_PROXY} + export HTTPS_PROXY=${HTTPS_PROXY} + cd ${S} + install -m 0644 ${WORKDIR}/gstomx.conf ${S}/config/rcar/ + sed -i 's,@RENESAS_DATADIR@,${RENESAS_DATADIR},g' ${S}/config/rcar/gstomx.conf + ./autogen.sh --noconfigure + cd ${B} +} + +RDEPENDS_${PN}_append = " omx-user-module" +RDEPENDS_${PN}_remove = "libomxil" diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb index e05cbb4..9ab44cf 100644 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb @@ -19,7 +19,7 @@ SRC_URI = " \ file://${VSPFILTER_CONF} \ " -SRCREV = "71459157b4a39821713ccbf3563fe0c0e2003c57" +SRCREV = "e7f61ef736a8824e26246733863b0dcabfa6dae2" S = "${WORKDIR}/git" diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.%.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.%.bbappend deleted file mode 100644 index e3d28dd..0000000 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.%.bbappend +++ /dev/null @@ -1,27 +0,0 @@ -SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz" -SRC_URI_append = " git://github.com/renesas-rcar/gst-plugins-bad.git;branch=RCAR-GEN3/1.14.2" - -SRCREV = "13ea01a3998d93bbeb8f6545f76a06251b21edd1" - -DEPENDS += "weston" - -S = "${WORKDIR}/git" - -# submodule is extracted before do_populate_lic -addtask do_init_submodule after do_unpack before do_patch - -do_init_submodule() { - export http_proxy=${http_proxy} - export https_proxy=${https_proxy} - export HTTP_PROXY=${HTTP_PROXY} - export HTTPS_PROXY=${HTTPS_PROXY} - cd ${S} - git submodule init - git submodule update -} - -do_configure_prepend() { - cd ${S} - ./autogen.sh --noconfigure - cd ${B} -} diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.4.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.4.bbappend new file mode 100644 index 0000000..8a5d586 --- /dev/null +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.4.bbappend @@ -0,0 +1,27 @@ +SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz" +SRC_URI_append = " git://github.com/renesas-rcar/gst-plugins-bad.git;branch=RCAR-GEN3/1.14.4" + +SRCREV = "34917c1788f037d884501074517337087de701f0" + +DEPENDS += "weston" + +S = "${WORKDIR}/git" + +# submodule is extracted before do_populate_lic +addtask do_init_submodule after do_unpack before do_patch + +do_init_submodule() { + export http_proxy=${http_proxy} + export https_proxy=${https_proxy} + export HTTP_PROXY=${HTTP_PROXY} + export HTTPS_PROXY=${HTTPS_PROXY} + cd ${S} + git submodule init + git submodule update +} + +do_configure_prepend() { + cd ${S} + ./autogen.sh --noconfigure + cd ${B} +} diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.%.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.%.bbappend deleted file mode 100644 index 3ac5977..0000000 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.%.bbappend +++ /dev/null @@ -1,32 +0,0 @@ -SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" -SRC_URI_append = " git://github.com/renesas-rcar/gst-plugins-good.git;branch=RCAR-GEN3/1.14.2" - -SRCREV = "1cfab18912d9ab3f9dd38896f8d6057ac38ededc" - -DEPENDS += "mmngrbuf-user-module" - -S = "${WORKDIR}/git" - -EXTRA_OECONF_append = " \ - --enable-cont-frame-capture \ - --enable-ignore-fps-of-video-standard \ -" - -# submodule is extracted before do_populate_lic -addtask do_init_submodule after do_unpack before do_patch - -do_init_submodule() { - export http_proxy=${http_proxy} - export https_proxy=${https_proxy} - export HTTP_PROXY=${HTTP_PROXY} - export HTTPS_PROXY=${HTTPS_PROXY} - cd ${S} - git submodule init - git submodule update -} - -do_configure_prepend() { - cd ${S} - ./autogen.sh --noconfigure - cd ${B} -} diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.4.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.4.bbappend new file mode 100644 index 0000000..79f5f41 --- /dev/null +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.4.bbappend @@ -0,0 +1,32 @@ +SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" +SRC_URI_append = " git://github.com/renesas-rcar/gst-plugins-good.git;branch=RCAR-GEN3/1.14.4" + +SRCREV = "352f99348100fd447eb506c0c0236fdc96993c45" + +DEPENDS += "mmngrbuf-user-module" + +S = "${WORKDIR}/git" + +EXTRA_OECONF_append = " \ + --enable-cont-frame-capture \ + --enable-ignore-fps-of-video-standard \ +" + +# submodule is extracted before do_populate_lic +addtask do_init_submodule after do_unpack before do_patch + +do_init_submodule() { + export http_proxy=${http_proxy} + export https_proxy=${https_proxy} + export HTTP_PROXY=${HTTP_PROXY} + export HTTPS_PROXY=${HTTPS_PROXY} + cd ${S} + git submodule init + git submodule update +} + +do_configure_prepend() { + cd ${S} + ./autogen.sh --noconfigure + cd ${B} +} -- cgit 1.2.3-korg