From 7bdd639621107dc0f04975b2c473d9d6ee2aa6c8 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 23 Oct 2015 11:23:28 +0200 Subject: [PATCH] meta-digi: add gstreamer-1.0 to DEY images https://jira.digi.com/browse/DEL-1850 Signed-off-by: Javier Viguera --- .../conf/machine/include/imx-digi-base.inc | 6 +++--- .../conf/machine/include/mxs-digi-base.inc | 2 +- .../gst-plugins-base_0.10.36.bbappend | 0 .../packagegroups/packagegroup-dey-gstreamer.bb | 17 ++++++++++++++++- 4 files changed, 20 insertions(+), 5 deletions(-) rename meta-digi-dey/recipes-multimedia/{gst-plugins => gstreamer}/gst-plugins-base_0.10.36.bbappend (100%) 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 c536e08e9..e46ff7b24 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -30,7 +30,7 @@ MACHINE_SOCARCH_SUFFIX_mx6q = "-mx6qdl" MACHINE_SOCARCH_SUFFIX_mx6dl = "-mx6qdl" MACHINE_ARCH_FILTER = "virtual/kernel" -MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser gst-fsl-plugins" +MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser gst-fsl-plugin" MACHINE_SOCARCH_FILTER_append_mx5 = " virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl" MACHINE_SOCARCH_FILTER_append_mx6 = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" @@ -44,8 +44,8 @@ MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin" # GStreamer 1.0 plugins MACHINE_GSTREAMER_1_0_PLUGIN ?= "" -MACHINE_GSTREAMER_1_0_PLUGIN_mx6q ?= "gstreamer1.0-plugins-imx-meta" -MACHINE_GSTREAMER_1_0_PLUGIN_mx6dl ?= "gstreamer1.0-plugins-imx-meta" +MACHINE_GSTREAMER_1_0_PLUGIN_mx6q ?= "gst1.0-fsl-plugin" +MACHINE_GSTREAMER_1_0_PLUGIN_mx6dl ?= "gst1.0-fsl-plugin" # mx5 GPU libraries GPU_FLAVOUR = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11-', '', d)}" diff --git a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc index e1a94463f..7705bd701 100644 --- a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc @@ -14,7 +14,7 @@ MACHINE_SOCARCH_SUFFIX ?= "" MACHINE_SOCARCH_SUFFIX_mx28 = "-mx28" MACHINE_ARCH_FILTER = "virtual/kernel" -MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser gst-fsl-plugins" +MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser gst-fsl-plugin" INHERIT += "fsl-dynamic-packagearch" diff --git a/meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-base_0.10.36.bbappend b/meta-digi-dey/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bbappend similarity index 100% rename from meta-digi-dey/recipes-multimedia/gst-plugins/gst-plugins-base_0.10.36.bbappend rename to meta-digi-dey/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bbappend 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 1f6d6e4c6..987a16c8d 100644 --- a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb +++ b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb @@ -10,7 +10,7 @@ inherit packagegroup MACHINE_GSTREAMER_PLUGIN ?= "" -RDEPENDS_${PN} = " \ +GSTREAMER0_PKGS = " \ gst-meta-audio \ gst-meta-video \ gst-plugins-base-meta \ @@ -21,3 +21,18 @@ RDEPENDS_${PN} = " \ ${@base_conditional('HAVE_GUI', '1' , '', 'gst-fsl-plugin-gplay', d)} \ ${@base_conditional('HAVE_BT', '1' , 'gst-plugin-bluetooth', '', d)} \ " + +GSTREAMER1_PKGS = " \ + gstreamer1.0-meta-audio \ + gstreamer1.0-meta-video \ + gstreamer1.0-plugins-base-meta \ + gstreamer1.0-plugins-good-meta \ + gstreamer1.0-plugins-ugly-meta \ + gstreamer1.0-plugins-bad-meta \ + ${MACHINE_GSTREAMER_1_0_PLUGIN} \ +" + +RDEPENDS_${PN} = " \ + ${GSTREAMER0_PKGS} \ + ${GSTREAMER1_PKGS} \ +"