From 2c20e8f07502c7f75ea2b591272e3e1013e58ce8 Mon Sep 17 00:00:00 2001 From: Lauren Post Date: Thu, 24 Dec 2015 15:17:11 +0800 Subject: gst1.0-fsl-plugins: Upgrade to 4.0.8 version -Fix memory leak in overlaysink, imxv4l2sink and imxcompositor. -Fix IPU/PXP frame copying beyond the memory boundary. -Add more holding buffer number for motion 0 and 1 in imxv4l2sink to fix deinterlace failure. -Add divx support in vpudec, including 3,4,5,6. -Add video overlay composition meta support to imxvideoconvert and imxcompositor. -Remove unsupported formats for pxp 2d deivce. -Simplify the caps in pad template of imxvideoonvert/imxcompositor/overlaysink/imv4l2sink. Signed-off-by: Lauren Post Signed-off-by: Otavio Salvador --- ...sl-plugins-fix-appending-data-to-variable.patch | 46 ------------ ...sl-plugins-fix-appending-data-to-variable.patch | 46 ++++++++++++ .../gstreamer/gst1.0-fsl-plugin_4.0.7.bb | 80 --------------------- .../gstreamer/gst1.0-fsl-plugin_4.0.8.bb | 81 ++++++++++++++++++++++ 4 files changed, 127 insertions(+), 126 deletions(-) delete mode 100644 recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.7/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch create mode 100644 recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.8/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch delete mode 100644 recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.7.bb create mode 100644 recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.8.bb (limited to 'recipes-multimedia') diff --git a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.7/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.7/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch deleted file mode 100644 index 4f69c78..0000000 --- a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.7/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Javier Viguera -Date: Mon, 2 Nov 2015 17:52:48 +0100 -Subject: [PATCH] gst1.0-fsl-plugins: fix appending data to variable - -FSL_MM_CORE_CFLAGS and FSL_MM_CORE_LIBS where concatenating data at the -end without adding a blank space between additions. - -As the appended data was a result of `pkg-config` expansion, this was -working correctly until pkg-config v0.28 because it was pkg-config who -was adding the trailing space. - -But after pkg-config v0.28, specifically in this commit: - -http://cgit.freedesktop.org/pkg-config/commit/?id=f26a505826acec6b1e1af8d1efdf959913421c3a - -this is no longer true, so the configure script needs to add that space. - -Signed-off-by: Javier Viguera ---- - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4da48867fafd..01bff6ca5348 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -203,14 +203,14 @@ AC_SUBST(RT_CFLAGS) - AC_SUBST(RT_LIBS) - - FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null` --FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null` --FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslparser 2>/dev/null` --FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null` -+FSL_MM_CORE_CFLAGS+=" `$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`" -+FSL_MM_CORE_CFLAGS+=" `$PKG_CONFIG --cflags libfslparser 2>/dev/null`" -+FSL_MM_CORE_CFLAGS+=" `$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`" - AC_SUBST(FSL_MM_CORE_CFLAGS) - - FSL_MM_CORE_LIBS=`$PKG_CONFIG --libs libfslaudiocodec 2>/dev/null` --FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvideocodec 2>/dev/null` --FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslparser 2>/dev/null` -+FSL_MM_CORE_LIBS+=" `$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`" -+FSL_MM_CORE_LIBS+=" `$PKG_CONFIG --libs libfslparser 2>/dev/null`" - AC_SUBST(FSL_MM_CORE_LIBS) - - EXTRAPLATFORMCFLAGS="-DARM -D_GNUC_" diff --git a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.8/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.8/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch new file mode 100644 index 0000000..4f69c78 --- /dev/null +++ b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin-4.0.8/0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch @@ -0,0 +1,46 @@ +From: Javier Viguera +Date: Mon, 2 Nov 2015 17:52:48 +0100 +Subject: [PATCH] gst1.0-fsl-plugins: fix appending data to variable + +FSL_MM_CORE_CFLAGS and FSL_MM_CORE_LIBS where concatenating data at the +end without adding a blank space between additions. + +As the appended data was a result of `pkg-config` expansion, this was +working correctly until pkg-config v0.28 because it was pkg-config who +was adding the trailing space. + +But after pkg-config v0.28, specifically in this commit: + +http://cgit.freedesktop.org/pkg-config/commit/?id=f26a505826acec6b1e1af8d1efdf959913421c3a + +this is no longer true, so the configure script needs to add that space. + +Signed-off-by: Javier Viguera +--- + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4da48867fafd..01bff6ca5348 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -203,14 +203,14 @@ AC_SUBST(RT_CFLAGS) + AC_SUBST(RT_LIBS) + + FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null` +-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null` +-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslparser 2>/dev/null` +-FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null` ++FSL_MM_CORE_CFLAGS+=" `$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`" ++FSL_MM_CORE_CFLAGS+=" `$PKG_CONFIG --cflags libfslparser 2>/dev/null`" ++FSL_MM_CORE_CFLAGS+=" `$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`" + AC_SUBST(FSL_MM_CORE_CFLAGS) + + FSL_MM_CORE_LIBS=`$PKG_CONFIG --libs libfslaudiocodec 2>/dev/null` +-FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvideocodec 2>/dev/null` +-FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslparser 2>/dev/null` ++FSL_MM_CORE_LIBS+=" `$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`" ++FSL_MM_CORE_LIBS+=" `$PKG_CONFIG --libs libfslparser 2>/dev/null`" + AC_SUBST(FSL_MM_CORE_LIBS) + + EXTRAPLATFORMCFLAGS="-DARM -D_GNUC_" diff --git a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.7.bb b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.7.bb deleted file mode 100644 index 62b38c7..0000000 --- a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.7.bb +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright (C) 2014,2015 Freescale Semiconductor -# Copyright (C) 2012-2015 O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "Gstreamer freescale plugins" -LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1" -SECTION = "multimedia" - -DEPENDS = "libfslcodec libfslparser virtual/kernel gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" -DEPENDS_append_mx6q = " imx-lib imx-vpu libfslvpuwrap" -DEPENDS_append_mx6dl = " imx-lib imx-vpu libfslvpuwrap" -DEPENDS_append_mx6sl = " imx-lib" -DEPENDS_append_mx6sx = " imx-lib" -DEPENDS_append_mx6ul = " imx-lib" -DEPENDS_append_mx7 = " imx-lib" - -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" - -SRC_URI = " \ - ${FSL_MIRROR}/gst1.0-fsl-plugins-${PV}.tar.gz \ - file://0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch \ -" -SRC_URI[md5sum] = "81e2dbd702ea2cd7904fc54981ea3d19" -SRC_URI[sha256sum] = "fc287a672e2f040c2697af618b2f6ed319202a6dfbb731cbfb7987b41de2d62b" - -S = "${WORKDIR}/gst1.0-fsl-plugins-${PV}" - -inherit autotools pkgconfig - -# Make sure kernel sources are available -do_configure[depends] += "virtual/kernel:do_shared_workdir" - -PLATFORM_mx6 = "MX6" -PLATFORM_mx6sl = "MX6SL" -PLATFORM_mx6sx = "MX6SX" -PLATFORM_mx6ul = "MX6UL" -PLATFORM_mx7= "MX7D" - -# Todo add a mechanism to map possible build targets -EXTRA_OECONF = "PLATFORM=${PLATFORM} \ - CPPFLAGS="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include" \ - CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR}" - -PACKAGES =+ "${PN}-gplay ${PN}-libgplaycore ${PN}-libgstfsl ${PN}-grecorder ${PN}-librecorder-engine" - -# Add codec list that the beep plugin run-time depended -BEEP_RDEPENDS = "libfslcodec-aac libfslcodec-mp3 libfslcodec-oggvorbis" -RDEPENDS_${PN} += "libfslparser ${BEEP_RDEPENDS} gstreamer1.0-plugins-good-id3demux " - -PACKAGECONFIG ?= "" -PACKAGECONFIG_mx6q = "overlaysink" -PACKAGECONFIG_mx6dl = "overlaysink" -PACKAGECONFIG_mx6sx = "overlaysink" -PACKAGECONFIG_mx6sl = "overlaysink" - -# FIXME: Add all features -# feature from excluded mm packages -PACKAGECONFIG[ac3] += ",,libfslac3codec,libfslac3codec" -# feature from special mm packages -PACKAGECONFIG[aacp] += ",,libfslaacpcodec,libfslaacpcodec" -MSDEPENDS = "libfslmsparser libfslmscodec" -PACKAGECONFIG[wma10dec] += ",,${MSDEPENDS},${MSDEPENDS}" -PACKAGECONFIG[wma8enc] += "--enable-wma8enc,--disable-wma8enc,${MSDEPENDS},${MSDEPENDS}" -OVDEPENDS = "virtual/libg2d" -PACKAGECONFIG[overlaysink] += "--enable-overlaysink,--disable-overlaysink, ${OVDEPENDS}" - -FILES_${PN} = "${libdir}/gstreamer-1.0/*.so ${datadir}" - -FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la ${libdir}/pkgconfig/*.pc" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" -FILES_${PN}-gplay = "${bindir}/gplay-1.0" -FILES_${PN}-libgplaycore = "${libdir}/libgplaycore-1.0${SOLIBS}" -FILES_${PN}-libgstfsl = "${libdir}/libgstfsl-1.0${SOLIBS}" -FILES_${PN}-grecorder = "${bindir}/grecorder-1.0" -FILES_${PN}-librecorder-engine = "${libdir}/librecorder_engine-1.0${SOLIBS}" - -COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)" diff --git a/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.8.bb b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.8.bb new file mode 100644 index 0000000..51ea92a --- /dev/null +++ b/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.8.bb @@ -0,0 +1,81 @@ +# Copyright (C) 2014,2015 Freescale Semiconductor +# Copyright (C) 2012-2015 O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Gstreamer freescale plugins" +LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1" +SECTION = "multimedia" + +DEPENDS = "libfslcodec libfslparser virtual/kernel gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" +DEPENDS_append_mx6q = " imx-lib imx-vpu libfslvpuwrap" +DEPENDS_append_mx6dl = " imx-lib imx-vpu libfslvpuwrap" +DEPENDS_append_mx6sl = " imx-lib" +DEPENDS_append_mx6sx = " imx-lib" +DEPENDS_append_mx6ul = " imx-lib" +DEPENDS_append_mx7 = " imx-lib" + +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" + +SRC_URI = " \ + ${FSL_MIRROR}/gst1.0-fsl-plugins-${PV}.tar.gz \ + file://0001-gst1.0-fsl-plugins-fix-appending-data-to-variable.patch \ +" + +SRC_URI[md5sum] = "0669eeea4e37203e2e654a00ded35ba2" +SRC_URI[sha256sum] = "43c86f88d3c7b1da8d38815eaec297a9b8652e1fb770ff89c26d617f63ea068b" + +S = "${WORKDIR}/gst1.0-fsl-plugins-${PV}" + +inherit autotools pkgconfig + +# Make sure kernel sources are available +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +PLATFORM_mx6 = "MX6" +PLATFORM_mx6sl = "MX6SL" +PLATFORM_mx6sx = "MX6SX" +PLATFORM_mx6ul = "MX6UL" +PLATFORM_mx7= "MX7D" + +# Todo add a mechanism to map possible build targets +EXTRA_OECONF = "PLATFORM=${PLATFORM} \ + CPPFLAGS="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include" \ + CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR} \ + ${@base_contains('DISTRO_FEATURES', 'wayland', base_contains('DISTRO_FEATURES', 'x11', '--disable-x11', '', d), '', d)}" + +PACKAGES =+ "${PN}-gplay ${PN}-libgplaycore ${PN}-libgstfsl ${PN}-grecorder ${PN}-librecorder-engine ${PN}-libplayengine" + +# Add codec list that the beep plugin run-time depended +BEEP_RDEPENDS = "libfslcodec-aac libfslcodec-mp3 libfslcodec-oggvorbis" +RDEPENDS_${PN} += "libfslparser ${BEEP_RDEPENDS} gstreamer1.0-plugins-good-id3demux " + +PACKAGECONFIG ?= "" +PACKAGECONFIG_mx6 = "overlaysink" + + +# FIXME: Add all features +# feature from excluded mm packages +PACKAGECONFIG[ac3] += ",,libfslac3codec,libfslac3codec" +# feature from special mm packages +PACKAGECONFIG[aacp] += ",,libfslaacpcodec,libfslaacpcodec" +MSDEPENDS = "libfslmsparser libfslmscodec" +PACKAGECONFIG[wma10dec] += ",,${MSDEPENDS},${MSDEPENDS}" +PACKAGECONFIG[wma8enc] += "--enable-wma8enc,--disable-wma8enc,${MSDEPENDS},${MSDEPENDS}" +OVDEPENDS = "virtual/libg2d" +PACKAGECONFIG[overlaysink] += "--enable-overlaysink,--disable-overlaysink, ${OVDEPENDS}" + +FILES_${PN} = "${libdir}/gstreamer-1.0/*.so ${datadir}" + +FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" +FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la ${libdir}/pkgconfig/*.pc" +FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" +FILES_${PN}-gplay = "${bindir}/gplay-1.0" +FILES_${PN}-libgplaycore = "${libdir}/libgplaycore-1.0${SOLIBS}" +FILES_${PN}-libgstfsl = "${libdir}/libgstfsl-1.0${SOLIBS}" +FILES_${PN}-grecorder = "${bindir}/grecorder-1.0" +FILES_${PN}-librecorder-engine = "${libdir}/librecorder_engine-1.0${SOLIBS}" +FILES_${PN}-libplayengine = "${libdir}/libplayengine-1.0${SOLIBS}" + +COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)" -- cgit v1.2.3-54-g00ecf