From 82914e5dfb4ec362ffa2dc683a247b60ab4481af Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 10 Sep 2013 10:28:13 -0700 Subject: gstreamer-plugins: Change anonymous python structure This change ensures that the SRC_URI is set before base.bbclass code is called. This will also ensure that the xz-native depends is set correct. [YOCTO #5127] (From OE-Core rev: 787335494dc0a3f93d9bf5a6cf1b603c8675df66) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc index 6f27957..651119e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc @@ -30,7 +30,9 @@ oe_runconf_prepend() { fi } -python __anonymous () { +SRC_URI = "${@get_gst_srcuri(d)}" + +def get_gst_srcuri(d): # check if expected prefix is present prefix = "gstreamer1.0-" bpn = d.getVar("BPN", True) @@ -43,10 +45,10 @@ python __anonymous () { branch = d.getVar("GSTREAMER_1_0_GIT_BRANCH", True) if pv == "git": - d.setVar("SRC_URI", "git://anongit.freedesktop.org/gstreamer/%s;branch=%s" % (gstpkg_basename, branch)) + s = "git://anongit.freedesktop.org/gstreamer/%s;branch=%s" % (gstpkg_basename, branch) else: - d.setVar("SRC_URI", "http://gstreamer.freedesktop.org/src/%s/%s-%s.tar.xz" % (gstpkg_basename, gstpkg_basename, pv)) -} + s = "http://gstreamer.freedesktop.org/src/%s/%s-%s.tar.xz" % (gstpkg_basename, gstpkg_basename, pv) + return s delete_liblink_m4_file() { # This m4 file contains nastiness which conflicts with libtool 2.2.2 -- cgit v1.1