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>

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
 require conf/machine/include/ia32-base.inc
 require conf/machine/include/meta-intel.inc
 
-VA_FEATURES ?= "gst-va-intel va-intel"
+# Some of the EMGD components have dependency on libx11.
+# Add these only when Xserver is enabled with the EMGD driver
+# Otherwise unwanted X components will start showing up in the non-X images
+VA_FEATURES ?= "gst-va-intel va-intel \
+                ${@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)}"
 
 MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo"
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}"