Skip to contentSkip to conversation

fsl-gpu-sdk: create version 1.1 recipe

PATCH In review [email protected] 2 participants 9 messages Feb 27, 2014 – Feb 28, 2014

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/7 fsl-gpu-sdk: create version 1.1 recipe

From: Evan Kotara <[email protected]>

This patch results from a squash between two patches from the meta-fsl-bsp-release layer:
http://git.freescale.com/git/cgit.cgi/imx/me
7f3add015f2f... fsl-gpu-sdk: create version 1.1 recipe 27452615b9b1... fsl-gpu-sdk: Prefer X11 if wayland is also in distro features

It creates the fsl-gpu-sdk recipe, which is equivalent to the vivante-gpu-sdk recipe currenly in use.

The new recipe name reflects the name of the most recent gpu sdk package name released by freescale, so the intention is to remove the old recipe in a separete commit.

If both X11 and Wayland are in DISTRO_FEATURES, prefer X11.

---
 recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb | 40 +++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb
recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb new file +40 -0
new file mode 100644
index 0000000..812e23d
@@ -0,0 +1,40 @@
+SUMMARY = "Freescale GPU SDK Samples"
+DESCRIPTION = "Set of sample applications for Freescale GPU"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=44e96dac83a60d6c21a6055f7b31cf0c"
+DEPENDS = "virtual/libgles1 virtual/libgles2 ${WL_DEPENDS}"
+WL_DEPENDS = "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
+
+inherit fsl-eula-unpack
+
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+SRC_URI[md5sum] = "7cf0e66cfc6202a51bdd42573e601e6a"
+SRC_URI[sha256sum] = "89e3753b343b67e3a0d82fe3e96f0b388e73a650c2a00c767cf67efce7d0c217"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+SUPPORTED_APIS = "GLES1.1 GLES2.0 ${@base_contains('DISTRO_FEATURES', 'x11', '', 'OpenVG', d)}"
+MAKEFILE_NO_X11 = "${@base_contains('DISTRO_FEATURES', 'wayland', 'Makefile.wl', 'Makefile.fbdev', d)}"
+MAKEFILE = "${@base_contains('DISTRO_FEATURES', 'x11', 'Makefile.x11', '${MAKEFILE_NO_X11}', d)}"
+
+EXTRA_OEMAKE += "YOCTO_BUILD=1"
+
+do_compile () {
+    export ROOTFS=${STAGING_DIR_HOST}
+    for API in ${SUPPORTED_APIS}; do
+        cd "${S}/Samples/${API}"
+        oe_runmake -f "${MAKEFILE}"
+    done
+}
+
+do_install () {
+    install -d "${D}/opt/${PN}"
+    for API in ${SUPPORTED_APIS}; do
+        cd "${S}/Samples/${API}"
+        oe_runmake -f "${MAKEFILE}" install
+        cp -r bin/* "${D}/opt/${PN}"
+    done
+}
+
+FILES_${PN} += "/opt/${PN}"
+FILES_${PN}-dbg += "/opt/${PN}/*/.debug"
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH v2 2/7 vivante-gpu-sdk: remove this old recipe

From: Rogerio Nunes <[email protected]>

Moving forward, fsl-gpu-sdk replaces vivante-gnu-sdk, and should be used instead.

---
 recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb    |   5 +
 ...ation-of-the-GLES1.1-X11-Samples-in-Yocto.patch | 598 ---------------------
 ...d-missing-GLES1.1-samples-in-X11-Makefile.patch |  32 --
 .../vivante-gpu-sdk/vivante-gpu-sdk_1.00.bb        |  37 --
 4 files changed, 5 insertions(+), 667 deletions(-)
 delete mode 100644 recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk/0001-Fix-compilation-of-the-GLES1.1-X11-Samples-in-Yocto.patch
 delete mode 100644 recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk/0002-Don-t-build-missing-GLES1.1-samples-in-X11-Makefile.patch
 delete mode 100644 recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk_1.00.bb
recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb +5 -0
index 812e23d..16fe803 100644
@@ -7,6 +7,11 @@ WL_DEPENDS = "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
 
 inherit fsl-eula-unpack
 
+# For backwards compatibility
+RPROVIDES_${PN} = "vivante-gpu-sdk"
+RREPLACES_${PN} = "vivante-gpu-sdk"
+RCONFLICTS_${PN} = "vivante-gpu-sdk"
+
 SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
 SRC_URI[md5sum] = "7cf0e66cfc6202a51bdd42573e601e6a"
 SRC_URI[sha256sum] = "89e3753b343b67e3a0d82fe3e96f0b388e73a650c2a00c767cf67efce7d0c217"
recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk/0001-Fix-compilation-of-the-GLES1.1-X11-Samples-in-Yocto.patch deleted +0 -598

598 lines not on this page · raw message

recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk/0002-Don-t-build-missing-GLES1.1-samples-in-X11-Makefile.patch deleted +0 -32
deleted file mode 100644
index 36566f9..0000000
@@ -1,32 +0,0 @@
-From 390db03809834919d8d49faf9a0a528321684ac5 Mon Sep 17 00:00:00 2001
-From: Diego Rondini <[email protected]>
-Date: Tue, 30 Apr 2013 12:46:38 +0200
-Subject: [PATCH 2/2] Don't build missing GLES1.1 samples in X11 Makefile
-
-GLES1.1 samples 18_VertexBufferObjects and 19_Beizer are not included in the package, so don't try to compile them in X11 Makefile
-
-Upstream-Status: Pending
-
-Signed-off-by: Diego Rondini <[email protected]>
----
- Samples/GLES1.1/Makefile.x11 |    4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/Samples/GLES1.1/Makefile.x11 b/Samples/GLES1.1/Makefile.x11
-index 003763d..1c95158 100755
---- a/Samples/GLES1.1/Makefile.x11
-+++ b/Samples/GLES1.1/Makefile.x11
-@@ -17,9 +17,7 @@ SUB_PROJECTS= \
- 	14_ParticlesSpritesAnimation \
- 	15_ParticleAccelerator \
- 	16_VertexBufferObjects \
--	17_Beizer \
--	18_VertexBufferObjects \
--	19_Beizer
-+	17_Beizer
- 	
- 
- .PHONY: all
--- 
-1.7.9.5
-
recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk_1.00.bb deleted +0 -37
deleted file mode 100644
index 31917aa..0000000
@@ -1,37 +0,0 @@
-SUMMARY = "Vivante GPU SDK Samples"
-DESCRIPTION = "Set of sample applications compatible with Vivante GPU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b3ed4253a63ac8555ccab7c4c0aa29a1"
-DEPENDS = "virtual/libgles1"
-
-inherit fsl-eula-unpack
-
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
-	file://0001-Fix-compilation-of-the-GLES1.1-X11-Samples-in-Yocto.patch \
-	file://0002-Don-t-build-missing-GLES1.1-samples-in-X11-Makefile.patch"
-
-SRC_URI[md5sum] = "344c9a260b46a00f86eb5cb73bf729e0"
-SRC_URI[sha256sum] = "0f0a576ce1a08719ee1018832ae808ee723fad27a534c9739b5feec6d7435c57"
-
-S = "${WORKDIR}/${PN}-${PV}"
-# TODO: Support for building GLES1.1 is ready, GLES2.0 and OpenVG is not ready yet
-SUPPORTED_APIS = "GLES1.1"
-
-do_compile () {
-	for API in "${SUPPORTED_APIS}"; do
-		cd "${S}/Samples/${API}"
-		oe_runmake -f Makefile.x11
-	done
-}
-
-do_install () {
-	for API in "${SUPPORTED_APIS}"; do
-		cd "${S}/Samples/${API}"
-		install -d "${D}/opt/${PN}"
-		oe_runmake -f Makefile.x11 install
-		cp -r bin/ "${D}/opt/${PN}"
-	done
-}
-
-FILES_${PN} += "/opt/${PN}"
-FILES_${PN}-dbg += "/opt/${PN}/*/*/.debug"
Signature · 1 line
1.8.3.2
#2 lore raw

PATCH v2 3/7 packagegroup-fsl: create gpu packagegroups

In reply to [email protected]

From: Rogerio Nunes <[email protected]>

Two gpu packagegroups created:
*packagegroup-fsl-tools-gpu.bb - for fsl gpu packages. Those
previously included in packagegroup-fsl-tools-testapps.bb were moved to this new recipe, that alse includes the imx6 2d gpu package and the fsl gpu sdk.

*packagegroup-fsl-tools-gpu-external.bb - for additional demos and
tools that come from external projects.

This patch also includes both new packagegroups into fsl-image-gui and fsl-image-test.

---
 recipes-fsl/images/fsl-image-gui.bb                |  2 ++
 recipes-fsl/images/fsl-image-test.bb               |  2 ++
 .../packagegroup-fsl-tools-gpu-external.bb         | 18 +++++++++++++++
 .../packagegroups/packagegroup-fsl-tools-gpu.bb    | 26 ++++++++++++++++++++++
 .../packagegroup-fsl-tools-testapps.bb             | 10 ---------
 5 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
 create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
recipes-fsl/images/fsl-image-gui.bb +2 -0
index 84eac8a..5441272 100644
@@ -23,6 +23,8 @@ IMAGE_INSTALL += " \
     cpufrequtils \
     nano \
     packagegroup-fsl-gstreamer \
+    packagegroup-fsl-tools-gpu \
+    packagegroup-fsl-tools-gpu-external \
     packagegroup-fsl-tools-testapps \
     packagegroup-fsl-tools-benchmark \
     packagegroup-qt-in-use-demos \
recipes-fsl/images/fsl-image-test.bb +2 -0
index cd300c9..2570ac9 100644
@@ -14,6 +14,8 @@ EXTRA_IMAGE_FEATURES += " \
 
 IMAGE_INSTALL += " \
     packagegroup-fsl-gstreamer \
+    packagegroup-fsl-tools-gpu \
+    packagegroup-fsl-tools-gpu-external \
     packagegroup-fsl-tools-testapps \
     packagegroup-fsl-tools-benchmark \
 "
recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb new file +18 -0
new file mode 100644
index 0000000..a30d5e0
@@ -0,0 +1,18 @@
+# Copyright (C) 2014 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "Freescale package group - tools/gpu/external"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit packagegroup
+
+X11_TOOLS = " \
+    mesa-demos \
+    glmark2 \
+"
+
+RDEPENDS_${PN} = " \
+    ${@base_contains("DISTRO_FEATURES", "x11", "${X11_TOOLS}", "", d)} \
+"
recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb new file +26 -0
new file mode 100644
index 0000000..a28293c
@@ -0,0 +1,26 @@
+# Copyright (C) 2012-2014 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "Freescale package group - tools/gpu"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit packagegroup
+
+SOC_TOOLS_GPU = ""
+SOC_TOOLS_GPU_mx5 = " \
+    ${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)} \
+"
+
+SOC_TOOLS_GPU_mx6 = " \
+    gpu-viv-bin-mx6q \
+    gpu-viv-g2d \
+    fsl-gpu-sdk \
+"
+
+RDEPENDS_${PN} = " \
+    ${SOC_TOOLS_GPU} \
+"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb +0 -10
index 845e6d4..6a7d92d 100644
@@ -8,19 +8,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 
 inherit packagegroup
 
-SOC_TOOLS_TESTAPPS = ""
-SOC_TOOLS_TESTAPPS_mx5 = " \
-    ${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)} \
-"
-
-SOC_TOOLS_TESTAPPS_mx6 = " \
-    gpu-viv-bin-mx6q \
-"
-
 MACHINE_GSTREAMER_PLUGIN ?= ""
 
 RDEPENDS_${PN} = " \
-    ${SOC_TOOLS_TESTAPPS} \
     ${@base_contains("MACHINE_GSTREAMER_PLUGIN", "gst-fsl-plugin", "gst-fsl-plugin-gplay", "", d)} \
     alsa-utils \
     alsa-tools \
Signature · 1 line
1.8.3.2
#3 lore raw

PATCH v2 4/7 packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring

In reply to [email protected]

From: Rogerio Nunes <[email protected]>

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.

---
 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
recipes-fsl/images/fsl-image-gui.bb +1 -0
index 5441272..666475a 100644
@@ -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 \
recipes-fsl/images/fsl-image-test.bb +1 -0
index 2570ac9..0408c7c 100644
@@ -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 \
recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb new file +19 -0
new file mode 100644
index 0000000..3ed5d6f
@@ -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)} \ 
+"
recipes-fsl/packagegroups/packagegroup-fsl-gstreamer.bb +61 -5

82 lines not on this page · raw message

recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb +0 -6
index 6a7d92d..f2d4bdf 100644
@@ -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}"
Signature · 1 line
1.8.3.2
#4 lore raw

Re: [meta-fsl-demos][PATCH v2 4/7] packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring

Quoted 70 lines · On Thu, Feb 27, 2014 at 4:53 AM, <[email protected]> wrote:

From: Rogerio Nunes <[email protected]>

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.

---
 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
recipes-fsl/images/fsl-image-gui.bb +1 -0
index 5441272..666475a 100644
@@ -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 \
recipes-fsl/images/fsl-image-test.bb +1 -0
index 2570ac9..0408c7c 100644
@@ -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 \
recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb new file +9 -0
new file mode 100644
index 0000000..3ed5d6f
@@ -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

recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb line 19

Quoted 10 lines
recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb new file +10 -0
+
+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)} \
+"

You had a extra training space before \; I fixed it when applying the patch but please fix it at your copy to avoid re-introducing it if a v3 is needed.

Quoted 122 lines
recipes-fsl/packagegroups/packagegroup-fsl-gstreamer.bb +61 -5
index c071e75..17f2f6e 100644
@@ -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 \
recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb +0 -7
index 6a7d92d..f2d4bdf 100644
@@ -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

_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
#5 lore raw

Re: [meta-fsl-demos][PATCH v2 4/7] packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring

Quoted 77 lines · Otavio Salvador
Quoted 76 lines · On Thu, Feb 27, 2014 at 4:53 AM, <[email protected]> wrote:

From: Rogerio Nunes <[email protected]>

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.

---
 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
recipes-fsl/images/fsl-image-gui.bb +1 -0
index 5441272..666475a 100644
@@ -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 \
recipes-fsl/images/fsl-image-test.bb +1 -0
index 2570ac9..0408c7c 100644
@@ -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 \
recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb new file +15 -0
new file mode 100644
index 0000000..3ed5d6f
@@ -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 \
Quoted 8 lines

recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb line 19

Quoted 4 lines
recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb new file +4 -0
+    ${@base_contains('DISTRO_FEATURES', 'opengl', \
+                      base_contains('DISTRO_FEATURES', 'x11', \
+                                    'gst-plugins-gl', '', d), '', d)} \
+"

You had a extra training space before \; I fixed it when applying the patch but please fix it at your copy to avoid re-introducing it if a v3 is needed.

Thanks. Fixed locally.

Quoted 130 lines
Quoted 119 lines
recipes-fsl/packagegroups/packagegroup-fsl-gstreamer.bb +61 -5
index c071e75..17f2f6e 100644
@@ -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 \
recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb +0 -7
index 6a7d92d..f2d4bdf 100644
@@ -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

Quoted 4 lines

_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750

#6 lore raw

PATCH v2 5/7 fsl-image-multimedia: Add

In reply to [email protected]

From: Rogerio Nunes <[email protected]>

A console-only image that includes gstreamer packages and Freescale's multimedia packages (VPU and GPU) when available for the specific machine.

Multimedia packages usually contain user space tools that are not necessary in a product image, so this image recipe is a convenient start point for multimedia application development (fast to build), but not necessarily for a product image (fat rootfs).

---
 recipes-fsl/images/fsl-image-multimedia.bb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 recipes-fsl/images/fsl-image-multimedia.bb
recipes-fsl/images/fsl-image-multimedia.bb new file +16 -0
new file mode 100644
index 0000000..3cf77e0
@@ -0,0 +1,16 @@
+DESCRIPTION = "A console-only image that includes gstreamer packages and \
+Freescale's multimedia packages (VPU and GPU) when available for the specific \
+machine."
+
+IMAGE_FEATURES += "\
+    ${@base_contains('DISTRO_FEATURES', 'x11', 'x11-base', '', d)} \
+"
+
+LICENSE = "MIT"
+
+inherit core-image
+
+CORE_IMAGE_EXTRA_INSTALL += " \
+    packagegroup-fsl-gstreamer \
+    packagegroup-fsl-tools-gpu \
+"
Signature · 1 line
1.8.3.2
#7 lore raw

PATCH v2 6/7 fsl-image-multimedia-full: Add

In reply to [email protected]

From: Rogerio Nunes <[email protected]>

This image has all the packages that fsl-image-multimedia has plus all gstreamer's plugins from base, good and bad packages.

---
 recipes-fsl/images/fsl-image-multimedia-full.bb | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 recipes-fsl/images/fsl-image-multimedia-full.bb
recipes-fsl/images/fsl-image-multimedia-full.bb new file +8 -0
new file mode 100644
index 0000000..5e554ee
@@ -0,0 +1,8 @@
+# This image extends fsl-image-multimedia with additional
+# gstreamer plugins
+
+require fsl-image-multimedia.bb
+
+CORE_IMAGE_EXTRA_INSTALL += " \
+    packagegroup-fsl-gstreamer-full \
+"
Signature · 1 line
1.8.3.2
#8 lore raw

PATCH v2 7/7 fsl-image-machine-test: Add

In reply to [email protected]

From: Rogerio Nunes <[email protected]>

This image has all the packages that fsl-multimedia-full has plus test and benchmark applications. This image is intended for machine test as the name indicates, so no development tools are included.

---
 recipes-fsl/images/fsl-image-machine-test.bb | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 recipes-fsl/images/fsl-image-machine-test.bb
recipes-fsl/images/fsl-image-machine-test.bb new file +22 -0
new file mode 100644
index 0000000..28075b9
@@ -0,0 +1,22 @@
+DESCRIPTION = "A console-only image that includes gstreamer packages, \
+Freescale's multimedia packages (VPU and GPU) when available, and \
+test and benchmark applications."
+
+IMAGE_FEATURES += " \
+    ${@base_contains('DISTRO_FEATURES', 'x11', 'x11-base', '', d)} \
+    debug-tweaks \
+    tools-testapps \
+    tools-profile \
+"
+
+LICENSE = "MIT"
+
+inherit core-image
+
+CORE_IMAGE_EXTRA_INSTALL += " \
+    packagegroup-fsl-gstreamer \
+    packagegroup-fsl-gstreamer-full \
+    packagegroup-fsl-tools-gpu \
+    packagegroup-fsl-tools-testapps \
+    packagegroup-fsl-tools-benchmark \
+"
Signature · 1 line
1.8.3.2