diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-12-19 12:05:09 -0800 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2012-12-21 09:58:14 -0600 |
commit | fdbf8ff892884451bb90433f575dd79255c71cbe (patch) | |
tree | b550b57e1144b75ae1a471bcb3c2067d426eeab6 /meta-fri2/conf | |
parent | 3d00ac1da6c2a1013a7cfc03d7ea94274bf6731a (diff) | |
download | meta-intel-fdbf8ff892884451bb90433f575dd79255c71cbe.tar.gz |
fri2.conf: add EMGD VA components to VA_FEATURES variable
The following EMGD subpackages provide video acceleration and have
dependencies on libva and libx11:
emgd-driver-video
emgd-gst-plugins-va-0.10.10
emgd-gst-plugins-mixvideo-0.10.34
Include these in the VA_FEATURES variable only when the EMGD XSERVER
is included in the image.
For images such as core-image-lsb which do not include X components,
including any of these emgd subpackages will pull in unwanted X
components. This fixes that problem.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-fri2/conf')
-rw-r--r-- | meta-fri2/conf/machine/fri2.conf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index ec343f2f..0efba2a3 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf | |||
@@ -9,7 +9,11 @@ require conf/machine/include/tune-atom.inc | |||
9 | require conf/machine/include/ia32-base.inc | 9 | require conf/machine/include/ia32-base.inc |
10 | require conf/machine/include/meta-intel.inc | 10 | require conf/machine/include/meta-intel.inc |
11 | 11 | ||
12 | VA_FEATURES ?= "gst-va-intel va-intel" | 12 | # Some of the EMGD components have dependency on libx11. |
13 | # Add these only when Xserver is enabled with the EMGD driver | ||
14 | # Otherwise unwanted X components will start showing up in the non-X images | ||
15 | VA_FEATURES ?= "gst-va-intel va-intel \ | ||
16 | ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va-0.10.10 emgd-gst-plugins-mixvideo-0.10.34", "", d)}" | ||
13 | 17 | ||
14 | MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" | 18 | MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" |
15 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" | 19 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" |