diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-09-10 10:28:13 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-10 22:58:33 +0100 |
commit | 82914e5dfb4ec362ffa2dc683a247b60ab4481af (patch) | |
tree | 29b0477aa08dca36bc2467e512718e8649443be6 | |
parent | 5f2748e492ce4e21386ef122e6c747f9aa8a4322 (diff) | |
download | poky-82914e5dfb4ec362ffa2dc683a247b60ab4481af.tar.gz |
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 <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc index 6f279577be..651119e2ed 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() { | |||
30 | fi | 30 | fi |
31 | } | 31 | } |
32 | 32 | ||
33 | python __anonymous () { | 33 | SRC_URI = "${@get_gst_srcuri(d)}" |
34 | |||
35 | def get_gst_srcuri(d): | ||
34 | # check if expected prefix is present | 36 | # check if expected prefix is present |
35 | prefix = "gstreamer1.0-" | 37 | prefix = "gstreamer1.0-" |
36 | bpn = d.getVar("BPN", True) | 38 | bpn = d.getVar("BPN", True) |
@@ -43,10 +45,10 @@ python __anonymous () { | |||
43 | branch = d.getVar("GSTREAMER_1_0_GIT_BRANCH", True) | 45 | branch = d.getVar("GSTREAMER_1_0_GIT_BRANCH", True) |
44 | 46 | ||
45 | if pv == "git": | 47 | if pv == "git": |
46 | d.setVar("SRC_URI", "git://anongit.freedesktop.org/gstreamer/%s;branch=%s" % (gstpkg_basename, branch)) | 48 | s = "git://anongit.freedesktop.org/gstreamer/%s;branch=%s" % (gstpkg_basename, branch) |
47 | else: | 49 | else: |
48 | d.setVar("SRC_URI", "http://gstreamer.freedesktop.org/src/%s/%s-%s.tar.xz" % (gstpkg_basename, gstpkg_basename, pv)) | 50 | s = "http://gstreamer.freedesktop.org/src/%s/%s-%s.tar.xz" % (gstpkg_basename, gstpkg_basename, pv) |
49 | } | 51 | return s |
50 | 52 | ||
51 | delete_liblink_m4_file() { | 53 | delete_liblink_m4_file() { |
52 | # This m4 file contains nastiness which conflicts with libtool 2.2.2 | 54 | # This m4 file contains nastiness which conflicts with libtool 2.2.2 |