diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2013-01-23 15:30:08 -0800 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2013-01-24 22:50:58 -0600 |
commit | f3bccf8f0c91b4edff480327895dff5efb792f82 (patch) | |
tree | ebc0e4a1dc6a9e88bcbe5b99c7157d187b5f5f33 /meta-crownbay/conf | |
parent | 7482323f21df57bc763a9ceba521396bedacae28 (diff) | |
download | meta-intel-f3bccf8f0c91b4edff480327895dff5efb792f82.tar.gz |
crownbay.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-crownbay/conf')
-rw-r--r-- | meta-crownbay/conf/machine/crownbay.conf | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index e714a948..86491899 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf | |||
@@ -14,6 +14,10 @@ require conf/machine/include/meta-intel.inc | |||
14 | 14 | ||
15 | MACHINE_FEATURES += "va-impl-mixvideo" | 15 | MACHINE_FEATURES += "va-impl-mixvideo" |
16 | 16 | ||
17 | MACHINE_HWCODECS ?= "va-intel" | ||
18 | XSERVERCODECS ?= "emgd-driver-video emgd-gst-plugins-va \ | ||
19 | emgd-gst-plugins-mixvideo gst-va-intel" | ||
20 | |||
17 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 21 | XSERVER ?= "${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" | |||
25 | PREFERRED_VERSION_emgd-driver-bin ?= "1.16" | 29 | PREFERRED_VERSION_emgd-driver-bin ?= "1.16" |
26 | 30 | ||
27 | APPEND += "video=vesafb vga=0x318 vmalloc=256MB" | 31 | APPEND += "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 | ||
32 | VA_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 | |||
35 | MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" | ||