From 2c1e927fa99abe47865a03cf661d4757ff3147c6 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 2 Oct 2012 22:17:23 -0500 Subject: gst-va-intel: incude gst-ffmpeg only if 'commercial' is whitelisted 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 --- common/recipes-multimedia/gstreamer/gst-va-intel.bb | 5 +++-- 1 file 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 516e5f19..ee04839c 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" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r1" +PR = "r2" def map_gst_vaapi(d): if base_contains('MACHINE_FEATURES', 'va-impl-mixvideo', "1", "0", d) == "1": @@ -31,7 +31,8 @@ RDEPENDS_gst-va-intel = "\ " RDEPENDS_gst-va-intel-general = "\ - gst-ffmpeg \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ + "commercial", "gst-ffmpeg", "", d)} \ " RDEPENDS_gst-va-intel-video = "\ -- cgit v1.2.3-54-g00ecf