Packagegroups and images refactoring - step 2
cover Packagegroups and images refactoring - step 2
From: Rogerio Nunes <[email protected]>
This patchset makes some more additions and changes to the packagegroups and images in this layer.
Three new images are introduced:
fsl-image-multimedia - A console-only image that includes gstreamer packages
and Freescale's multimedia packages (VPU and GPU) when available.
fsl-image-multimedia-full - This image has all the packages that
fsl-image-multimedia has plus all gstreamer's plugins from base, good and bad packages.
fsl-image-machine-test - 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.
To support these images, new packagegroups are also created, and old packagegroups slightly modified. The legacy image recipes (fsl-image-gui and fsl-image-test) are adpated to the new packagegroups structure, so that they generate rootfs images that include at least same tools as before.
This patchset also replaces vivante-gpu-sdk by fsl-gpu-sdk.
Known issue:
fsl-image-machine-test fails to build without x11, because mesa-demos and piglit currently depend on it, and are unconditionally included with the tools-testapps image feature from poky. This needs to be fixed at poky.
Evan Kotara (1):
fsl-gpu-sdk: create version 1.1 recipe
Rogerio Nunes (6):
vivante-gpu-sdk: remove this old recipe
packagegroup-fsl: create gpu packagegroups packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring
fsl-image-multimedia: Add
fsl-image-multimedia-full: Add
fsl-image-machine-test: Add
recipes-fsl/images/fsl-image-gui.bb | 3 + recipes-fsl/images/fsl-image-machine-test.bb | 22 + recipes-fsl/images/fsl-image-multimedia-full.bb | 8 + recipes-fsl/images/fsl-image-multimedia.bb | 15 + recipes-fsl/images/fsl-image-test.bb | 3 + .../packagegroup-fsl-gstreamer-full.bb | 19 + .../packagegroups/packagegroup-fsl-gstreamer.bb | 66 ++- .../packagegroup-fsl-tools-gpu-external.bb | 18 + .../packagegroups/packagegroup-fsl-tools-gpu.bb | 26 + .../packagegroup-fsl-tools-testapps.bb | 16 - recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb | 45 ++ ...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 -- 14 files changed, 220 insertions(+), 688 deletions(-) create mode 100644 recipes-fsl/images/fsl-image-machine-test.bb create mode 100644 recipes-fsl/images/fsl-image-multimedia-full.bb create mode 100644 recipes-fsl/images/fsl-image-multimedia.bb create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb create mode 100644 recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb 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
Signature · 1 line
1.8.3.2
PATCH 1/7 fsl-gpu-sdk: create version 1.1 recipe
From: Evan Kotara <[email protected]>
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
@@ -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
Re: [meta-fsl-demos][PATCH 1/7] fsl-gpu-sdk: create version 1.1 recipe
Quoted 3 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
From: Evan Kotara <[email protected]>
If both X11 and Wayland are in
DISTRO_FEATURES, prefer X11
Sorry, Rogerio, but I think a more elaborated commit log is missing here.
From your cover letter, it looks like this recipe replaces another one. But from this patch it only includes a new one.
Daiane
Quoted 61 lines
Signed-off-by Evan Kotara <[email protected]>Signed-off-by Rogerio Nunes <[email protected]>--- 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.bbrecipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb new file +40
-1@@ -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
_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
Re: [meta-fsl-demos][PATCH 1/7] fsl-gpu-sdk: create version 1.1 recipe
Hi Daiane,
Quoted 10 lines · Daiane Angolini
Quoted 3 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
From: Evan Kotara <[email protected]>
If both X11 and Wayland are in
DISTRO_FEATURES, prefer X11Sorry, Rogerio, but I think a more elaborated commit log is missing here.
From your cover letter, it looks like this recipe replaces another one. But from this patch it only includes a new one.
Yes, this first patch is a squash of two other patches from FSL release layer that only include the new recipe for the gpu sdk. I tried to preserve as much as possible from the original commits, and I should probably add this info to the commit log too. I'll do that.
And I remove the old recipe in another patch. I'd rather keep it this way, but I can add a comment.
Quoted 62 lines
Daiane
Quoted 61 lines
Signed-off-by Evan Kotara <[email protected]>Signed-off-by Rogerio Nunes <[email protected]>--- 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.bbrecipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb new file +40
-1@@ -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
_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
Re: [meta-fsl-demos][PATCH 1/7] fsl-gpu-sdk: create version 1.1 recipe
Quoted 14 lines · Rogerio Nunes
Hi Daiane,
Quoted 10 lines · Daiane Angolini
Quoted 3 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
From: Evan Kotara <[email protected]>
If both X11 and Wayland are in
DISTRO_FEATURES, prefer X11Sorry, Rogerio, but I think a more elaborated commit log is missing here.
From your cover letter, it looks like this recipe replaces another one. But from this patch it only includes a new one.
Quoted 7 lines
Yes, this first patch is a squash of two other patches from FSL release layer that only include the new recipe for the gpu sdk. I tried to preserve as much as possible from the original commits, and I should probably add this info to the commit log too. I'll do that.
And I remove the old recipe in another patch. I'd rather keep it this way, but I can add a comment.
Yes; please do that so we can get this in master-next and in master soon and drop this from the patchset.
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
PATCH 2/7 vivante-gpu-sdk: remove this old recipe
In reply to [email protected]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
@@ -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
@@ -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
@@ -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
Re: [meta-fsl-demos][PATCH 2/7] vivante-gpu-sdk: remove this old recipe
Quoted 4 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
From: Rogerio Nunes <[email protected]>
Moving forward, fsl-gpu-sdk replaces vivante-gnu-sdk, and should be used instead.
Well,
So, please, add this information on the other recipe patch as well.
I think it´s confusing that both recipes was for the same thing.
Daiane
Quoted 720 lines
Signed-off-by Rogerio Nunes <[email protected]>--- 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.bbrecipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb +5
-0@@ -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@@ -1,598 +0,0 @@ -From 1d18aae77f0c2ff411d19ed5bd8c0b96bfd90190 Mon Sep 17 00:00:00 2001 -From: Diego Rondini <[email protected]> -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 <[email protected]> ---- - 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 -recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk/0002-Don-t-build-missing-GLES1.1-samples-in-X11-Makefile.patch deleted +0
-32@@ -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
-38@@ -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
_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
Re: [meta-fsl-demos][PATCH 2/7] vivante-gpu-sdk: remove this old recipe
Quoted 11 lines · Daiane Angolini
Quoted 4 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
From: Rogerio Nunes <[email protected]>
Moving forward, fsl-gpu-sdk replaces vivante-gnu-sdk, and should be used instead.
Well,
So, please, add this information on the other recipe patch as well.
I think it´s confusing that both recipes was for the same thing.
NP. I'll add the comments.
Quoted 722 lines
Daiane
Quoted 720 lines
Signed-off-by Rogerio Nunes <[email protected]>--- 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.bbrecipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb +5
-0@@ -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@@ -1,598 +0,0 @@ -From 1d18aae77f0c2ff411d19ed5bd8c0b96bfd90190 Mon Sep 17 00:00:00 2001 -From: Diego Rondini <[email protected]> -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 <[email protected]> ---- - 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 -recipes-graphics/vivante-gpu-sdk/vivante-gpu-sdk/0002-Don-t-build-missing-GLES1.1-samples-in-X11-Makefile.patch deleted +0
-32@@ -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
-38@@ -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
_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
PATCH 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Re: [meta-fsl-demos][PATCH 3/7] packagegroup-fsl: create gpu packagegroups
Quoted 8 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
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.
Quoted 5 lines
*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.
\o/
yes! I like big commit logs
#RN
Quoted 52 lines
Signed-off-by Rogerio Nunes <[email protected]>--- 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.bbrecipes-fsl/images/fsl-image-gui.bb +2
-0@@ -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@@ -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 +8
-0@@ -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" +
recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb line 18
Quoted 10 lines
recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb new file +10
-0+inherit packagegroup + +X11_TOOLS = " \ + mesa-demos \ + glmark2 \ +" + +RDEPENDS_${PN} = " \ + ${@base_contains("DISTRO_FEATURES", "x11", "${X11_TOOLS}", "", d)} \ +"
cool
Quoted 57 lines
recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb new file +26
-0@@ -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
-11@@ -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 \ --
Quoted 1 line
1.8.3.2
beautifull!
Thanks
reviewed-by,
Daiane
Quoted 5 lines
_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
PATCH 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
@@ -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
@@ -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
@@ -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
@@ -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
Re: [meta-fsl-demos][PATCH 4/7] packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring
Quoted 14 lines · On Wed, Feb 26, 2014 at 2:03 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.
Quoted 7 lines
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.
lovely commit log <3
Quoted 49 lines
Signed-off-by Rogerio Nunes <[email protected]>--- 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.bbrecipes-fsl/images/fsl-image-gui.bb +1
-0@@ -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@@ -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@@ -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)} \ +"
why do you decided to use 3 lines to add this base_contains line? #weird
other than that, I don´t have comments ;-)
reviewed-by,
daiane
Quoted 122 lines
recipes-fsl/packagegroups/packagegroup-fsl-gstreamer.bb +61
-5@@ -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@@ -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
Re: [meta-fsl-demos][PATCH 4/7] packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring
Quoted 87 lines · Daiane Angolini
Quoted 14 lines · On Wed, Feb 26, 2014 at 2:03 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.
Quoted 7 lines
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.
lovely commit log <3
Quoted 49 lines
Signed-off-by Rogerio Nunes <[email protected]>--- 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.bbrecipes-fsl/images/fsl-image-gui.bb +1
-0@@ -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@@ -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@@ -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 packagegrouprecipes-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)} \ +"why do you decided to use 3 lines to add this
base_containsline? #weird
Quoted 1 line
other than that, I don´t have comments ;-)
Only because there is a base_contain call inside another base_contain call, so I thought it would be more readable this way. Besides a single line was too big.
If you don't mind, I'd rather keep three lines.
Thx
Quoted 127 lines
reviewed-by,
daianeQuoted 122 lines
recipes-fsl/packagegroups/packagegroup-fsl-gstreamer.bb +61
-5@@ -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@@ -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
Re: [meta-fsl-demos][PATCH 4/7] packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring
Quoted 107 lines
-----Original Message-----
From: [email protected] [mailto:meta-freescale- [email protected]] On Behalf Of Rogerio Nunes
Sent: Wednesday, February 26, 2014 2:47 PM
To: Daiane Angolini
Cc: [email protected]; Nunes Rogerio-B35650
Subject: Re: [meta-freescale] [meta-fsl-demos][PATCH 4/7] packagegroup-fsl- *, fsl-image-*: Gstreamer packagegroup refactoringQuoted 18 lines · Daiane Angolini
Quoted 17 lines · On Wed, Feb 26, 2014 at 2:03 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.
Quoted 13 lines
Quoted 4 lines
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.
lovely commit log <3
Quoted 6 lines
Signed-off-by Rogerio Nunes <[email protected]>--- 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++++++++++++++++++++--
Quoted 35 lines
Quoted 35 lines
.../packagegroup-fsl-tools-testapps.bb | 6 -- 5 files changed, 82 insertions(+), 11 deletions(-) create mode100644 recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb
recipes-fsl/images/fsl-image-gui.bb +1
-0@@ -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 --gita/recipes-fsl/images/fsl-image-test.bb
b/recipes-fsl/images/fsl-image-test.bb
index 2570ac9..0408c7c 100644recipes-fsl/images/fsl-image-test.bb +1
-0@@ -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 --gita/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/nullQuoted 8 lines
recipes-fsl/images/fsl-image-test.bb line 6
Quoted 8 lines
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb
recipes-fsl/images/fsl-image-test.bb +6
-0@@ -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 \
Quoted 1 line
recipes-fsl/images/fsl-image-test.bb line 7
Quoted 1 line
recipes-fsl/images/fsl-image-test.bb +1
-0+file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
Quoted 16 lines
recipes-fsl/images/fsl-image-test.bb line 19
Quoted 12 lines
recipes-fsl/images/fsl-image-test.bb +12
-0+ +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)} \ "why do you decided to use 3 lines to add this
base_containsline? #weird
Quoted 6 lines
Quoted 1 line
other than that, I don´t have comments ;-)
Only because there is a
base_containcall inside anotherbase_containcall, so I thought it would be more readable this way. Besides a single line was too big.
If you don't mind, I'd rather keep three lines.
I don´t mind ;)
Daiane
PATCH 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.
--- recipes-fsl/images/fsl-image-multimedia.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 recipes-fsl/images/fsl-image-multimedia.bb
recipes-fsl/images/fsl-image-multimedia.bb new file +15 -0
@@ -0,0 +1,15 @@ +DESCRIPTION = "A console-only image that includes gstreamer packages and \ +Freescale's multimedia packages (VPU and GPU) when available." + +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
Re: [meta-fsl-demos][PATCH 5/7] fsl-image-multimedia: Add
Quoted 4 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
From: Rogerio Nunes <[email protected]>
A console-only image that includes gstreamer packages and Freescale's multimedia packages (VPU and GPU) when available.
reviewed-by,
daiane
Quoted 35 lines
Signed-off-by Rogerio Nunes <[email protected]>--- recipes-fsl/images/fsl-image-multimedia.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 recipes-fsl/images/fsl-image-multimedia.bbrecipes-fsl/images/fsl-image-multimedia.bb new file +15
-1@@ -0,0 +1,15 @@ +DESCRIPTION = "A console-only image that includes gstreamer packages and \ +Freescale's multimedia packages (VPU and GPU) when available." + +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
_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
Re: [meta-fsl-demos][PATCH 5/7] fsl-image-multimedia: Add
In reply to [email protected]Hi Rogerio -
Quoted 4 lines · On 2/25/14, 11:03 PM, [email protected] wrote:
From: Rogerio Nunes <[email protected]>
A console-only image that includes gstreamer packages and Freescale's multimedia packages (VPU and GPU) when available.
What does "when available" mean in this context?
Quoted 13 lines
Signed-off-by Rogerio Nunes <[email protected]>--- recipes-fsl/images/fsl-image-multimedia.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+)create mode 100644 recipes-fsl/images/fsl-image-multimedia.bb
recipes-fsl/images/fsl-image-multimedia.bb new file +0
-0
recipes-fsl/images/fsl-image-multimedia.bb line 2
Quoted 2 lines
recipes-fsl/images/fsl-image-multimedia.bb new file +2
-0@@ -0,0 +1,15 @@ +DESCRIPTION = "A console-only image that includes gstreamer packages and \ +Freescale's multimedia packages (VPU and GPU) when available."
Same question here.
Quoted 13 lines
recipes-fsl/images/fsl-image-multimedia.bb new file +13
-0+ +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 \ +"
Re: [meta-fsl-demos][PATCH 5/7] fsl-image-multimedia: Add
Hi John,
Quoted 12 lines · John Weber
Hi Rogerio -
Quoted 5 lines · On 2/25/14, 11:03 PM, [email protected] wrote:
From: Rogerio Nunes <[email protected]>
A console-only image that includes gstreamer packages and Freescale's multimedia packages (VPU and GPU) when available.
What does "when available" mean in this context?
Good question. It means GPU and VPU libraries are machine dependent, so accelerated packages/libraries are only included when available for the specific machine.
I'll improve the comment. Thanks.
Quoted 7 lines
Quoted 7 lines
Signed-off-by Rogerio Nunes <[email protected]>--- recipes-fsl/images/fsl-image-multimedia.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+)create mode 100644 recipes-fsl/images/fsl-image-multimedia.bb
Quoted 12 lines
Quoted 10 lines
recipes-fsl/images/fsl-image-multimedia.bb new file +1
-0@@ -0,0 +1,15 @@ +DESCRIPTION = "A console-only image that includes gstreamer packages and\
+Freescale's multimedia packages (VPU and GPU) when available."Same question here.
Same answer :).
Quoted 20 lines
Quoted 4 lines
recipes-fsl/images/fsl-image-multimedia.bb new file +3
-0+ +IMAGE_FEATURES += "\ + ${@base_contains('DISTRO_FEATURES', 'x11', 'x11-base', '', d)} \recipes-fsl/images/fsl-image-multimedia.bb line 15
Quoted 10 lines
recipes-fsl/images/fsl-image-multimedia.bb new file +10
-0+" + +LICENSE = "MIT" + +inherit core-image + +CORE_IMAGE_EXTRA_INSTALL += " \ + packagegroup-fsl-gstreamer \ + packagegroup-fsl-tools-gpu \ +"_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
PATCH 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
@@ -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
Re: [meta-fsl-demos][PATCH 6/7] fsl-image-multimedia-full: Add
Quoted 6 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
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.
Signed-off-by Rogerio Nunes <[email protected]>
reviewed-by,
daiane
Quoted 26 lines
--- recipes-fsl/images/fsl-image-multimedia-full.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 recipes-fsl/images/fsl-image-multimedia-full.bbrecipes-fsl/images/fsl-image-multimedia-full.bb new file +8
-1@@ -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
_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
PATCH 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
@@ -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
Re: [meta-fsl-demos][PATCH 7/7] fsl-image-machine-test: Add
Quoted 8 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
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.
Signed-off-by Rogerio Nunes <[email protected]>
reviewed-by,
daiane
Quoted 40 lines
--- recipes-fsl/images/fsl-image-machine-test.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 recipes-fsl/images/fsl-image-machine-test.bbrecipes-fsl/images/fsl-image-machine-test.bb new file +22
-1@@ -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
_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
Quoted 10 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
From: Rogerio Nunes <[email protected]>
This patchset makes some more additions and changes to the packagegroups and images in this layer.
Three new images are introduced:
fsl-image-multimedia - A console-only image that includes gstreamer packages
and Freescale's multimedia packages (VPU and GPU) when available.
Quoted 8 lines
fsl-image-multimedia-full - This image has all the packages that
fsl-image-multimedia has plus all gstreamer's plugins from base, good and bad packages.fsl-image-machine-test - 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.
Thanks a lot, Rogerio, for detailing the images. This piece of text must be copied in RN.
Currently we don´t have a meta-fsl-demos section in RN, but I think it´s important to add info, at
least for the images.
What do you think?
Daiane
Quoted 58 lines
To support these images, new packagegroups are also created, and old packagegroups slightly modified. The legacy image recipes (fsl-image-gui and fsl-image-test) are adpated to the new packagegroups structure, so that they generate rootfs images that include at least same tools as before.
This patchset also replaces vivante-gpu-sdk by fsl-gpu-sdk.
Known issue:
fsl-image-machine-test fails to build without x11, because mesa-demos and piglit currently depend on it, and are unconditionally included with the tools-testapps image feature from poky. This needs to be fixed at poky.Evan Kotara (1):
fsl-gpu-sdk: create version 1.1 recipeRogerio Nunes (6):
vivante-gpu-sdk: remove this old recipe
packagegroup-fsl: create gpu packagegroups packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring
fsl-image-multimedia: Add
fsl-image-multimedia-full: Add
fsl-image-machine-test: Addrecipes-fsl/images/fsl-image-gui.bb | 3 + recipes-fsl/images/fsl-image-machine-test.bb | 22 + recipes-fsl/images/fsl-image-multimedia-full.bb | 8 + recipes-fsl/images/fsl-image-multimedia.bb | 15 + recipes-fsl/images/fsl-image-test.bb | 3 + .../packagegroup-fsl-gstreamer-full.bb | 19 + .../packagegroups/packagegroup-fsl-gstreamer.bb | 66 ++- .../packagegroup-fsl-tools-gpu-external.bb | 18 + .../packagegroups/packagegroup-fsl-tools-gpu.bb | 26 + .../packagegroup-fsl-tools-testapps.bb | 16 - recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb | 45 ++ ...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 -- 14 files changed, 220 insertions(+), 688 deletions(-) create mode 100644 recipes-fsl/images/fsl-image-machine-test.bb create mode 100644 recipes-fsl/images/fsl-image-multimedia-full.bb create mode 100644 recipes-fsl/images/fsl-image-multimedia.bb create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb create mode 100644 recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb 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--
1.8.3.2_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
Quoted 15 lines · Daiane Angolini
Quoted 14 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
From: Rogerio Nunes <[email protected]>
This patchset makes some more additions and changes to the packagegroups and images in this layer.
Three new images are introduced:
fsl-image-multimedia - A console-only image that includes gstreamer packages
and Freescale's multimedia packages (VPU and GPU) when available.fsl-image-multimedia-full - This image has all the packages that
fsl-image-multimedia has plus all gstreamer's plugins from base, good and bad packages.
Quoted 8 lines
Quoted 4 lines
fsl-image-machine-test - 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.Thanks a lot, Rogerio, for detailing the images. This piece of text must be copied in RN.
+1 on the "Thank you"...
Having an easy accelerated, non-X image as a starting point is a very big win for customers looking at MM applications.
Regards,
Eric
Hi Eric,
Quoted 26 lines · Eric Nelson
Quoted 25 lines · Daiane Angolini
Quoted 21 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
From: Rogerio Nunes <[email protected]>
This patchset makes some more additions and changes to the packagegroups and images in this layer.
Three new images are introduced:
fsl-image-multimedia - A console-only image that includes gstreamer packages
and Freescale's multimedia packages (VPU and GPU) when available.fsl-image-multimedia-full - This image has all the packages that
fsl-image-multimedia has plus all gstreamer's plugins from base,
good and
bad packages.fsl-image-machine-test - 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.
Quoted 8 lines
Quoted 3 lines
Thanks a lot, Rogerio, for detailing the images. This piece of text must be copied in RN.
+1 on the "Thank you"...
Having an easy accelerated, non-X image as a starting point is a very big win for customers looking at MM applications.
Thanks for the feedback.
I included the /opt packages used for GPU test/demo in the images, so they should be a good starting point for evaluation/development (better build time), but not necessarily for a final product image (big rootfs).
I'll work on some more images to demo the second case. And I'll add this comment to the commit log too in v2 ;-).
Quoted 6 lines
Regards,
Eric
Quoted 20 lines · Daiane Angolini
Quoted 10 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
From: Rogerio Nunes <[email protected]>
This patchset makes some more additions and changes to the packagegroups and images in this layer.
Three new images are introduced:
fsl-image-multimedia - A console-only image that includes gstreamer packages
and Freescale's multimedia packages (VPU and GPU) when available.Quoted 8 lines
fsl-image-multimedia-full - This image has all the packages that
fsl-image-multimedia has plus all gstreamer's plugins from base, good and bad packages.fsl-image-machine-test - 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.
Quoted 9 lines
Thanks a lot, Rogerio, for detailing the images. This piece of text must be copied in RN.
Currently we don´t have a meta-fsl-demos section in RN, but I think it´s important to add info, at
least for the images.What do you think?
Agree! I can help improve the RN with this info.
Thanks for the suggestion.
Quoted 60 lines
Daiane
Quoted 58 lines
To support these images, new packagegroups are also created, and old packagegroups slightly modified. The legacy image recipes (fsl-image-gui and fsl-image-test) are adpated to the new packagegroups structure, so that they generate rootfs images that include at least same tools as before.
This patchset also replaces vivante-gpu-sdk by fsl-gpu-sdk.
Known issue:
fsl-image-machine-test fails to build without x11, because mesa-demos and piglit currently depend on it, and are unconditionally included with the tools-testapps image feature from poky. This needs to be fixed at poky.Evan Kotara (1):
fsl-gpu-sdk: create version 1.1 recipeRogerio Nunes (6):
vivante-gpu-sdk: remove this old recipe
packagegroup-fsl: create gpu packagegroups packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring
fsl-image-multimedia: Add
fsl-image-multimedia-full: Add
fsl-image-machine-test: Addrecipes-fsl/images/fsl-image-gui.bb | 3 + recipes-fsl/images/fsl-image-machine-test.bb | 22 + recipes-fsl/images/fsl-image-multimedia-full.bb | 8 + recipes-fsl/images/fsl-image-multimedia.bb | 15 + recipes-fsl/images/fsl-image-test.bb | 3 + .../packagegroup-fsl-gstreamer-full.bb | 19 + .../packagegroups/packagegroup-fsl-gstreamer.bb | 66 ++- .../packagegroup-fsl-tools-gpu-external.bb | 18 + .../packagegroups/packagegroup-fsl-tools-gpu.bb | 26 + .../packagegroup-fsl-tools-testapps.bb | 16 - recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb | 45 ++ ...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 -- 14 files changed, 220 insertions(+), 688 deletions(-) create mode 100644 recipes-fsl/images/fsl-image-machine-test.bb create mode 100644 recipes-fsl/images/fsl-image-multimedia-full.bb create mode 100644 recipes-fsl/images/fsl-image-multimedia.bb create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb create mode 100644 recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb 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--
1.8.3.2_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
Quoted 4 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
From: Rogerio Nunes <[email protected]>
This patchset makes some more additions and changes to the packagegroups and images in this layer.
Otavio,
Please, let us know when you merge this patchset in master next. I´m going to give it a test.
Daiane
Quoted 72 lines
Three new images are introduced:
fsl-image-multimedia - A console-only image that includes gstreamer packages
and Freescale's multimedia packages (VPU and GPU) when available.fsl-image-multimedia-full - This image has all the packages that
fsl-image-multimedia has plus all gstreamer's plugins from base, good and bad packages.fsl-image-machine-test - 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.To support these images, new packagegroups are also created, and old packagegroups slightly modified. The legacy image recipes (fsl-image-gui and fsl-image-test) are adpated to the new packagegroups structure, so that they generate rootfs images that include at least same tools as before.
This patchset also replaces vivante-gpu-sdk by fsl-gpu-sdk.
Known issue:
fsl-image-machine-test fails to build without x11, because mesa-demos and piglit currently depend on it, and are unconditionally included with the tools-testapps image feature from poky. This needs to be fixed at poky.Evan Kotara (1):
fsl-gpu-sdk: create version 1.1 recipeRogerio Nunes (6):
vivante-gpu-sdk: remove this old recipe
packagegroup-fsl: create gpu packagegroups packagegroup-fsl-*, fsl-image-*: Gstreamer packagegroup refactoring
fsl-image-multimedia: Add
fsl-image-multimedia-full: Add
fsl-image-machine-test: Addrecipes-fsl/images/fsl-image-gui.bb | 3 + recipes-fsl/images/fsl-image-machine-test.bb | 22 + recipes-fsl/images/fsl-image-multimedia-full.bb | 8 + recipes-fsl/images/fsl-image-multimedia.bb | 15 + recipes-fsl/images/fsl-image-test.bb | 3 + .../packagegroup-fsl-gstreamer-full.bb | 19 + .../packagegroups/packagegroup-fsl-gstreamer.bb | 66 ++- .../packagegroup-fsl-tools-gpu-external.bb | 18 + .../packagegroups/packagegroup-fsl-tools-gpu.bb | 26 + .../packagegroup-fsl-tools-testapps.bb | 16 - recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb | 45 ++ ...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 -- 14 files changed, 220 insertions(+), 688 deletions(-) create mode 100644 recipes-fsl/images/fsl-image-machine-test.bb create mode 100644 recipes-fsl/images/fsl-image-multimedia-full.bb create mode 100644 recipes-fsl/images/fsl-image-multimedia.bb create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-gstreamer-full.bb create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb create mode 100644 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb create mode 100644 recipes-graphics/fsl-gpu-sdk/fsl-gpu-sdk_1.1.bb 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--
1.8.3.2_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
Hello Rogerio,
First I'd like to thank you for this work. I know how much thinking and work is needed to a nice patchset and flexible set of packagegroups and images.
Quoted 24 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
From: Rogerio Nunes <[email protected]>
This patchset makes some more additions and changes to the packagegroups and images in this layer.
Three new images are introduced:
fsl-image-multimedia - A console-only image that includes gstreamer packages
and Freescale's multimedia packages (VPU and GPU) when available.fsl-image-multimedia-full - This image has all the packages that
fsl-image-multimedia has plus all gstreamer's plugins from base, good and bad packages.fsl-image-machine-test - 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.To support these images, new packagegroups are also created, and old packagegroups slightly modified. The legacy image recipes (fsl-image-gui and fsl-image-test) are adpated to the new packagegroups structure, so that they generate rootfs images that include at least same tools as before.
Quoted 6 lines
This patchset also replaces vivante-gpu-sdk by fsl-gpu-sdk.
Known issue:
fsl-image-machine-test fails to build without x11, because mesa-demos and piglit currently depend on it, and are unconditionally included with the tools-testapps image feature from poky. This needs to be fixed at poky.
Good remark. I also think we ought to plan to drop the old images when those are complete. The proposed images provides a much better set of features and are faster to build (due its focus in the really need packages) so I think it'd be a good goal for near future.
I think the changes you have to do are minimal and Daiane has provided a good review on those; it would be good if you could prepare a v2 to address those and then we can get it merged in master-next for testing.
What do you think?
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
Hi Otavio,
Quoted 38 lines · Otavio Salvador
Hello Rogerio,
First I'd like to thank you for this work. I know how much thinking and work is needed to a nice patchset and flexible set of packagegroups and images.
Quoted 24 lines · On Wed, Feb 26, 2014 at 2:03 AM, <[email protected]> wrote:
From: Rogerio Nunes <[email protected]>
This patchset makes some more additions and changes to the packagegroups and images in this layer.
Three new images are introduced:
fsl-image-multimedia - A console-only image that includes gstreamer packages
and Freescale's multimedia packages (VPU and GPU) when available.fsl-image-multimedia-full - This image has all the packages that
fsl-image-multimedia has plus all gstreamer's plugins from base, good and bad packages.fsl-image-machine-test - 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.To support these images, new packagegroups are also created, and old packagegroups slightly modified. The legacy image recipes (fsl-image-gui and fsl-image-test) are adpated to the new packagegroups structure, so that they generate rootfs images that include at least same tools as before.
Quoted 6 lines
This patchset also replaces vivante-gpu-sdk by fsl-gpu-sdk.
Known issue:
fsl-image-machine-test fails to build without x11, because mesa-demos and piglit currently depend on it, and are unconditionally included with the tools-testapps image feature from poky. This needs to be fixed at poky.
Quoted 4 lines
Good remark. I also think we ought to plan to drop the old images when those are complete. The proposed images provides a much better set of features and are faster to build (due its focus in the really need packages) so I think it'd be a good goal for near future.
Agree. Step 3 of the refactoring yet to come :).
Quoted 8 lines
I think the changes you have to do are minimal and Daiane has provided a good review on those; it would be good if you could prepare a v2 to address those and then we can get it merged in master-next for testing.
What do you think?
Sounds good. V2 sent.
Thanks for the comments guys.
Quoted 4 lines
--
Otavio SalvadorO.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750