From 1bc9e7efaed8d71bc9daee14418feeaca5de8ee8 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 26 Nov 2013 16:01:48 +0100 Subject: [PATCH] meta-digi: add video player to graphical image Also remove 'gplay' utility from dey-image-graphical. It's a command line application suitable to be used on minimal (non-X) images. Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/imx-digi-base.inc | 2 +- meta-digi-dey/recipes-core/images/dey-image-graphical.bb | 7 ++++--- .../packagegroups/packagegroup-dey-gstreamer.bb | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index 5070a2f8b..5aaecd7c3 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -17,7 +17,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" MACHINE_EXTRA_RRECOMMENDS += "imx-audio" # Gstreamer plugin -MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin gst-fsl-plugin-gplay" +MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin" # MX5 GPU libraries GPU_FLAVOUR = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11-', '', d)}" diff --git a/meta-digi-dey/recipes-core/images/dey-image-graphical.bb b/meta-digi-dey/recipes-core/images/dey-image-graphical.bb index faf01fb70..de0ca0a80 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-graphical.bb +++ b/meta-digi-dey/recipes-core/images/dey-image-graphical.bb @@ -18,6 +18,7 @@ SOC_IMAGE_INSTALL = "" SOC_IMAGE_INSTALL_mx5 = "amd-gpu-x11-bin-mx51" IMAGE_INSTALL += " \ - ${SOC_IMAGE_INSTALL} \ - pointercal-xinput \ - " + ${SOC_IMAGE_INSTALL} \ + owl-video \ + pointercal-xinput \ +" diff --git a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb index e54054aab..f52e5b7e8 100644 --- a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb +++ b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb @@ -19,6 +19,7 @@ RDEPENDS_${PN} = " \ gst-plugins-ugly-meta \ gst-plugins-bad-meta \ ${MACHINE_GSTREAMER_PLUGIN} \ + ${@base_conditional('HAVE_GUI', '1' , '', 'gst-fsl-plugin-gplay', d)} \ " ALLOW_EMPTY_${PN} = "1"