summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-12-18 00:05:42 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2012-12-21 15:53:08 (GMT)
commit3d00ac1da6c2a1013a7cfc03d7ea94274bf6731a (patch)
tree1db56aee2a4e0e37bec7f4cdb4cc481b4e8006ee
parent3af6851d40cf3677dac09c2ba72ba70cc1364f88 (diff)
downloadmeta-intel-3d00ac1da6c2a1013a7cfc03d7ea94274bf6731a.tar.gz
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 <nitin.a.kamble@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-emenlow/conf/machine/emenlow.conf7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index de316b7..39da41c 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"
25 25
26APPEND += "video=vesafb vga=0x318 vmalloc=256MB" 26APPEND += "video=vesafb vga=0x318 vmalloc=256MB"
27 27
28VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ 28# Some of the EMGD components have dependency on libx11.
29 "commercial", "gst-va-intel va-intel", "va-intel", d)}" 29# Add these only when Xserver is enabled with the EMGD driver
30# Otherwise unwanted X components will start showing up in the non-X images
31VA_FEATURES ?= "gst-va-intel va-intel \
32 ${@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)}"
30 33
31MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" 34MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"