Return-Path: Received: from mail-qc0-f179.google.com (mail-qc0-f179.google.com [209.85.216.179]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 2540EE00900 for ; Tue, 25 Feb 2014 21:04:11 -0800 (PST) Received: by mail-qc0-f179.google.com with SMTP id r5so634458qcx.10 for ; Tue, 25 Feb 2014 21:04:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fs1T3oWvdGPZjAFYACOPkiGmmQX0FrAiVeHsdnfyhrg=; b=XwjIpER5OxaJdzRXClj+9xr73t0uIhJ50aoONuMS1VrBkh0g5gjVT2eUWHcjwvF2JD 3ILUMsJhJc+4hjaDPpo6wc6SfGh5/GRRq6WM4XpKh6wWNTT1WwVVud1utzbcmMsFMS7N H9ZeBGo3T+KgjQ2/2Q/k+6OC9ztRKFL7qgBNpGY6yakwNOJPrEEZKMqV/81f99sOqltL Yt6dsRPbNpavFXXD5M3J/WH5Wv1/Ab/zjXIZnCuL5iDVjJlDdgrQ8gaSskUDAchOsigo gBaLr36gSF/fQcvipx4dl1Fg/0YxjROZ5reeL9yx8LjE8G+2/IRtL8aNyII60rnfpoHY COww== X-Received: by 10.229.13.195 with SMTP id d3mr7617562qca.4.1393391051582; Tue, 25 Feb 2014 21:04:11 -0800 (PST) Received: from b35650.home (pool-173-48-171-215.bstnma.fios.verizon.net. [173.48.171.215]) by mx.google.com with ESMTPSA id l6sm6536229qac.8.2014.02.25.21.04.10 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Feb 2014 21:04:11 -0800 (PST) From: ronunes@gmail.com To: meta-freescale@yoctoproject.org Date: Wed, 26 Feb 2014 00:03:16 -0500 Message-Id: <1393390999-12160-5-git-send-email-ronunes@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1393390999-12160-1-git-send-email-ronunes@gmail.com> References: <1393390999-12160-1-git-send-email-ronunes@gmail.com> Cc: Rogerio Nunes Subject: [meta-fsl-demos][PATCH 4/7] packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 05:04:13 -0000 From: Rogerio Nunes This patch refactors packagegroup-fsl-gstreamer, bringing code from gst-meta-base. This change makes this packagegroup more flexible and prepares it for further changes. Also, as gst-meta-base explicitly depends on gst-plugins-bad, and this dependency is not present in packagegroup-fsl-gstreamer, build time for this pakagegroup has improved. This patch also creates the packagegroup-fsl-gstreamer-full packagegroup, which can be used to add all the available plugins to an image, including bad plugins and ugly plugins when 'commercial' is present in the license whitelist. Gstreamer tools are removed from packagegroup-fsl-tools-testapps, so now this packagegroup does not need to be machine dependent anymore. Finally, this patch adds gst-plugins-good-meta to fsl-image-* images, so that the images still have the same list of gstreamer plugins available. Signed-off-by: Rogerio Nunes --- recipes-fsl/images/fsl-image-gui.bb | 1 + recipes-fsl/images/fsl-image-test.bb | 1 + .../packagegroup-fsl-gstreamer-full.bb | 19 +++++++ .../packagegroups/packagegroup-fsl-gstreamer.bb | 66 ++++++++++++++++++++-- .../packagegroup-fsl-tools-testapps.bb | 6 -- 5 files changed, 82 insertions(+), 11 deletions(-) create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb diff --git a/recipes-fsl/images/fsl-image-gui.bb b/recipes-fsl/images/fsl-image-gui.bb index 5441272..666475a 100644 --- a/recipes-fsl/images/fsl-image-gui.bb +++ b/recipes-fsl/images/fsl-image-gui.bb @@ -23,6 +23,7 @@ IMAGE_INSTALL += " \ cpufrequtils \ nano \ packagegroup-fsl-gstreamer \ + gst-plugins-good-meta \ packagegroup-fsl-tools-gpu \ packagegroup-fsl-tools-gpu-external \ packagegroup-fsl-tools-testapps \ diff --git a/recipes-fsl/images/fsl-image-test.bb b/recipes-fsl/images/fsl-image-test.bb index 2570ac9..0408c7c 100644 --- a/recipes-fsl/images/fsl-image-test.bb +++ b/recipes-fsl/images/fsl-image-test.bb @@ -14,6 +14,7 @@ EXTRA_IMAGE_FEATURES += " \ IMAGE_INSTALL += " \ packagegroup-fsl-gstreamer \ + gst-plugins-good-meta \ packagegroup-fsl-tools-gpu \ packagegroup-fsl-tools-gpu-external \ packagegroup-fsl-tools-testapps \ diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb new file mode 100644 index 0000000..3ed5d6f --- /dev/null +++ b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb @@ -0,0 +1,19 @@ +# Copyright (C) 2014 Freescale Semiconductor +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "Freescale package group - gstreamer full" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +inherit packagegroup + +RDEPENDS_${PN} = " \ + packagegroup-fsl-gstreamer \ + gst-plugins-base-meta \ + gst-plugins-good-meta \ + gst-plugins-bad-meta \ + ${@base_contains('DISTRO_FEATURES', 'opengl', \ + base_contains('DISTRO_FEATURES', 'x11', \ + 'gst-plugins-gl', '', d), '', d)} \ +" diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer.bb b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer.bb index c071e75..17f2f6e 100644 --- a/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer.bb +++ b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer.bb @@ -9,21 +9,77 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 inherit packagegroup PACKAGES += " \ + ${PN}-base \ + ${PN}-x11-base \ + ${PN}-audio \ + ${PN}-video \ + ${PN}-debug \ ${PN}-streamer \ " MACHINE_GSTREAMER_PLUGIN ?= "" RDEPENDS_${PN} = " \ - gst-meta-audio \ - gst-meta-video \ - gst-meta-debug \ - gst-plugins-good-meta \ + ${PN}-audio \ + ${PN}-video \ + ${PN}-debug \ ${MACHINE_GSTREAMER_PLUGIN} \ + ${@base_contains("MACHINE_GSTREAMER_PLUGIN", "gst-fsl-plugin", "gst-fsl-plugin-gplay", "", d)} \ +" + +RDEPENDS_${PN}-base = " \ + ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11-base', '', d)} \ + gstreamer \ + gst-plugins-base-playbin \ + gst-plugins-base-decodebin \ + gst-plugins-base-decodebin2 \ + gst-plugins-base-gio \ + gst-plugins-base-alsa \ + gst-plugins-base-volume \ + gst-plugins-base-audioconvert \ + gst-plugins-base-audioresample \ + gst-plugins-base-typefindfunctions \ + gst-plugins-base-videoscale \ + gst-plugins-base-ffmpegcolorspace \ + gst-plugins-good-autodetect \ + gst-plugins-good-souphttpsrc \ +" + +RDEPENDS_${PN}-x11-base = " \ + gst-plugins-base-ximagesink \ + gst-plugins-base-xvimagesink \ +" + +RDEPENDS_${PN}-audio = " \ + ${PN}-base \ + gst-plugins-base-vorbis \ + gst-plugins-base-ogg \ + gst-plugins-good-wavparse \ + gst-plugins-good-flac \ + ${COMMERCIAL_AUDIO_PLUGINS} \ +" + +RDEPENDS_${PN}-video = " \ + ${PN}-base \ + gst-plugins-good-avi \ + gst-plugins-good-matroska \ + gst-plugins-base-theora \ + ${COMMERCIAL_VIDEO_PLUGINS} \ +" + +RRECOMMENDS_${PN}-video = " \ + ${PN}-audio \ +" + +RDEPENDS_${PN}-debug = " \ + ${PN}-base \ + gst-plugins-good-debug \ + gst-plugins-base-audiotestsrc \ + gst-plugins-base-videotestsrc \ " RDEPENDS_${PN}-streamer = " \ - ${PN} \ + ${PN}-base \ gst-plugins-good-udp \ gst-plugins-good-rtp \ gst-plugins-good-rtpmanager \ diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb index 6a7d92d..f2d4bdf 100644 --- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb +++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb @@ -8,17 +8,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 inherit packagegroup -MACHINE_GSTREAMER_PLUGIN ?= "" - RDEPENDS_${PN} = " \ - ${@base_contains("MACHINE_GSTREAMER_PLUGIN", "gst-fsl-plugin", "gst-fsl-plugin-gplay", "", d)} \ alsa-utils \ alsa-tools \ dosfstools \ evtest \ e2fsprogs-mke2fs \ fsl-rc-local \ - gst-plugins-base-tcp \ i2c-tools \ imx-test \ iproute2 \ @@ -31,5 +27,3 @@ RDEPENDS_${PN} = " \ mtd-utils \ mtd-utils-ubifs \ " - -PACKAGE_ARCH = "${MACHINE_ARCH}" -- 1.8.3.2