[meta-freescale] [meta-fsl-arm][PATCH 1/5] gst-fsl-plugin: Make a common include file for 0.1 and 1.0 gstreamer plugins

[Zidan Wang]

From: Wang Zidan <b50113 at freescale.com>

To avoid duplication, use one include file that supports both 0.1 and 1.0 gstreamer plugins common features.
Gstreamer Freescale  0.1 specific features moved into the 0.1 recipe.
Gstreamer Freescale 1.0 specific features moved into the 1.0 recipe.

Signed-off-by: Wang Zidan <b50113 at freescale.com>
---
 recipes-multimedia/gstreamer/gst-fsl-plugin.inc    |   18 +-----------------
 .../gstreamer/gst-fsl-plugin_3.0.11.bb             |   20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/recipes-multimedia/gstreamer/gst-fsl-plugin.inc b/recipes-multimedia/gstreamer/gst-fsl-plugin.inc
index f8685bc..d925de6 100644
--- a/recipes-multimedia/gstreamer/gst-fsl-plugin.inc
+++ b/recipes-multimedia/gstreamer/gst-fsl-plugin.inc
@@ -6,7 +6,7 @@ DESCRIPTION = "Gstreamer freescale plugins"
 LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1"
 SECTION = "multimedia"
 
-DEPENDS = "gstreamer gst-plugins-base libfslcodec libfslparser virtual/kernel"
+DEPENDS = "libfslcodec libfslparser virtual/kernel"
 DEPENDS_append_mx5 = " imx-lib imx-vpu"
 DEPENDS_append_mx6q = " imx-lib imx-vpu libfslvpuwrap"
 DEPENDS_append_mx6dl = " imx-lib imx-vpu libfslvpuwrap"
@@ -16,12 +16,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
                     file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
 
-S = "${WORKDIR}/gst-fsl-plugins-${PV}"
-
-SRC_URI = "${FSL_MIRROR}/gst-fsl-plugins-${PV}.tar.gz \
-           file://build-Fix-out-of-tree-build.patch \
-           file://Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch"
-
 inherit autotools pkgconfig
 
 PLATFORM_mx5 = "MX51"
@@ -45,22 +39,12 @@ PACKAGECONFIG[aacp] += "--enable-aacpdec,--disable-aacpdec,libfslaacpcodec,libfs
 MSDEPENDS = "libfslmsparser libfslmscodec"
 PACKAGECONFIG[wma10dec] +="--enable-wma10dec,--disable-wma10dec,${MSDEPENDS},${MSDEPENDS}"
 PACKAGECONFIG[wma8enc] +="--enable-wma8enc,--disable-wma8enc,${MSDEPENDS},${MSDEPENDS}"
-PACKAGECONFIG[wmv9mpdec] +="--enable-wmv9mpdec,--disable-wmv9mpdec,${MSDEPENDS},${MSDEPENDS}"
-PACKAGECONFIG[wmv78dec] +="--enable-wmv78dec,--disable-wmv78dec,${MSDEPENDS},${MSDEPENDS}"
 
-FILES_${PN} = "${libdir}/gstreamer-0.10/*.so ${datadir}"
 # Add codec list that the beep plugin run-time depended
 BEEP_RDEPENDS = "libfslcodec-aac libfslcodec-mp3 libfslcodec-oggvorbis"
 RDEPENDS_${PN} += "gst-plugins-good-id3demux libfslparser ${BEEP_RDEPENDS}"
 
-FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
-FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/pkgconfig/*.pc"
-FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a"
-
-FILES_${PN}-gplay = "${bindir}/gplay"
 FILES_${PN}-libmfwsconf = "${libdir}/libmfwsconf${SOLIBS}"
-FILES_${PN}-libgplaycore = "${libdir}/libgplaycore${SOLIBS}"
-FILES_${PN}-libgstfsl = "${libdir}/libgstfsl-0.10${SOLIBS}"
 FILES_${PN}-libme = "${libdir}/libme${SOLIBS}"
 FILES_${PN}-libgstbufmeta = "${libdir}/libgstbufmeta${SOLIBS}"
 FILES_${PN}-libmfwba =  "${libdir}/libmfwba${SOLIBS}"
diff --git a/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.11.bb b/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.11.bb
index d0b0c9e..e8fe34e 100644
--- a/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.11.bb
+++ b/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.11.bb
@@ -5,7 +5,27 @@ require gst-fsl-plugin.inc
 
 EXTRA_OECONF += " CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR}"
 
+SRC_URI = "${FSL_MIRROR}/gst-fsl-plugins-${PV}.tar.gz \
+           file://build-Fix-out-of-tree-build.patch \
+           file://Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch \
+"
+
+S = "${WORKDIR}/gst-fsl-plugins-${PV}"
+
 SRC_URI[md5sum] = "0ed858681a74857034c006036023e6ce"
 SRC_URI[sha256sum] = "fbc6000b401ac2c8d67d1414372f4a929cf0a5808f6ed1640f1d2bfcce2f2a4f"
 
+DEPENDS_append = " gstreamer gst-plugins-base"
+
+PACKAGECONFIG[wmv9mpdec] +="--enable-wmv9mpdec,--disable-wmv9mpdec,${MSDEPENDS},${MSDEPENDS}"
+PACKAGECONFIG[wmv78dec] +="--enable-wmv78dec,--disable-wmv78dec,${MSDEPENDS},${MSDEPENDS}"
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/*.so ${datadir}"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/pkgconfig/*.pc"
+FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a"
+FILES_${PN}-gplay = "${bindir}/gplay"
+FILES_${PN}-libgplaycore = "${libdir}/libgplaycore${SOLIBS}"
+FILES_${PN}-libgstfsl = "${libdir}/libgstfsl-0.10${SOLIBS}"
+
 COMPATIBLE_MACHINE = "(mx28|mx5|mx6)"
-- 
1.7.9.5