From 73716ce27ed60f5b470fca2e502ba4770b9d0ef4 Mon Sep 17 00:00:00 2001 From: Thuy Tran Date: Tue, 19 Feb 2019 16:07:16 +0700 Subject: rcar-gen3: gstreamer: Upgrade gstreamer to v1.14.2 Gstreamer upstream has been upgraded to 1.14.2 in YP2.6. 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.12.2.bbappend | 38 ---------------- .../gstreamer/gstreamer1.0-omx_1.14.%.bbappend | 38 ++++++++++++++++ .../gstreamer1.0-plugin-vspfilter_1.0.0.bb | 39 ---------------- .../gstreamer1.0-plugin-vspfilter_1.0.1.bb | 52 ++++++++++++++++++++++ .../gstreamer1.0-plugins-bad_1.12.2.bbappend | 29 ------------ .../gstreamer1.0-plugins-bad_1.14.%.bbappend | 27 +++++++++++ .../gstreamer1.0-plugins-good_1.12.2.bbappend | 32 ------------- .../gstreamer1.0-plugins-good_1.14.%.bbappend | 32 +++++++++++++ 8 files changed, 149 insertions(+), 138 deletions(-) delete mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.2.bbappend create mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.%.bbappend delete mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.0.bb create mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb delete mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.2.bbappend create mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.%.bbappend delete mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.2.bbappend create mode 100644 meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.%.bbappend diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.2.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.2.bbappend deleted file mode 100644 index fcb7813..0000000 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.2.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.12.2 \ - file://gstomx.conf \ -" - -require include/rcar-gen3-path-common.inc - -DEPENDS += "omx-user-module mmngrbuf-user-module" - -SRCREV = "b836b899f9036221377302fa8e19c03ad5f92f96" - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://omx/gstomx.h;beginline=1;endline=22;md5=41f577b291a84518889deaaaf2bcbc95 \ -" - -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 = " libwayland-egl omx-user-module" -RDEPENDS_${PN}_remove = "libomxil" 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 new file mode 100644 index 0000000..c5052fb --- /dev/null +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.%.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.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-plugin-vspfilter_1.0.0.bb b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.0.bb deleted file mode 100644 index 9ef7d80..0000000 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "GStreamer VSP filter plugin" -SECTION = "multimedia" -LICENSE = "GPLv2+" -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base pkgconfig" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" -inherit autotools pkgconfig - -PN = "gstreamer1.0-plugin-vspfilter" - -EXTRA_AUTORECONF_append = " -I ${STAGING_DATADIR}/aclocal" - -VSPFILTER_CONF_r8a7795 = "gstvspfilter-${MACHINE}_r8a7795.conf" -VSPFILTER_CONF_r8a7796 = "gstvspfilter-${MACHINE}_r8a7796.conf" -VSPFILTER_CONF_r8a77965 = "gstvspfilter-${MACHINE}_r8a77965.conf" -VSPFILTER_CONF_r8a77990 = "gstvspfilter-${MACHINE}_r8a77990.conf" - -SRC_URI = " \ - git://github.com/renesas-rcar/gst-plugin-vspfilter.git;branch=RCAR-GEN3/1.0.0 \ - file://${VSPFILTER_CONF} \ -" - -SRCREV = "c506c57b6c169e0cd9578a294a829640a531c2d4" - -S = "${WORKDIR}/git" - -FILES_${PN} = " \ - ${libdir}/gstreamer-1.0/libgstvspfilter.so \ - ${sysconfdir}/gstvspfilter.conf" -FILES_${PN}-dev = "${libdir}/gstreamer-1.0/libgstvspfilter.la" -FILES_${PN}-staticdev = "${libdir}/gstreamer-1.0/libgstvspfilter.a" -FILES_${PN}-dbg = " \ - ${libdir}/gstreamer-1.0/.debug \ - ${prefix}/src" - -do_install_append() { - install -Dm 644 ${WORKDIR}/${VSPFILTER_CONF} ${D}/etc/gstvspfilter.conf -} - -RDEPENDS_${PN} = "kernel-module-vsp2driver" 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 new file mode 100644 index 0000000..e05cbb4 --- /dev/null +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb @@ -0,0 +1,52 @@ +SUMMARY = "GStreamer VSP filter plugin" +SECTION = "multimedia" +LICENSE = "GPLv2+" +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base pkgconfig" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" +inherit autotools pkgconfig + +PN = "gstreamer1.0-plugin-vspfilter" + +EXTRA_AUTORECONF_append = " -I ${STAGING_DATADIR}/aclocal" + +VSPFILTER_CONF_r8a7795 = "gstvspfilter-${MACHINE}_r8a7795.conf" +VSPFILTER_CONF_r8a7796 = "gstvspfilter-${MACHINE}_r8a7796.conf" +VSPFILTER_CONF_r8a77965 = "gstvspfilter-${MACHINE}_r8a77965.conf" +VSPFILTER_CONF_r8a77990 = "gstvspfilter-${MACHINE}_r8a77990.conf" + +SRC_URI = " \ + git://github.com/renesas-rcar/gst-plugin-vspfilter.git;branch=RCAR-GEN3/1.0.1 \ + file://${VSPFILTER_CONF} \ +" + +SRCREV = "71459157b4a39821713ccbf3563fe0c0e2003c57" + +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 +} + +FILES_${PN} = " \ + ${libdir}/gstreamer-1.0/libgstvspfilter.so \ + ${sysconfdir}/gstvspfilter.conf" +FILES_${PN}-dev = "${libdir}/gstreamer-1.0/libgstvspfilter.la" +FILES_${PN}-staticdev = "${libdir}/gstreamer-1.0/libgstvspfilter.a" +FILES_${PN}-dbg = " \ + ${libdir}/gstreamer-1.0/.debug \ + ${prefix}/src" + +do_install_append() { + install -Dm 644 ${WORKDIR}/${VSPFILTER_CONF} ${D}/etc/gstvspfilter.conf +} + +RDEPENDS_${PN} = "kernel-module-vsp2driver" diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.2.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.2.bbappend deleted file mode 100644 index d5bb643..0000000 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.2.bbappend +++ /dev/null @@ -1,29 +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.12.2" - -SRCREV = "db554fad172f2dabb0f7a75ef1e8e4cb35e172c9" - -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} -} - -RDEPENDS_gstreamer1.0-plugins-bad += "libwayland-egl" 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 new file mode 100644 index 0000000..e3d28dd --- /dev/null +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.%.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.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-good_1.12.2.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.2.bbappend deleted file mode 100644 index cf125bb..0000000 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.2.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.12.2" - -SRCREV = "3fd901306fb0fad520e7cbb6a3b0acc79e810700" - -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.%.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.%.bbappend new file mode 100644 index 0000000..3ac5977 --- /dev/null +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.%.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.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} +} -- cgit 1.2.3-korg