summaryrefslogtreecommitdiffstats
path: root/meta-fri2
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-10-22 12:39:44 +0100
committerTom Zanussi <tom.zanussi@intel.com>2012-10-22 09:09:28 -0500
commit71619f5ef05a3ca3a2a6b19764f6a8a93f011d67 (patch)
tree035858104847eaa4229b7040ce9b7576e8f8dd23 /meta-fri2
parent4e05f868bb8ab2fd80b510a6bee30795e634655d (diff)
downloadmeta-intel-71619f5ef05a3ca3a2a6b19764f6a8a93f011d67.tar.gz
meta-intel: don't require commercial licenses for gstreamer-vaapi
Now that gstreamer-vaapi doesn't depend on ffmpeg, it can always be recommended by the machine configuration. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-fri2')
-rw-r--r--meta-fri2/conf/machine/fri2.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index dff11a88..587b976d 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -8,8 +8,7 @@ require conf/machine/include/tune-atom.inc
8require conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
9require conf/machine/include/meta-intel.inc 9require conf/machine/include/meta-intel.inc
10 10
11VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ 11VA_FEATURES = "gst-va-intel va-intel"
12 "commercial", "gst-va-intel va-intel", "va-intel", d)}"
13 12
14MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" 13MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo"
15MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" 14MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}"