From 256d0ba630521cce55bc3c8679e8f3329bbcfb2b Mon Sep 17 00:00:00 2001 From: Wang Zidan Date: Wed, 3 Sep 2014 18:07:57 +0800 Subject: [PATCH] gst-fsl-plugin: Make a common include file for gst-fsl-plugin and gst1.0-fsl-plugin To avoid duplication, use one common include file for gst 0.1 and 1.0 plugins. gst-fsl-plugin specific features moved into the 0.1 recipe. gst1.0-fsl-plugin specific features will be moved into the 1.0 recipe. Signed-off-by: Zidan Wang Signed-off-by: Otavio Salvador --- .../gstreamer/gst-fsl-plugin.inc | 27 +----------------- .../gstreamer/gst-fsl-plugin_3.0.11.bb | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin.inc b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin.inc index f8685bc3..d8733dbd 100644 --- a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin.inc +++ b/meta-fsl-arm/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" @@ -37,30 +31,11 @@ PACKAGES =+ "${PN}-libmfwsconf ${PN}-libgplaycore ${PN}-libgstfsl \ ${PN}-libme ${PN}-libgstbufmeta ${PN}-libmfwba \ ${PN}-libfwvss ${PN}-gplay" -# FIXME: Add all features -# feature from excluded mm packages -PACKAGECONFIG[ac3] += "--enable-ac3dec,--disable-ac3dec,libfslac3codec,libfslac3codec" -# feature from special mm packages -PACKAGECONFIG[aacp] += "--enable-aacpdec,--disable-aacpdec,libfslaacpcodec,libfslaacpcodec" -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/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.11.bb b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.11.bb index d0b0c9eb..6e243c4d 100644 --- a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.11.bb +++ b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin_3.0.11.bb @@ -5,7 +5,35 @@ 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" + +# FIXME: Add all features +# feature from excluded mm packages +PACKAGECONFIG[ac3] += "--enable-ac3dec,--disable-ac3dec,libfslac3codec,libfslac3codec" +# feature from special mm packages +PACKAGECONFIG[aacp] += "--enable-aacpdec,--disable-aacpdec,libfslaacpcodec,libfslaacpcodec" +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}" +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)" -- 2.40.1