summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-30 14:53:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 07:43:36 +0100
commita0d6322374815a9945e3960809f0d0bef2f6126a (patch)
tree08cdf108b99290e8b13c1bfbcdb67514cf9bc8c8
parentc71bd579147b26a5147507a2f10dd4c44aad13ed (diff)
downloadpoky-a0d6322374815a9945e3960809f0d0bef2f6126a.tar.gz
gstreamer-omx: Improve variable expansion of ${S}
The way ${S} is expanded into CFLAGS means the recipe is marked as depending on the path within which its built. We can avoid this by avoiding the expansion which then allows reuse of the recipe from sstate. (From OE-Core rev: 560e778589afbc5da9a20bd0fbba09b910207604) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
index d698904349..26c13361fe 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
@@ -20,11 +20,10 @@ EXTRA_OECONF += "--disable-valgrind --with-omx-target=${GSTREAMER_1_0_OMX_TARGET
20python __anonymous () { 20python __anonymous () {
21 omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET", True) 21 omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET", True)
22 if omx_target in ['generic', 'bellagio']: 22 if omx_target in ['generic', 'bellagio']:
23 srcdir = d.getVar("S", True)
24 # Bellagio headers are incomplete (they are missing the OMX_VERSION_MAJOR,# 23 # Bellagio headers are incomplete (they are missing the OMX_VERSION_MAJOR,#
25 # OMX_VERSION_MINOR, OMX_VERSION_REVISION, and OMX_VERSION_STEP macros); 24 # OMX_VERSION_MINOR, OMX_VERSION_REVISION, and OMX_VERSION_STEP macros);
26 # appending a directory path to gst-omx' internal OpenMAX IL headers fixes this 25 # appending a directory path to gst-omx' internal OpenMAX IL headers fixes this
27 d.appendVar("CFLAGS", " -I%s/omx/openmax" % srcdir) 26 d.appendVar("CFLAGS", " -I${S}/omx/openmax")
28 elif omx_target == "rpi": 27 elif omx_target == "rpi":
29 # Dedicated Raspberry Pi OpenMAX IL support makes this package machine specific 28 # Dedicated Raspberry Pi OpenMAX IL support makes this package machine specific
30 d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH", True)) 29 d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH", True))