From bf139085eb430f65a70421b244b8d5bc34af5769 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 10 Jun 2015 18:46:57 -0300 Subject: [PATCH] gst1.0-fsl-plugin: Stop using gst-fsl-plugin.inc file As GStreamer 0.10 support is now gone, we can remove the .inc file and do some cleanups in the code. Change-Id: I048a81f96a930d09035004aab83e92454cad9062 Signed-off-by: Otavio Salvador --- .../gstreamer/gst-fsl-plugin.inc | 44 ------------------- .../gstreamer/gst1.0-fsl-plugin_4.0.3.bb | 42 +++++++++++++++--- 2 files changed, 36 insertions(+), 50 deletions(-) delete mode 100644 meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin.inc diff --git a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin.inc b/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin.inc deleted file mode 100644 index 412ca05f..00000000 --- a/meta-fsl-arm/recipes-multimedia/gstreamer/gst-fsl-plugin.inc +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (C) 2011-2013 Freescale Semiconductor -# Copytight (C) 2012-2014 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" -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" - -# Make sure kernel sources are available -do_configure[depends] += "virtual/kernel:do_shared_workdir" - -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" - -inherit autotools pkgconfig - -PLATFORM_mx6 = "MX6" -PLATFORM_mx6sl = "MX6SL" -PLATFORM_mx6sx = "MX6SX" - -# Todo add a mechanism to map posible build targets -EXTRA_OECONF = "PLATFORM=${PLATFORM} \ - CPPFLAGS="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include"" - -PACKAGES =+ "${PN}-libmfwsconf ${PN}-libgplaycore ${PN}-libgstfsl \ - ${PN}-libme ${PN}-libgstbufmeta ${PN}-libmfwba \ - ${PN}-libfwvss ${PN}-gplay" - -# Add codec list that the beep plugin run-time depended -BEEP_RDEPENDS = "libfslcodec-aac libfslcodec-mp3 libfslcodec-oggvorbis" -RDEPENDS_${PN} += "libfslparser ${BEEP_RDEPENDS}" - -FILES_${PN}-libmfwsconf = "${libdir}/libmfwsconf${SOLIBS}" -FILES_${PN}-libme = "${libdir}/libme${SOLIBS}" -FILES_${PN}-libgstbufmeta = "${libdir}/libgstbufmeta${SOLIBS}" -FILES_${PN}-libmfwba = "${libdir}/libmfwba${SOLIBS}" -FILES_${PN}-libfwvss = "${libdir}/libmfwvss${SOLIBS}" diff --git a/meta-fsl-arm/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.3.bb b/meta-fsl-arm/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.3.bb index dd761b6f..ab28bc12 100644 --- a/meta-fsl-arm/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.3.bb +++ b/meta-fsl-arm/recipes-multimedia/gstreamer/gst1.0-fsl-plugin_4.0.3.bb @@ -1,18 +1,46 @@ # 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) -require gst-fsl-plugin.inc +DESCRIPTION = "Gstreamer freescale plugins" +LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1" +SECTION = "multimedia" -SRC_URI = "${FSL_MIRROR}/gst1.0-fsl-plugins-${PV}.tar.gz" -S = "${WORKDIR}/gst1.0-fsl-plugins-${PV}" +DEPENDS = "libfslcodec libfslparser virtual/kernel gstreamer1.0 gstreamer1.0-plugins-base" +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" -EXTRA_OECONF += " CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR}" +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" SRC_URI[md5sum] = "b5c1072536479c174bda1349ade5d10c" SRC_URI[sha256sum] = "9d5c051cbde023014e67fde07bc314b6b9a5e7030e24eb0d8afdf33e7e458125" -DEPENDS_append = " gstreamer1.0 gstreamer1.0-plugins-base" -RDEPENDS_${PN} += "gstreamer1.0-plugins-good-id3demux" +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" + +# 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" + +# Add codec list that the beep plugin run-time depended +BEEP_RDEPENDS = "libfslcodec-aac libfslcodec-mp3 libfslcodec-oggvorbis" +RDEPENDS_${PN} += "libfslparser ${BEEP_RDEPENDS}" PACKAGECONFIG ?= "" PACKAGECONFIG_mx6 = "overlaysink" @@ -29,6 +57,8 @@ OVDEPENDS = "virtual/libg2d" PACKAGECONFIG[overlaysink] += "--enable-overlaysink,--disable-overlaysink, ${OVDEPENDS}" FILES_${PN} = "${libdir}/gstreamer-1.0/*.so ${datadir}" +RDEPENDS_${PN} += "gstreamer1.0-plugins-good-id3demux" + 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" -- 2.40.1