From bfe7d3032a61a20010b5b758be07581e1bf01cba Mon Sep 17 00:00:00 2001 From: Awais Belal Date: Mon, 29 Dec 2014 14:46:48 +0500 Subject: [PATCH] gstreamer1.0-omx: use mulitple SCMs to fetch submodules The gstreamer omx package uses a submodule 'common' which is fetched by the configure script. This approach fails on non-network builds as the fetcher tries to look upstream for the submodule. We now use multiple SCMs, one for the main omx package and the other for the 'common' submodule so it is available in the downloads_dir for later use. (From OE-Core rev: 24f19fedb40d0af84beb8e9a6595ea06f09d4615) Signed-off-by: Awais Belal Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0-omx_git.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb index 931a7fcc96..99c84668ef 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb @@ -6,12 +6,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f" SRC_URI = " \ - git://anongit.freedesktop.org/gstreamer/gst-omx;branch=master \ - file://0001-omx-fixed-type-error-in-printf-call.patch \ + git://anongit.freedesktop.org/gstreamer/gst-omx;branch=master;name=gst-omx \ + git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;branch=master;name=common \ + file://0001-omx-fixed-type-error-in-printf-call.patch \ " + S = "${WORKDIR}/git" -SRCREV = "a2db76b048db278ef0aa798e106b7594264e06c0" +SRCREV_gst-omx = "a2db76b048db278ef0aa798e106b7594264e06c0" +SRCREV_common = "5edcd857b2107cd8b78c16232dd10877513ec157" + +SRCREV_FORMAT = "gst-omx" do_configure_prepend() { cd ${S}