Patchwork gstreamer-plugins: Change anonymous python structure

login
register
mail settings
Submitter Saul Wold
Date Sept. 9, 2013, 9:29 p.m.
Message ID <1378762160-25151-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/57715/
State Accepted
Commit 787335494dc0a3f93d9bf5a6cf1b603c8675df66
Headers show

Comments

Saul Wold - Sept. 9, 2013, 9:29 p.m.
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]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Patch

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