summaryrefslogtreecommitdiffstats
path: root/meta-chiefriver
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-chiefriver
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-chiefriver')
-rw-r--r--meta-chiefriver/README15
-rw-r--r--meta-chiefriver/conf/machine/chiefriver.conf3
2 files changed, 17 insertions, 1 deletions
diff --git a/meta-chiefriver/README b/meta-chiefriver/README
index 49e4461..438c293 100644
--- a/meta-chiefriver/README
+++ b/meta-chiefriver/README
@@ -60,6 +60,21 @@ At the end of a successful build, you should have a live image that
60you can boot from a USB flash drive (see instructions on how to do 60you can boot from a USB flash drive (see instructions on how to do
61that below, in the section 'Booting the images from /binary'). 61that below, in the section 'Booting the images from /binary').
62 62
63NOTE: The 'chiefriver' machine will include support for hardware video
64acceleration via gstreamer if and only if the "commercial" string is
65added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
66
67For example:
68
69 LICENSE_FLAGS_WHITELIST = "commercial"
70
71The reason this is needed is to prevent the image from including
72anything that might violate the license terms of the packages used to
73implement the the video acceleration feature, such as gst-ffmpeg and
74ffmpeg. As always, please consult the licenses included in the
75specific packages for details if you use packages that require
76particular LICENSE_FLAGS.
77
63As an alternative to downloading the BSP tarball, you can also work 78As an alternative to downloading the BSP tarball, you can also work
64directly from the meta-intel git repository. For each BSP in the 79directly from the meta-intel git repository. For each BSP in the
65'meta-intel' repository, there are multiple branches, one 80'meta-intel' repository, there are multiple branches, one
diff --git a/meta-chiefriver/conf/machine/chiefriver.conf b/meta-chiefriver/conf/machine/chiefriver.conf
index 6d8d3a5..a9c8e5a 100644
--- a/meta-chiefriver/conf/machine/chiefriver.conf
+++ b/meta-chiefriver/conf/machine/chiefriver.conf
@@ -15,6 +15,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
15 ${XSERVER_IA32_I965} \ 15 ${XSERVER_IA32_I965} \
16 " 16 "
17 17
18VA_FEATURES ?= "gst-va-intel va-intel" 18VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \
19 "commercial", "gst-va-intel va-intel", "", d)}"
19 20
20MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES} lms" 21MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES} lms"