From f3bccf8f0c91b4edff480327895dff5efb792f82 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 23 Jan 2013 15:30:08 -0800 Subject: 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 Signed-off-by: Nitin A Kamble Signed-off-by: Tom Zanussi --- meta-crownbay/conf/machine/crownbay.conf | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'meta-crownbay/conf') 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 MACHINE_FEATURES += "va-impl-mixvideo" +MACHINE_HWCODECS ?= "va-intel" +XSERVERCODECS ?= "emgd-driver-video emgd-gst-plugins-va \ + emgd-gst-plugins-mixvideo gst-va-intel" + XSERVER ?= "${XSERVER_IA32_BASE} \ ${XSERVER_IA32_EXT} \ ${XSERVER_IA32_EMGD} \ @@ -25,11 +29,3 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" PREFERRED_VERSION_emgd-driver-bin ?= "1.16" APPEND += "video=vesafb vga=0x318 vmalloc=256MB" - -# 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 emgd-gst-plugins-mixvideo", "", d)}" - -MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" -- cgit v1.2.3-54-g00ecf