From 521a8a6bc41bc11bd29b60b5f90a495a38a3bed0 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Thu, 24 Jan 2013 17:38:02 -0800 Subject: fri2.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-fri2/conf/machine/fri2.conf | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'meta-fri2') diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 12184b21..40f2cdca 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf @@ -9,14 +9,12 @@ require conf/machine/include/tune-atom.inc require conf/machine/include/ia32-base.inc require conf/machine/include/meta-intel.inc -# 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_HWCODECS ?= "va-intel" +XSERVERCODECS ?= "emgd-driver-video emgd-gst-plugins-va \ + emgd-gst-plugins-mixvideo gst-va-intel" MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo" -MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" +MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto = "3.4%" -- cgit v1.2.3-54-g00ecf