diff options
author | Khang Nguyen <khang.nguyen.xw@renesas.com> | 2020-04-24 20:42:44 +0900 |
---|---|---|
committer | Khang Nguyen <khang.nguyen.xw@renesas.com> | 2020-05-11 17:49:31 +0900 |
commit | 147145d8516b6ea455e2d453c374267c2a759252 (patch) | |
tree | dc13a9aa7aaa4eab05f28be181675ab8bafb1fd3 | |
parent | e805a5c751a7f417c5aa104fcbfc2d980cdcde84 (diff) |
rcar-gen3: gstreamer: Upgrade 1.16.0 -> 1.16.2
This commit upgrades GStreamer from 1.16.0 to 1.16.2.
Signed-off-by: Khang Nguyen <khang.nguyen.xw@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
Change-Id: I7e94b0869d2f9f204c45eabaf18cb16a792aa96a
-rw-r--r-- | meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bbappend (renamed from meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.0.bbappend) | 7 | ||||
-rw-r--r-- | meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb | 15 | ||||
-rw-r--r-- | meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bbappend (renamed from meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bbappend) | 10 | ||||
-rw-r--r-- | meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bbappend | 19 | ||||
-rw-r--r-- | meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bbappend | 13 |
5 files changed, 29 insertions, 35 deletions
diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.0.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bbappend index 5f1fd82..4e04595 100644 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.0.bbappend +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.16.2.bbappend @@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/:" SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" SRC_URI_append = " \ - gitsm://github.com/renesas-rcar/gst-omx.git;branch=RCAR-GEN3/1.16.0 \ + gitsm://github.com/renesas-rcar/gst-omx.git;branch=RCAR-GEN3/1.16.2 \ file://gstomx.conf \ " @@ -10,7 +10,7 @@ require include/rcar-gen3-path-common.inc DEPENDS += "omx-user-module mmngrbuf-user-module" -SRCREV = "e9a197cdb078f36d37fcb8ada868d5352ade2f77" +SRCREV = "8c65e10e4547384d6bf0611cf1ae9e752e184622" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://omx/gstomx.h;beginline=1;endline=22;md5=e2c6664eda77dc22095adbed9cb6c6e4 \ @@ -20,13 +20,12 @@ S = "${WORKDIR}/git" GSTREAMER_1_0_OMX_TARGET = "rcar" GSTREAMER_1_0_OMX_CORE_NAME = "${libdir}/libomxr_core.so" -EXTRA_OECONF_append = " --enable-experimental" +EXTRA_OEMESON_append = " -Dheader_path=${STAGING_DIR_TARGET}/usr/local/include" do_configure_prepend() { 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} } 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 dda9900..9018819 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 @@ -1,14 +1,16 @@ 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" COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)" +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base pkgconfig" + EXTRA_AUTORECONF_append = " -I ${STAGING_DATADIR}/aclocal" VSPFILTER_CONF_r8a7795 = "gstvspfilter-${MACHINE}_r8a7795.conf" @@ -21,18 +23,23 @@ SRC_URI = " \ file://${VSPFILTER_CONF} \ " -SRCREV = "e94cf40ab5515abd716b21f77caa48db0d077927" +SRCREV = "c66854c46af649be65eb371aa42ef35dcc858acf" S = "${WORKDIR}/git" FILES_${PN} = " \ ${libdir}/gstreamer-1.0/libgstvspfilter.so \ - ${sysconfdir}/gstvspfilter.conf" + ${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" + ${prefix}/src \ +" do_install_append() { install -Dm 644 ${WORKDIR}/${VSPFILTER_CONF} ${D}/etc/gstvspfilter.conf diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bbappend index fce5d09..63df2f4 100644 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bbappend +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bbappend @@ -1,14 +1,8 @@ SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz" -SRC_URI_append = " gitsm://github.com/renesas-rcar/gst-plugins-bad.git;branch=RCAR-GEN3/1.16.0" +SRC_URI_append = " gitsm://github.com/renesas-rcar/gst-plugins-bad.git;branch=RCAR-GEN3/1.16.2" -SRCREV = "7f334f733534a3a64d848df110da12af9650eaed" +SRCREV = "4459dc7686a2c20ed9097734e11d17631f71105a" DEPENDS += "weston" S = "${WORKDIR}/git" - -do_configure_prepend() { - cd ${S} - ./autogen.sh --noconfigure - cd ${B} -} diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bbappend deleted file mode 100644 index db223ba..0000000 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bbappend +++ /dev/null @@ -1,19 +0,0 @@ -SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" -SRC_URI_append = " gitsm://github.com/renesas-rcar/gst-plugins-good.git;branch=RCAR-GEN3/1.16.0" - -SRCREV = "8e4b5c16a9197219b66e167dd03d0a8800a95ed4" - -DEPENDS += "mmngrbuf-user-module" - -S = "${WORKDIR}/git" - -EXTRA_OECONF_append = " \ - --enable-cont-frame-capture \ - --enable-ignore-fps-of-video-standard \ -" - -do_configure_prepend() { - cd ${S} - ./autogen.sh --noconfigure - cd ${B} -} diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bbappend new file mode 100644 index 0000000..f9bd2f3 --- /dev/null +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bbappend @@ -0,0 +1,13 @@ +SRC_URI_remove = "http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" +SRC_URI_append = " gitsm://github.com/renesas-rcar/gst-plugins-good.git;branch=RCAR-GEN3/1.16.2" + +SRCREV = "5588c8b83e77d5419e498ada54eef0c183486172" + +DEPENDS += "mmngrbuf-user-module" + +S = "${WORKDIR}/git" + +EXTRA_OEMESON_append = " \ + -Dcont-frame-capture=true \ + -Dignore-fps-of-video-standard=true \ +" |