From 2231d3800e94e39a6cc77473c6654cb221e7e55b Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 14 Sep 2012 14:07:34 -0500 Subject: 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 --- meta-fri2/README | 15 +++++++++++++++ meta-fri2/conf/machine/fri2.conf | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'meta-fri2') diff --git a/meta-fri2/README b/meta-fri2/README index 2208392f..a8661744 100644 --- a/meta-fri2/README +++ b/meta-fri2/README @@ -113,6 +113,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 'fri2' 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_emgd-driver-bin_1.10 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-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 56408f7e..bf7754fc 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf @@ -8,7 +8,8 @@ require conf/machine/include/tune-atom.inc require conf/machine/include/ia32-base.inc require conf/machine/include/meta-intel.inc -VA_FEATURES ?= "gst-va-intel va-intel" +VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ + "commercial", "gst-va-intel va-intel", "va-intel", d)}" MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" -- cgit v1.2.3-54-g00ecf