From 3d00ac1da6c2a1013a7cfc03d7ea94274bf6731a Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Mon, 17 Dec 2012 16:05:42 -0800 Subject: emenlow.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-emenlow/conf/machine/emenlow.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta-emenlow') diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf index de316b7d..39da41cb 100644 --- a/meta-emenlow/conf/machine/emenlow.conf +++ b/meta-emenlow/conf/machine/emenlow.conf @@ -25,7 +25,10 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" APPEND += "video=vesafb vga=0x318 vmalloc=256MB" -VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ - "commercial", "gst-va-intel va-intel", "va-intel", d)}" +# 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