summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-10-03 03:17:23 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2012-10-03 03:56:20 (GMT)
commit2c1e927fa99abe47865a03cf661d4757ff3147c6 (patch)
tree9ac3e5f613fc81df3bc66a4223ad8b0863928add
parent97bf8bacd0e0e1fd67f4dcc5dff4237f7ff1ccbf (diff)
downloadmeta-intel-2c1e927fa99abe47865a03cf661d4757ff3147c6.tar.gz
gst-va-intel: incude gst-ffmpeg only if 'commercial' is whitelisted1.3_M5.rc3
World and universe builds break if the newly commercial gst-ffmpeg is included without a 'commercial' entry in LICENSE_FLAGS_WHITELIST, so only add gst-ffmpeg if that's the case. Normally BSPs conditionally include gst-va-intel and thus gst-ffmpeg is included in the build only if 'commercial' is added to LICENSE_FLAGS_WHITELIST and therefore this isn't an issue, but world and universe builds are different. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--common/recipes-multimedia/gstreamer/gst-va-intel.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/common/recipes-multimedia/gstreamer/gst-va-intel.bb b/common/recipes-multimedia/gstreamer/gst-va-intel.bb
index 516e5f1..ee04839 100644
--- a/common/recipes-multimedia/gstreamer/gst-va-intel.bb
+++ b/common/recipes-multimedia/gstreamer/gst-va-intel.bb
@@ -4,7 +4,7 @@ DEPENDS = "gst-meta-base"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
5 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 5 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
6 6
7PR = "r1" 7PR = "r2"
8 8
9def map_gst_vaapi(d): 9def map_gst_vaapi(d):
10 if base_contains('MACHINE_FEATURES', 'va-impl-mixvideo', "1", "0", d) == "1": 10 if base_contains('MACHINE_FEATURES', 'va-impl-mixvideo', "1", "0", d) == "1":
@@ -31,7 +31,8 @@ RDEPENDS_gst-va-intel = "\
31 " 31 "
32 32
33RDEPENDS_gst-va-intel-general = "\ 33RDEPENDS_gst-va-intel-general = "\
34 gst-ffmpeg \ 34 ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \
35 "commercial", "gst-ffmpeg", "", d)} \
35 " 36 "
36 37
37RDEPENDS_gst-va-intel-video = "\ 38RDEPENDS_gst-va-intel-video = "\