* [meta-fsl-demos][PATCH v2 1/7] fsl-gpu-sdk: create version 1.1 recipe
@ 2014-02-27 7:53 ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 2/7] vivante-gpu-sdk: remove this old recipe ronunes
` (5 more replies)
0 siblings, 6 replies; 9+ messages in thread
From: ronunes @ 2014-02-27 7:53 UTC (permalink / raw)
To: meta-freescale; +Cc: Rogerio Nunes
From: Evan Kotara <evan.kotara@freescale.com>
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.
Signed-off-by: Evan Kotara <evan.kotara@freescale.com>
Signed-off-by: Rogerio Nunes <rogerio.nunes@freescale.com>
---
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
diff --git a/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb b/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb
new file mode 100644
index 0000000..812e23d
--- /dev/null
+++ b/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb
@@ -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"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-fsl-demos][PATCH v2 2/7] vivante-gpu-sdk: remove this old recipe
2014-02-27 7:53 [meta-fsl-demos][PATCH v2 1/7] fsl-gpu-sdk: create version 1.1 recipe ronunes
@ 2014-02-27 7:53 ` ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 3/7] packagegroup-fsl: create gpu packagegroups ronunes
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: ronunes @ 2014-02-27 7:53 UTC (permalink / raw)
To: meta-freescale; +Cc: Rogerio Nunes
From: Rogerio Nunes <rogerio.nunes@freescale.com>
Moving forward, fsl-gpu-sdk replaces vivante-gnu-sdk,
and should be used instead.
Signed-off-by: Rogerio Nunes <rogerio.nunes@freescale.com>
---
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
diff --git a/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb b/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb
index 812e23d..16fe803 100644
--- a/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb
+++ b/recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb
@@ -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"
diff --git a/recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk/0001-Fix-compilation-of-the-GLES1.1-X11-Samples-in-Yocto.patch b/recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk/0001-Fix-compilation-of-the-GLES1.1-X11-Samples-in-Yocto.patch
deleted file mode 100644
index 07d561f..0000000
--- a/recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk/0001-Fix-compilation-of-the-GLES1.1-X11-Samples-in-Yocto.patch
+++ /dev/null
@@ -1,598 +0,0 @@
-From 1d18aae77f0c2ff411d19ed5bd8c0b96bfd90190 Mon Sep 17 00:00:00 2001
-From: Diego Rondini <diego.ml@zoho.com>
-Date: Tue, 30 Apr 2013 10:52:25 +0200
-Subject: [PATCH 1/2] Fix compilation of the GLES1.1 X11 Samples in Yocto
-
-This commit fixes the following build problems:
-- gcc 4.7 compatibility (remove unsupported "-Wl" option);
-- wrong compiler binary name (caused by an overwrite of CC and AR variables)
-- unknown include and library paths (caused by forcing paths when not needed)
-
-Upstream-Status: Pending
-
-Signed-off-by: Diego Rondini <diego.ml@zoho.com>
----
- Samples/GLES1.1/01_SimpleTriangle/Makefile.x11 | 9 +--------
- Samples/GLES1.1/02_VertexColors/Makefile.x11 | 7 +------
- .../GLES1.1/03_VertexTransformation/Makefile.x11 | 7 +------
- .../04_ColoredVerticesInterpolation/Makefile.x11 | 7 +------
- Samples/GLES1.1/05_GeometricObjects/Makefile.x11 | 7 +------
- Samples/GLES1.1/06_Projection/Makefile.x11 | 7 +------
- Samples/GLES1.1/07_BasicTexturing/Makefile.x11 | 7 +------
- Samples/GLES1.1/08_Multitexturing/Makefile.x11 | 7 +------
- Samples/GLES1.1/09_Alphablending/Makefile.x11 | 7 +------
- Samples/GLES1.1/10_FilteringLights/Makefile.x11 | 7 +------
- Samples/GLES1.1/11_LightingFog/Makefile.x11 | 7 +------
- Samples/GLES1.1/12_Stencil/Makefile.x11 | 7 +------
- Samples/GLES1.1/13_3DFonts/Makefile.x11 | 7 +------
- .../14_ParticlesSpritesAnimation/Makefile.x11 | 7 +------
- .../GLES1.1/15_ParticleAccelerator/Makefile.x11 | 7 +------
- .../GLES1.1/16_VertexBufferObjects/Makefile.x11 | 7 +------
- Samples/GLES1.1/17_Beizer/Makefile.x11 | 7 +------
- 17 files changed, 17 insertions(+), 104 deletions(-)
-
-diff --git a/Samples/GLES1.1/01_SimpleTriangle/Makefile.x11 b/Samples/GLES1.1/01_SimpleTriangle/Makefile.x11
-index 1b86dbf..54c09ab 100755
---- a/Samples/GLES1.1/01_SimpleTriangle/Makefile.x11
-+++ b/Samples/GLES1.1/01_SimpleTriangle/Makefile.x11
-@@ -2,12 +2,6 @@ APPNAME := 01_SimpleTriangle
- DESTDIR ?= .
-
-
--# Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
--
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +15,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
-
-@@ -30,7 +23,7 @@ OBJECTS_TUT += \
- $(COMMON_DIR)/src/fsl_egl.o\
- $(COMMON_DIR)/src/glu3.o
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/02_VertexColors/Makefile.x11 b/Samples/GLES1.1/02_VertexColors/Makefile.x11
-index 6d9d063..d2294e8 100755
---- a/Samples/GLES1.1/02_VertexColors/Makefile.x11
-+++ b/Samples/GLES1.1/02_VertexColors/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR ?= .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
-
-@@ -30,7 +25,7 @@ OBJECTS_TUT += \
- $(COMMON_DIR)/src/fsl_egl.o\
- $(COMMON_DIR)/src/glu3.o
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/03_VertexTransformation/Makefile.x11 b/Samples/GLES1.1/03_VertexTransformation/Makefile.x11
-index b5574e0..8f41874 100755
---- a/Samples/GLES1.1/03_VertexTransformation/Makefile.x11
-+++ b/Samples/GLES1.1/03_VertexTransformation/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR ?= .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
-
-@@ -30,7 +25,7 @@ OBJECTS_TUT += \
- $(COMMON_DIR)/src/fsl_egl.o\
- $(COMMON_DIR)/src/glu3.o
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/04_ColoredVerticesInterpolation/Makefile.x11 b/Samples/GLES1.1/04_ColoredVerticesInterpolation/Makefile.x11
-index c9346f2..9092b2b 100755
---- a/Samples/GLES1.1/04_ColoredVerticesInterpolation/Makefile.x11
-+++ b/Samples/GLES1.1/04_ColoredVerticesInterpolation/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR ?= .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
-
-@@ -29,7 +24,7 @@ OBJECTS_TUT += \
- ColoredVerticesInterpolation.o \
- $(COMMON_DIR)/src/fsl_egl.o\
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/05_GeometricObjects/Makefile.x11 b/Samples/GLES1.1/05_GeometricObjects/Makefile.x11
-index a2cec68..295fd77 100755
---- a/Samples/GLES1.1/05_GeometricObjects/Makefile.x11
-+++ b/Samples/GLES1.1/05_GeometricObjects/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR ?= .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
-
-@@ -30,7 +25,7 @@ OBJECTS_TUT += \
- $(COMMON_DIR)/src/fsl_egl.o\
- $(COMMON_DIR)/src/glu3.o
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/06_Projection/Makefile.x11 b/Samples/GLES1.1/06_Projection/Makefile.x11
-index 84b674f..a33dcef 100755
---- a/Samples/GLES1.1/06_Projection/Makefile.x11
-+++ b/Samples/GLES1.1/06_Projection/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR ?= .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
-
-@@ -30,7 +25,7 @@ OBJECTS_TUT += \
- render.o \
- $(COMMON_DIR)/src/fsl_egl.o\
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/07_BasicTexturing/Makefile.x11 b/Samples/GLES1.1/07_BasicTexturing/Makefile.x11
-index a22a236..1278393 100755
---- a/Samples/GLES1.1/07_BasicTexturing/Makefile.x11
-+++ b/Samples/GLES1.1/07_BasicTexturing/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR = .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
-
-@@ -33,7 +28,7 @@ OBJECTS_TUT += \
-
- ASSETS = BasicTexturing.bmp
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/08_Multitexturing/Makefile.x11 b/Samples/GLES1.1/08_Multitexturing/Makefile.x11
-index f8d244f..d8a3841 100755
---- a/Samples/GLES1.1/08_Multitexturing/Makefile.x11
-+++ b/Samples/GLES1.1/08_Multitexturing/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR ?= .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
- ASSETS = data
-@@ -32,7 +27,7 @@ OBJECTS_TUT += \
- $(COMMON_DIR)/src/fsl_egl.o\
- $(COMMON_DIR)/src/fslutil.o\
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/09_Alphablending/Makefile.x11 b/Samples/GLES1.1/09_Alphablending/Makefile.x11
-index aa9ab43..39c964a 100755
---- a/Samples/GLES1.1/09_Alphablending/Makefile.x11
-+++ b/Samples/GLES1.1/09_Alphablending/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR = .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
-
-@@ -33,7 +28,7 @@ OBJECTS_TUT += \
-
- ASSETS = Alphablending.bmp
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/10_FilteringLights/Makefile.x11 b/Samples/GLES1.1/10_FilteringLights/Makefile.x11
-index d5f17c7..9ac6886 100755
---- a/Samples/GLES1.1/10_FilteringLights/Makefile.x11
-+++ b/Samples/GLES1.1/10_FilteringLights/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR = .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
-
-@@ -33,7 +28,7 @@ OBJECTS_TUT += \
-
- ASSETS = FilteringLights.bmp
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/11_LightingFog/Makefile.x11 b/Samples/GLES1.1/11_LightingFog/Makefile.x11
-index a284335..d2f57c2 100755
---- a/Samples/GLES1.1/11_LightingFog/Makefile.x11
-+++ b/Samples/GLES1.1/11_LightingFog/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR ?= .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
- ASSETS = data
-@@ -32,7 +27,7 @@ OBJECTS_TUT += \
- $(COMMON_DIR)/src/fsl_egl.o\
-
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/12_Stencil/Makefile.x11 b/Samples/GLES1.1/12_Stencil/Makefile.x11
-index 7d86842..1823434 100755
---- a/Samples/GLES1.1/12_Stencil/Makefile.x11
-+++ b/Samples/GLES1.1/12_Stencil/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR = .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
-
-@@ -30,7 +25,7 @@ OBJECTS_TUT += \
- $(COMMON_DIR)/src/fsl_egl.o\
- $(COMMON_DIR)/src/glu3.o
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/13_3DFonts/Makefile.x11 b/Samples/GLES1.1/13_3DFonts/Makefile.x11
-index 7075616..0499002 100755
---- a/Samples/GLES1.1/13_3DFonts/Makefile.x11
-+++ b/Samples/GLES1.1/13_3DFonts/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR ?= .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -24,7 +20,6 @@ ASSETS = data
-
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
-
-@@ -35,7 +30,7 @@ OBJECTS_TUT += \
- $(COMMON_DIR)/src/fsl_egl.o\
- $(COMMON_DIR)/src/fslutil.o\
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/14_ParticlesSpritesAnimation/Makefile.x11 b/Samples/GLES1.1/14_ParticlesSpritesAnimation/Makefile.x11
-index ccf7a75..7be1e6d 100755
---- a/Samples/GLES1.1/14_ParticlesSpritesAnimation/Makefile.x11
-+++ b/Samples/GLES1.1/14_ParticlesSpritesAnimation/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR = .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
-
-@@ -33,7 +28,7 @@ OBJECTS_TUT += \
-
- ASSETS = ParticlesSpritesAnimation.bmp
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/15_ParticleAccelerator/Makefile.x11 b/Samples/GLES1.1/15_ParticleAccelerator/Makefile.x11
-index 67bae20..72c557e 100755
---- a/Samples/GLES1.1/15_ParticleAccelerator/Makefile.x11
-+++ b/Samples/GLES1.1/15_ParticleAccelerator/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR ?= .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
- ASSETS = data
-@@ -37,7 +32,7 @@ OBJECTS_TUT += \
- $(COMMON_DIR)/src/fsl_egl.o\
- $(COMMON_DIR)/src/fslutil.o\
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/16_VertexBufferObjects/Makefile.x11 b/Samples/GLES1.1/16_VertexBufferObjects/Makefile.x11
-index 418f37d..a96e982 100755
---- a/Samples/GLES1.1/16_VertexBufferObjects/Makefile.x11
-+++ b/Samples/GLES1.1/16_VertexBufferObjects/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR ?= .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
- ASSETS = data
-@@ -36,7 +31,7 @@ OBJECTS_TUT += \
- $(COMMON_DIR)/src/fsl_egl.o\
- $(COMMON_DIR)/src/fslutil.o\
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
-diff --git a/Samples/GLES1.1/17_Beizer/Makefile.x11 b/Samples/GLES1.1/17_Beizer/Makefile.x11
-index 7fba8ce..1e18c51 100755
---- a/Samples/GLES1.1/17_Beizer/Makefile.x11
-+++ b/Samples/GLES1.1/17_Beizer/Makefile.x11
-@@ -3,11 +3,7 @@ DESTDIR = .
-
-
- # Make command to use for dependencies
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-
--TARGET_PATH_LIB = $(ROOTFS)/usr/lib
--TARGET_PATH_INCLUDE = $(ROOTFS)/usr/include
- COMMON_DIR=../common
-
- BIN_TUT = $(DESTDIR)/$(APPNAME)
-@@ -21,7 +17,6 @@ CFLAGS_TUT += \
- -DEGL_USE_X11 \
-
- CFLAGS_TUT += \
-- -I$(TARGET_PATH_INCLUDE) \
- -I$(COMMON_DIR)/inc \
-
-
-@@ -33,7 +28,7 @@ OBJECTS_TUT += \
-
- ASSETS = Beizer.bmp
-
--DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB)
-+DEPS_TUT = -lstdc++ -lm -lGLESv1_CM -lEGL -lX11 -ldl
-
- $(BIN_TUT) : $(OBJECTS_TUT)
- @echo " LD " $@
---
-1.7.9.5
-
diff --git a/recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk/0002-Don-t-build-missing-GLES1.1-samples-in-X11-Makefile.patch b/recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk/0002-Don-t-build-missing-GLES1.1-samples-in-X11-Makefile.patch
deleted file mode 100644
index 36566f9..0000000
--- a/recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk/0002-Don-t-build-missing-GLES1.1-samples-in-X11-Makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 390db03809834919d8d49faf9a0a528321684ac5 Mon Sep 17 00:00:00 2001
-From: Diego Rondini <diego.ml@zoho.com>
-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 <diego.ml@zoho.com>
----
- 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
-
diff --git a/recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk_1.00.bb b/recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk_1.00.bb
deleted file mode 100644
index 31917aa..0000000
--- a/recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk_1.00.bb
+++ /dev/null
@@ -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"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-fsl-demos][PATCH v2 3/7] packagegroup-fsl: create gpu packagegroups
2014-02-27 7:53 [meta-fsl-demos][PATCH v2 1/7] fsl-gpu-sdk: create version 1.1 recipe ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 2/7] vivante-gpu-sdk: remove this old recipe ronunes
@ 2014-02-27 7:53 ` ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 4/7] packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring ronunes
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: ronunes @ 2014-02-27 7:53 UTC (permalink / raw)
To: meta-freescale; +Cc: Rogerio Nunes
From: Rogerio Nunes <rogerio.nunes@freescale.com>
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.
Signed-off-by: Rogerio Nunes <rogerio.nunes@freescale.com>
---
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
diff --git a/recipes-fsl/images/fsl-image-gui.bb b/recipes-fsl/images/fsl-image-gui.bb
index 84eac8a..5441272 100644
--- a/recipes-fsl/images/fsl-image-gui.bb
+++ b/recipes-fsl/images/fsl-image-gui.bb
@@ -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 \
diff --git a/recipes-fsl/images/fsl-image-test.bb b/recipes-fsl/images/fsl-image-test.bb
index cd300c9..2570ac9 100644
--- a/recipes-fsl/images/fsl-image-test.bb
+++ b/recipes-fsl/images/fsl-image-test.bb
@@ -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 \
"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
new file mode 100644
index 0000000..a30d5e0
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
@@ -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)} \
+"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
new file mode 100644
index 0000000..a28293c
--- /dev/null
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
@@ -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}"
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
index 845e6d4..6a7d92d 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-testapps.bb
@@ -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 \
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-fsl-demos][PATCH v2 4/7] packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring
2014-02-27 7:53 [meta-fsl-demos][PATCH v2 1/7] fsl-gpu-sdk: create version 1.1 recipe ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 2/7] vivante-gpu-sdk: remove this old recipe ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 3/7] packagegroup-fsl: create gpu packagegroups ronunes
@ 2014-02-27 7:53 ` ronunes
2014-02-27 18:29 ` Otavio Salvador
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 5/7] fsl-image-multimedia: Add ronunes
` (2 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: ronunes @ 2014-02-27 7:53 UTC (permalink / raw)
To: meta-freescale; +Cc: Rogerio Nunes
From: Rogerio Nunes <rogerio.nunes@freescale.com>
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 <rogerio.nunes@freescale.com>
---
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-fsl-demos][PATCH v2 5/7] fsl-image-multimedia: Add
2014-02-27 7:53 [meta-fsl-demos][PATCH v2 1/7] fsl-gpu-sdk: create version 1.1 recipe ronunes
` (2 preceding siblings ...)
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 4/7] packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring ronunes
@ 2014-02-27 7:53 ` ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 6/7] fsl-image-multimedia-full: Add ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 7/7] fsl-image-machine-test: Add ronunes
5 siblings, 0 replies; 9+ messages in thread
From: ronunes @ 2014-02-27 7:53 UTC (permalink / raw)
To: meta-freescale; +Cc: Rogerio Nunes
From: Rogerio Nunes <rogerio.nunes@freescale.com>
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).
Signed-off-by: Rogerio Nunes <rogerio.nunes@freescale.com>
---
recipes-fsl/images/fsl-image-multimedia.bb | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 recipes-fsl/images/fsl-image-multimedia.bb
diff --git a/recipes-fsl/images/fsl-image-multimedia.bb b/recipes-fsl/images/fsl-image-multimedia.bb
new file mode 100644
index 0000000..3cf77e0
--- /dev/null
+++ b/recipes-fsl/images/fsl-image-multimedia.bb
@@ -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 \
+"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-fsl-demos][PATCH v2 6/7] fsl-image-multimedia-full: Add
2014-02-27 7:53 [meta-fsl-demos][PATCH v2 1/7] fsl-gpu-sdk: create version 1.1 recipe ronunes
` (3 preceding siblings ...)
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 5/7] fsl-image-multimedia: Add ronunes
@ 2014-02-27 7:53 ` ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 7/7] fsl-image-machine-test: Add ronunes
5 siblings, 0 replies; 9+ messages in thread
From: ronunes @ 2014-02-27 7:53 UTC (permalink / raw)
To: meta-freescale; +Cc: Rogerio Nunes
From: Rogerio Nunes <rogerio.nunes@freescale.com>
This image has all the packages that fsl-image-multimedia has
plus all gstreamer's plugins from base, good and bad packages.
Signed-off-by: Rogerio Nunes <rogerio.nunes@freescale.com>
---
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
diff --git a/recipes-fsl/images/fsl-image-multimedia-full.bb b/recipes-fsl/images/fsl-image-multimedia-full.bb
new file mode 100644
index 0000000..5e554ee
--- /dev/null
+++ b/recipes-fsl/images/fsl-image-multimedia-full.bb
@@ -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 \
+"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-fsl-demos][PATCH v2 7/7] fsl-image-machine-test: Add
2014-02-27 7:53 [meta-fsl-demos][PATCH v2 1/7] fsl-gpu-sdk: create version 1.1 recipe ronunes
` (4 preceding siblings ...)
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 6/7] fsl-image-multimedia-full: Add ronunes
@ 2014-02-27 7:53 ` ronunes
5 siblings, 0 replies; 9+ messages in thread
From: ronunes @ 2014-02-27 7:53 UTC (permalink / raw)
To: meta-freescale; +Cc: Rogerio Nunes
From: Rogerio Nunes <rogerio.nunes@freescale.com>
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.
Signed-off-by: Rogerio Nunes <rogerio.nunes@freescale.com>
---
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
diff --git a/recipes-fsl/images/fsl-image-machine-test.bb b/recipes-fsl/images/fsl-image-machine-test.bb
new file mode 100644
index 0000000..28075b9
--- /dev/null
+++ b/recipes-fsl/images/fsl-image-machine-test.bb
@@ -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 \
+"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [meta-fsl-demos][PATCH v2 4/7] packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 4/7] packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring ronunes
@ 2014-02-27 18:29 ` Otavio Salvador
2014-02-28 2:51 ` Rogerio Nunes
0 siblings, 1 reply; 9+ messages in thread
From: Otavio Salvador @ 2014-02-27 18:29 UTC (permalink / raw)
To: Rogerio Nunes; +Cc: meta-freescale, Rogerio Nunes
On Thu, Feb 27, 2014 at 4:53 AM, <ronunes@gmail.com> wrote:
> From: Rogerio Nunes <rogerio.nunes@freescale.com>
>
> 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 <rogerio.nunes@freescale.com>
> ---
> 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)} \
> +"
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.
> 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
>
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-fsl-demos][PATCH v2 4/7] packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring
2014-02-27 18:29 ` Otavio Salvador
@ 2014-02-28 2:51 ` Rogerio Nunes
0 siblings, 0 replies; 9+ messages in thread
From: Rogerio Nunes @ 2014-02-28 2:51 UTC (permalink / raw)
To: Otavio Salvador; +Cc: meta-freescale, Rogerio Nunes
On Thu, Feb 27, 2014 at 1:29 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Thu, Feb 27, 2014 at 4:53 AM, <ronunes@gmail.com> wrote:
>> From: Rogerio Nunes <rogerio.nunes@freescale.com>
>>
>> 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 <rogerio.nunes@freescale.com>
>> ---
>> 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)} \
>> +"
>
> 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.
>
>> 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
>>
>> _______________________________________________
>> meta-freescale mailing list
>> meta-freescale@yoctoproject.org
>> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-02-28 2:51 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-27 7:53 [meta-fsl-demos][PATCH v2 1/7] fsl-gpu-sdk: create version 1.1 recipe ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 2/7] vivante-gpu-sdk: remove this old recipe ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 3/7] packagegroup-fsl: create gpu packagegroups ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 4/7] packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring ronunes
2014-02-27 18:29 ` Otavio Salvador
2014-02-28 2:51 ` Rogerio Nunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 5/7] fsl-image-multimedia: Add ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 6/7] fsl-image-multimedia-full: Add ronunes
2014-02-27 7:53 ` [meta-fsl-demos][PATCH v2 7/7] fsl-image-machine-test: Add ronunes
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.