Now that gstreamer-vaapi doesn't depend on ffmpeg, it can always be recommended by the machine configuration.
Signed-off-by: Ross Burton <ross.bur...@intel.com> --- meta-cedartrail/conf/machine/cedartrail.conf | 5 +---- meta-chiefriver/conf/machine/chiefriver.conf | 5 +---- meta-crownbay/conf/machine/crownbay.conf | 5 +---- meta-fri2/conf/machine/fri2.conf | 5 +---- meta-sugarbay/conf/machine/sugarbay.conf | 5 +---- meta-sys940x/conf/machine/sys940x.conf | 5 +---- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/meta-cedartrail/conf/machine/cedartrail.conf b/meta-cedartrail/conf/machine/cedartrail.conf index ea50ea6..40920fe 100644 --- a/meta-cedartrail/conf/machine/cedartrail.conf +++ b/meta-cedartrail/conf/machine/cedartrail.conf @@ -22,7 +22,4 @@ SYSLINUX_OPTS = "serial 0 115200" SERIAL_CONSOLE = "115200 ttyS0" APPEND += "console=ttyS0,115200 console=tty0" -VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ - "commercial", "gst-va-intel va-intel", "", d)}" - -MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" +MACHINE_EXTRA_RRECOMMENDS += "gst-va-intel va-intel" diff --git a/meta-chiefriver/conf/machine/chiefriver.conf b/meta-chiefriver/conf/machine/chiefriver.conf index a9c8e5a..8074623 100644 --- a/meta-chiefriver/conf/machine/chiefriver.conf +++ b/meta-chiefriver/conf/machine/chiefriver.conf @@ -15,7 +15,4 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ ${XSERVER_IA32_I965} \ " -VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ - "commercial", "gst-va-intel va-intel", "", d)}" - -MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES} lms" +MACHINE_EXTRA_RRECOMMENDS += "gst-va-intel va-intel lms" diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index 72431de..bc0b0f9 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf @@ -23,7 +23,4 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" APPEND += "video=vesafb vga=0x318 vmalloc=256MB" -VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ - "commercial", "gst-va-intel va-intel", "va-intel", d)}" - -MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" +MACHINE_EXTRA_RRECOMMENDS += "gst-va-intel va-intel" diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index dff11a8..46fd7a7 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf @@ -8,11 +8,8 @@ require conf/machine/include/tune-atom.inc require conf/machine/include/ia32-base.inc require conf/machine/include/meta-intel.inc -VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ - "commercial", "gst-va-intel va-intel", "va-intel", d)}" - 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 gst-va-intel va-intel" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" PREFERRED_VERSION_linux-yocto = "3.4%" diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf index 17cc15c..3282fc8 100644 --- a/meta-sugarbay/conf/machine/sugarbay.conf +++ b/meta-sugarbay/conf/machine/sugarbay.conf @@ -16,7 +16,4 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ ${XSERVER_IA32_I965} \ " -VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ - "commercial", "gst-va-intel va-intel", "", d)}" - -MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" +MACHINE_EXTRA_RRECOMMENDS += "gst-va-intel va-intel" diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf index bdd655f..7e0d289 100644 --- a/meta-sys940x/conf/machine/sys940x.conf +++ b/meta-sys940x/conf/machine/sys940x.conf @@ -26,7 +26,4 @@ PREFERRED_VERSION_emgd-driver-bin ?= "1.14" SERIAL_CONSOLE = "115200 ttyS0" APPEND += "console=ttyS0,115200 console=tty0" -VA_FEATURES = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", \ - "commercial", "gst-va-intel va-intel", "va-intel", d)}" - -MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}" +MACHINE_EXTRA_RRECOMMENDS += "gst-va-intel va-intel" -- 1.7.10 _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto