summaryrefslogtreecommitdiffstats
path: root/meta-emenlow
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2013-01-23 23:30:08 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2013-01-25 04:50:46 (GMT)
commit7482323f21df57bc763a9ceba521396bedacae28 (patch)
tree17996ea5103bf46ed4bd0f29f315e1d21d5e07d2 /meta-emenlow
parentf9b9361eeb0bae697afc6db750bcfdbfbfe1a090 (diff)
downloadmeta-intel-7482323f21df57bc763a9ceba521396bedacae28.tar.gz
emenlow.conf: use the new method for specifying VA codecs
This replaces the old VA_FEATURES method to specify the codecs. These VA codecs are included in the image when image has 'hwcodec' in the IMAGE_FEATURES. And one can disable the VA features by redefining the IMAGE_FEATURES var in the local.conf . The gst-va-intel package pulls in emgd driver and x11 pieces, hence it is moved to the XSERVERCODECS var. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-emenlow')
-rw-r--r--meta-emenlow/conf/machine/emenlow.conf12
1 files changed, 4 insertions, 8 deletions
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index a3c4086..84a1827 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -14,6 +14,10 @@ require conf/machine/include/meta-intel.inc
14 14
15MACHINE_FEATURES += "va-impl-mixvideo" 15MACHINE_FEATURES += "va-impl-mixvideo"
16 16
17MACHINE_HWCODECS ?= "va-intel"
18XSERVERCODECS ?= "emgd-driver-video emgd-gst-plugins-va \
19 emgd-gst-plugins-mixvideo gst-va-intel"
20
17XSERVER ?= "${XSERVER_IA32_BASE} \ 21XSERVER ?= "${XSERVER_IA32_BASE} \
18 ${XSERVER_IA32_EXT} \ 22 ${XSERVER_IA32_EXT} \
19 ${XSERVER_IA32_EMGD} \ 23 ${XSERVER_IA32_EMGD} \
@@ -25,11 +29,3 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
25PREFERRED_VERSION_emgd-driver-bin ?= "1.16" 29PREFERRED_VERSION_emgd-driver-bin ?= "1.16"
26 30
27APPEND += "video=vesafb vga=0x318 vmalloc=256MB" 31APPEND += "video=vesafb vga=0x318 vmalloc=256MB"
28
29# Some of the EMGD components have dependency on libx11.
30# Add these only when Xserver is enabled with the EMGD driver
31# Otherwise unwanted X components will start showing up in the non-X images
32VA_FEATURES ?= "gst-va-intel va-intel \
33 ${@bb.utils.contains("XSERVER", "emgd-driver-bin", "emgd-driver-video emgd-gst-plugins-va emgd-gst-plugins-mixvideo", "", d)}"
34
35MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"