From e325704bbe62943ef1cc81cd8db3b9a11d5a05c7 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Mon, 27 Feb 2017 11:29:11 +0100 Subject: rcar-gen3: gstreamer: Clean gstreamer recipes to facilitate maintenance Gstreamer recipes bbappend should not overwrite SRC_URI. This commit modifies recipes to replace SRC_URI softly to make them easier to maintain. Signed-off-by: Ronan Le Martret Signed-off-by: Takamitsu Honda (cherry picked from commit 3bb303359436660de0711f4e877926a1923e94fc) --- .../recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bbappend | 3 ++- .../gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend | 9 +++------ .../gstreamer/gstreamer1.0-plugins-good_1.6.3.bbappend | 8 ++------ 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bbappend index 9fd8bf8..811efa1 100644 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bbappend +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.2.0.bbappend @@ -1,4 +1,5 @@ -SRC_URI = "git://github.com/renesas-rcar/gst-omx.git;branch=RCAR-GEN3/1.2.0" +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.2.0" DEPENDS += "omx-user-module mmngrbuf-user-module" diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend index 88e5126..a4e4af0 100644 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bbappend @@ -1,9 +1,6 @@ -SRC_URI = "git://github.com/renesas-rcar/gst-plugins-bad.git;branch=RCAR-GEN3/1.6.3" -SRC_URI += " \ - file://configure-allow-to-disable-libssh2.patch \ - file://0001-glimagesink-Downrank-to-marginal.patch \ - file://0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch \ -" +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.6.3" + SRCREV = "9b7c647fb89c137439c2edae5e96c44c8fe6337f" DEPENDS += "weston" diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.3.bbappend b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.3.bbappend index 39e7208..7c2a5e9 100644 --- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.3.bbappend +++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.3.bbappend @@ -1,9 +1,5 @@ -SRC_URI = "git://github.com/renesas-rcar/gst-plugins-good.git;branch=RCAR-GEN3/1.6.3" - -# patches come from poky -SRC_URI += " \ - file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch \ -" +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.6.3" SRCREV = "6770b1749f7ea1a56cc71ac94d48f9a9cf39af72" -- cgit 1.2.3-korg