[PATCH 0/1] meta-intel: 'universe' build fix

[PATCH 0/1] meta-intel: 'universe' build fix

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

This patchset fixes a build problem seen in a meta-intel-gpl build.

The following changes since commit 97bf8bacd0e0e1fd67f4dcc5dff4237f7ff1ccbf:

  meta-cedartrail: add missing dependency on EXA module to X driver (2012-10-02 17:21:26 -0500)

are available in the git repository at:

  git://git.yoctoproject.org/meta-intel-contrib.git tzanussi/make-gst-va-intel-commercial
  http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-contrib/log/?h=tzanussi/make-gst-va-intel-commercial

Tom Zanussi (1):
  gst-va-intel: incude gst-ffmpeg only if 'commercial' is whitelisted

 common/recipes-multimedia/gstreamer/gst-va-intel.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
1.7.11.4

[PATCH 1/1] gst-va-intel: incude gst-ffmpeg only if 'commercial' is whitelisted

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

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>
---
 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 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"
 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 = "\
-- 
1.7.11.4