summaryrefslogtreecommitdiffstats
path: root/meta-crownbay
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-09-14 19:07:34 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2012-09-15 20:02:17 (GMT)
commit2231d3800e94e39a6cc77473c6654cb221e7e55b (patch)
tree7d0ea5b2a6c8f41832a33dd501b4a76bf1688193 /meta-crownbay
parent164e0c7418229a38d7c97cd6bb3117a89869f6a4 (diff)
downloadmeta-intel-2231d3800e94e39a6cc77473c6654cb221e7e55b.tar.gz
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>
Diffstat (limited to 'meta-crownbay')
-rw-r--r--meta-crownbay/README15
-rw-r--r--meta-crownbay/conf/machine/crownbay.conf3
2 files changed, 17 insertions, 1 deletions
diff --git a/meta-crownbay/README b/meta-crownbay/README
index 2521432..f7aeffa 100644
--- a/meta-crownbay/README
+++ b/meta-crownbay/README
@@ -92,6 +92,21 @@ At the end of a successful build, you should have a live image that
92you can boot from a USB flash drive (see instructions on how to do 92you can boot from a USB flash drive (see instructions on how to do
93that below, in the section 'Booting the images from /binary'). 93that below, in the section 'Booting the images from /binary').
94 94
95NOTE: The 'crownbay' machine will include support for hardware video
96acceleration via gstreamer if and only if the "commercial" string is
97added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
98
99For example:
100
101 LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.14 commercial"
102
103The reason this is needed is to prevent the image from including
104anything that might violate the license terms of the packages used to
105implement the the video acceleration feature, such as gst-ffmpeg and
106ffmpeg. As always, please consult the licenses included in the
107specific packages for details if you use packages that require
108particular LICENSE_FLAGS.
109
95As an alternative to downloading the BSP tarball, you can also work 110As an alternative to downloading the BSP tarball, you can also work
96directly from the meta-intel git repository. For each BSP in the 111directly from the meta-intel git repository. For each BSP in the
97'meta-intel' repository, there are multiple branches, one 112'meta-intel' repository, there are multiple branches, one
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index c4b7682..40dbd1d 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -23,6 +23,7 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
23 23
24APPEND += "video=vesafb vga=0x318" 24APPEND += "video=vesafb vga=0x318"
25 25
26VA_FEATURES ?= "gst-va-intel va-intel" 26VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \
27 "commercial", "gst-va-intel va-intel", "va-intel", d)}"
27 28
28MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" 29MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"