From 4f676959c35cbd0ed9ac6a1817993d38611859e1 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Thu, 24 Jan 2013 17:39:45 -0800 Subject: sys940x.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-sys940x/conf/machine/sys940x.conf | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf index e47c720c..bc03db0f 100644 --- a/meta-sys940x/conf/machine/sys940x.conf +++ b/meta-sys940x/conf/machine/sys940x.conf @@ -14,6 +14,10 @@ MACHINE_FEATURES += "efi pcbios gst-va-mixvideo" PREFERRED_VERSION_linux-yocto ?= "3.4%" +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} \ @@ -26,11 +30,3 @@ PREFERRED_VERSION_emgd-driver-bin ?= "1.14" SERIAL_CONSOLE = "115200 ttyS0" APPEND += "console=ttyS0,115200 console=tty0" - -# 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