meta-intel: make video acceleration choice dependent on LICENSE_FLAGS

The gst-ffmpeg recipe in oe-core had LICENSE_FLAGS added to make it
"commercial", so to avoid build errors the BSPs that use it (via the
gst-va-intel VA_FEATURE) should only include it if the user has added
"commercial" to LICENSE_FLAGS_WHITELIST when building.

This adds a conditional to detect that, along with a NOTE in the
README to explain the need for the flag.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>

2 files changed, 17 insertions, 1 deletions

diff --git a/meta-cedartrail/README b/meta-cedartrail/README
index e47151e3..81a1260c 100755
--- a/meta-cedartrail/README
+++ b/meta-cedartrail/README
@@ -88,6 +88,21 @@ At the end of a successful build, you should have a live image that
 you can boot from a USB flash drive (see instructions on how to do
 that below, in the section 'Booting the images from /binary').
 
+NOTE: The 'cedartrail' machine will include support for hardware video
+acceleration via gstreamer if and only if the "commercial" string is
+added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
+
+For example:
+
+  LICENSE_FLAGS_WHITELIST = "license_cdv-pvr-driver_1.0.3 commercial"
+
+The reason this is needed is to prevent the image from including
+anything that might violate the license terms of the packages used to
+implement the the video acceleration feature, such as gst-ffmpeg and
+ffmpeg.  As always, please consult the licenses included in the
+specific packages for details if you use packages that require
+particular LICENSE_FLAGS.
+
 As an alternative to downloading the BSP tarball, you can also work
 directly from the meta-intel git repository.  For each BSP in the
 'meta-intel' repository, there are multiple branches, one
diff --git a/meta-cedartrail/conf/machine/cedartrail.conf b/meta-cedartrail/conf/machine/cedartrail.conf
index cd9acd7c..33af0121 100644
--- a/meta-cedartrail/conf/machine/cedartrail.conf
+++ b/meta-cedartrail/conf/machine/cedartrail.conf
@@ -22,6 +22,7 @@ SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
 APPEND += "console=ttyS0,115200 console=tty0"
 
-VA_FEATURES ?= "gst-va-intel va-intel"
+VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \
+            "commercial", "gst-va-intel va-intel", "", d)}"
 
 MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"