From edd483fde21e2bf581ebce1434f47b78d50ece20 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 19 Dec 2012 12:06:35 -0800 Subject: sys940x.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 Signed-off-by: Tom Zanussi --- meta-sys940x/conf/machine/sys940x.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta-sys940x') diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf index ce45a205..5f8868de 100644 --- a/meta-sys940x/conf/machine/sys940x.conf +++ b/meta-sys940x/conf/machine/sys940x.conf @@ -27,6 +27,10 @@ PREFERRED_VERSION_emgd-driver-bin ?= "1.14" SERIAL_CONSOLE = "115200 ttyS0" APPEND += "console=ttyS0,115200 console=tty0" -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_EXTRA_RRECOMMENDS += "${VA_FEATURES}" -- cgit v1.2.3-54-g00ecf