qt5: add mx5 and mx6 support
RFC PATCH 1/4 qt5: add mx5 and mx6 support
- this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
- tested on i.MX51, i.MX53 and i.MX6Q
--- conf/layer.conf | 2 + recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp | 105 ++++++++++++++++++++++++ recipes-qt/qt5/qtbase_5.0.2.bbappend | 68 +++++++++++++++ 3 files changed, 175 insertions(+) create mode 100644 recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp create mode 100644 recipes-qt/qt5/qtbase_5.0.2.bbappend
conf/layer.conf +2 -0
@@ -4,6 +4,8 @@ BBPATH .= ":${LAYERDIR}" # We have a packages directory, add to BBFILES BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" +BBMASK_append = "${@base_contains('BBFILE_COLLECTIONS', 'qt5-layer', '' ,\ + ' meta-fsl-arm/recipes-qt/qt5/*.bb meta-fsl-arm/recipes-qt/qt5/*.bbappend', d)}" BBFILE_COLLECTIONS += "fsl-arm" BBFILE_PATTERN_fsl-arm := "^${LAYERDIR}/"
recipes-qt/qt5/qtbase/mx5/qeglfshooks_imx5.cpp new file +105 -0
105 lines not on this page · raw message
recipes-qt/qt5/qtbase_5.0.2.bbappend new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
1.7.10.4
RFC PATCH 2/4 amd-gpu-bin-mx51: new recipe
this provides the GPU libraries for framebuffer
---
.../amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb | 89 ++++++++++++++++++++
.../fix-linux-build-check.patch | 0
2 files changed, 89 insertions(+)
create mode 100644 recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb
rename recipes-graphics/amd-gpu-x11-bin/{amd-gpu-x11-bin-mx51 => files}/fix-linux-build-check.patch (100%)recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb new file +89 -0
@@ -0,0 +1,89 @@ +# Copyright (C) 2011, 2012 Freescale +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "GPU driver and apps for frambuffer on mx51" +LICENSE = "Proprietary" +SECTION = "libs" +PR = "r0" + +RCONFLICTS_${PN} = "amd-gpu-x11-bin-mx51" + +# FIXME: Replace for correct AMD license +LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" + +PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2" + +SRC_URI = "${FSL_MIRROR}/amd-gpu-bin-mx51-${PV}.bin;fsl-eula=true \ + file://fix-linux-build-check.patch" +SRC_URI[md5sum] = "9f9b5f67b595721a08793aae8bd8fc46" +SRC_URI[sha256sum] = "f0db68a764b5fb199729e7435f606b8d12b61ca97990336c647b7e81f4a584d9" + +inherit fsl-eula-unpack + +# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have +# the source we cannot fix it. Disable the insane check for now. +python populate_packages_prepend() { + for p in d.getVar('PACKAGES', True).split(): + d.setVar("INSANE_SKIP_%s" % p, "ldflags") +} + +do_install () { + install -d ${D}${libdir} + install -d ${D}${bindir} + install -d ${D}${includedir} + + cp -axr ${S}/usr/bin/* ${D}${bindir} + cp -axf ${S}/usr/lib/* ${D}${libdir} + cp -axr ${S}/usr/include/* ${D}${includedir} + + find ${D}${bindir} -type f -exec chmod 755 {} \; + find ${D}${libdir} -type f -exec chmod 644 {} \; + find ${D}${includedir} -type f -exec chmod 644 {} \; + + # FIXME: Fix sonames of broken libraries + mv ${D}${libdir}/lib2dz160.so ${D}${libdir}/lib2dz160.so.0 + mv ${D}${libdir}/lib2dz430.so ${D}${libdir}/lib2dz430.so.0 + + # FIXME: Remove unkown files + rm -r ${D}${libdir}/libcsi.a \ + ${D}${libdir}/libres.a +} + +PACKAGES =+ "libgsl-fsl-mx51 libgsl-fsl-mx51-dev libgsl-fsl-mx51-dbg \ + libegl-mx51 libegl-mx51-dev libegl-mx51-dbg \ + libgles-mx51 libgles-mx51-dev libgles-mx51-dbg \ + libgles2-mx51 libgles2-mx51-dev libgles2-mx51-dbg \ + libopenvg-mx51 libopenvg-mx51-dev libopenvg-mx51-dbg \ + lib2dz160-mx51 lib2dz160-mx51-dbg \ + lib2dz430-mx51 lib2dz430-mx51-dbg" + +FILES_${PN}-dbg = "${bindir}/.debug/*" + +FILES_libgsl-fsl-mx51 = "${libdir}/libgsl-fsl${SOLIBS}" +FILES_libgsl-fsl-mx51-dev = "${libdir}/libgsl-fsl${SOLIBSDEV}" +FILES_libgsl-fsl-mx51-dbg = "${libdir}/.debug/libgsl-fsl${SOLIBS}" + +FILES_libegl-mx51 = "${libdir}/libEGL${SOLIBS}" +FILES_libegl-mx51-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/libEGL${SOLIBSDEV}" +FILES_libegl-mx51-dbg = "${libdir}/.debug/libEGL${SOLIBS}" + +FILES_libgles-mx51 = "${libdir}/libGLESv1*${SOLIBS}" +FILES_libgles-mx51-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBSDEV}" +FILES_libgles-mx51-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS}" + +FILES_libgles2-mx51 = "${libdir}/libGLESv2${SOLIBS}" +FILES_libgles2-mx51-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}" +FILES_libgles2-mx51-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}" + +FILES_libopenvg-mx51 = "${libdir}/libOpenVG${SOLIBS}" +FILES_libopenvg-mx51-dev = "${includedir}/VG ${libdir}/libOpenVG${SOLIBSDEV}" +FILES_libopenvg-mx51-dbg = "${libdir}/.debug/libOpenVG${SOLIBS}" + +FILES_lib2dz160-mx51 = "${libdir}/lib2dz160${SOLIBS}" +FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}" + +FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}" +FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}" + +COMPATIBLE_MACHINE = "(mx5)" +PACKAGE_ARCH = "${MACHINE_ARCH}"
recipes-graphics/amd-gpu-x11-bin/files/fix-linux-build-check.patch renamed from recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch +0 -0
Signature · 1 line
1.7.10.4
Re: [meta-fsl-arm][PATCH RFC 2/4] amd-gpu-bin-mx51: new recipe
Quoted 4 lines · Eric Bénard
this provides the GPU libraries for framebuffer
Signed-off-by Eric Bénard <[email protected]>
Please move the common code to an amd-gpu-bin.inc file so we avoid this amount of duplication.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://projetos.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
RFC PATCH 3/4 amd-gpu-x11-bin-mx51: only enable when x11 is in DISTRO_FEATURES
In reply to Eric Bénardthis prevent warnings and parse errors
--- .../amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +4 -2
@@ -6,9 +6,11 @@ LICENSE = "Proprietary" SECTION = "libs" PR = "r12" +RCONFLICTS_${PN} = "amd-gpu-bin-mx51" + # FIXME: Replace for correct AMD license LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" -DEPENDS = "virtual/libx11 libxrender" +DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender', '', d)}" PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2"
@@ -84,5 +86,5 @@ FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}" FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}" FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}" -COMPATIBLE_MACHINE = "(mx5)" +COMPATIBLE_MACHINE = "{@base_contains('DISTRO_FEATURES', 'x11', (mx5), '', d)}" PACKAGE_ARCH = "${MACHINE_ARCH}"
Signature · 1 line
1.7.10.4
Re: [meta-fsl-arm][PATCH RFC 3/4] amd-gpu-x11-bin-mx51: only enable when x11 is in DISTRO_FEATURES
Quoted 4 lines · Eric Bénard
this prevent warnings and parse errors
Signed-off-by Eric Bénard <[email protected]>
-COMPATIBLE_MACHINE = "(mx5)"
+COMPATIBLE_MACHINE = "{@base_contains('DISTRO_FEATURES', 'x11', (mx5), '', d)}"
Something like:
python __anonymous () {
distro_features = d.getVar('DISTRO_FEATURES', True).split()
if 'x11' not in distro_features:
raise bb.parse.SkipPackage('missing required "x11" distro feature')
}
could be used so I think you don't need to handle distro feature twice (compat machine and depends).
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://projetos.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Re: [meta-fsl-arm][PATCH RFC 3/4] amd-gpu-x11-bin-mx51: only enable when x11 is in DISTRO_FEATURES
Quoted 25 lines · Otavio Salvador
Quoted 4 lines · Eric Bénard
this prevent warnings and parse errors
Signed-off-by Eric Bénard <[email protected]>-COMPATIBLE_MACHINE = "(mx5)"
+COMPATIBLE_MACHINE = "{@base_contains('DISTRO_FEATURES', 'x11', (mx5), '', d)}"Something like:
python
__anonymous() {
distro_features=d.getVar('DISTRO_FEATURES', True).split()if 'x11' not in
distro_features:raise
bb.parse.SkipPackage('missing required "x11" distro feature')
Quoted 7 lines
}
could be used so I think you don't need to handle distro feature twice (compat machine and depends).
will try, in fact I think only COMPATIBLE_MACHINE is needed.
Eric
RFC PATCH 4/4 amd-gpu*: factorize the recipes
In reply to Eric Bénard--- .../amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb | 78 +------------------ recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc | 82 ++++++++++++++++++++ .../amd-gpu-x11-bin-mx51_11.09.01.bb | 76 +----------------- 3 files changed, 85 insertions(+), 151 deletions(-) create mode 100644 recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb +2 -76
@@ -2,88 +2,14 @@ # Released under the MIT license (see COPYING.MIT for the terms) DESCRIPTION = "GPU driver and apps for frambuffer on mx51" -LICENSE = "Proprietary" -SECTION = "libs" + PR = "r0" RCONFLICTS_${PN} = "amd-gpu-x11-bin-mx51" -# FIXME: Replace for correct AMD license -LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" - -PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2" +include amd-gpu-mx51.inc -SRC_URI = "${FSL_MIRROR}/amd-gpu-bin-mx51-${PV}.bin;fsl-eula=true \ - file://fix-linux-build-check.patch" SRC_URI[md5sum] = "9f9b5f67b595721a08793aae8bd8fc46" SRC_URI[sha256sum] = "f0db68a764b5fb199729e7435f606b8d12b61ca97990336c647b7e81f4a584d9" -inherit fsl-eula-unpack - -# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have -# the source we cannot fix it. Disable the insane check for now. -python populate_packages_prepend() { - for p in d.getVar('PACKAGES', True).split(): - d.setVar("INSANE_SKIP_%s" % p, "ldflags") -} - -do_install () { - install -d ${D}${libdir} - install -d ${D}${bindir} - install -d ${D}${includedir} - - cp -axr ${S}/usr/bin/* ${D}${bindir} - cp -axf ${S}/usr/lib/* ${D}${libdir} - cp -axr ${S}/usr/include/* ${D}${includedir} - - find ${D}${bindir} -type f -exec chmod 755 {} \; - find ${D}${libdir} -type f -exec chmod 644 {} \; - find ${D}${includedir} -type f -exec chmod 644 {} \; - - # FIXME: Fix sonames of broken libraries - mv ${D}${libdir}/lib2dz160.so ${D}${libdir}/lib2dz160.so.0 - mv ${D}${libdir}/lib2dz430.so ${D}${libdir}/lib2dz430.so.0 - - # FIXME: Remove unkown files - rm -r ${D}${libdir}/libcsi.a \ - ${D}${libdir}/libres.a -} - -PACKAGES =+ "libgsl-fsl-mx51 libgsl-fsl-mx51-dev libgsl-fsl-mx51-dbg \ - libegl-mx51 libegl-mx51-dev libegl-mx51-dbg \ - libgles-mx51 libgles-mx51-dev libgles-mx51-dbg \ - libgles2-mx51 libgles2-mx51-dev libgles2-mx51-dbg \ - libopenvg-mx51 libopenvg-mx51-dev libopenvg-mx51-dbg \ - lib2dz160-mx51 lib2dz160-mx51-dbg \ - lib2dz430-mx51 lib2dz430-mx51-dbg" - -FILES_${PN}-dbg = "${bindir}/.debug/*" - -FILES_libgsl-fsl-mx51 = "${libdir}/libgsl-fsl${SOLIBS}" -FILES_libgsl-fsl-mx51-dev = "${libdir}/libgsl-fsl${SOLIBSDEV}" -FILES_libgsl-fsl-mx51-dbg = "${libdir}/.debug/libgsl-fsl${SOLIBS}" - -FILES_libegl-mx51 = "${libdir}/libEGL${SOLIBS}" -FILES_libegl-mx51-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/libEGL${SOLIBSDEV}" -FILES_libegl-mx51-dbg = "${libdir}/.debug/libEGL${SOLIBS}" - -FILES_libgles-mx51 = "${libdir}/libGLESv1*${SOLIBS}" -FILES_libgles-mx51-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBSDEV}" -FILES_libgles-mx51-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS}" - -FILES_libgles2-mx51 = "${libdir}/libGLESv2${SOLIBS}" -FILES_libgles2-mx51-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}" -FILES_libgles2-mx51-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}" - -FILES_libopenvg-mx51 = "${libdir}/libOpenVG${SOLIBS}" -FILES_libopenvg-mx51-dev = "${includedir}/VG ${libdir}/libOpenVG${SOLIBSDEV}" -FILES_libopenvg-mx51-dbg = "${libdir}/.debug/libOpenVG${SOLIBS}" - -FILES_lib2dz160-mx51 = "${libdir}/lib2dz160${SOLIBS}" -FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}" - -FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}" -FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}" - COMPATIBLE_MACHINE = "(mx5)" -PACKAGE_ARCH = "${MACHINE_ARCH}"
recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc new file +82 -0
82 lines not on this page · raw message
recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +1 -75
90 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Re: [meta-fsl-arm][PATCH RFC 4/4] amd-gpu*: factorize the recipes
Quoted 2 lines · Eric Bénard
Signed-off-by Eric Bénard <[email protected]>
Please do this refactor before adding the amd-gpu-bin-mx51. No need to duplicate it all and later refactor.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://projetos.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Hi,
Quoted 3 lines · Eric Bénard
- this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
- tested on i.MX51, i.MX53 and i.MX6Q
note that his patch was tested with the following in meta-qt5 :
cherry-pick e7a477a
apply the 8 patches on this serie :
http://lists.openembedded.org/pipermail/openembedded-devel/2013-May/090861.html
and set default to use version 5.0.2 (check
conf/distro/include/qt5-versions.inc or hack
recipes-qt/qt5/qt5-5.0.2.inc).
Only eglfs and minimalegl backend were tested (no X11 support was tested at the moment).
Eric
Quoted 5 lines · Eric Bénard
- this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
- tested on i.MX51, i.MX53 and i.MX6QSigned-off-by Eric Bénard <[email protected]>
I like the idea of it dynamically extend the parsed recipes so users don't need to handle it byhand.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://projetos.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Quoted 11 lines · Otavio Salvador
Quoted 5 lines · Eric Bénard
- this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
- tested on i.MX51, i.MX53 and i.MX6QSigned-off-by Eric Bénard <[email protected]>I like the idea of it dynamically extend the parsed recipes so users don't need to handle it byhand.
you can send yourself flowers as that's your idea ;-) That took me quite some time to find the right way on how to make this idea real ;-)
Eric
Quoted 11 lines · Otavio Salvador
Quoted 5 lines · Eric Bénard
- this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
- tested on i.MX51, i.MX53 and i.MX6QSigned-off-by Eric Bénard <[email protected]>I like the idea of it dynamically extend the parsed recipes so users don't need to handle it byhand.
It is quite helpful for this sort of case, either a bsp layer appending to optional layer content, or a common layer appending to bsp layer content, we do something similar for the mentor layer —
http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor/tree/conf/layer.conf#n9,
but this one doesn't hardcode a particular layer.
Signature · 5 lines
Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics
Quoted 6 lines · Chris Larson
It is quite helpful for this sort of case, either a bsp layer appending to optional layer content, or a common layer appending to bsp layer content, we do something similar for the mentor layer —
http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor/tree/conf/layer.conf#n9,
but this one doesn't hardcode a particular layer.
That's a really neat solution, thanks for the hint!
-- Erik
Quoted 12 lines
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale
Quoted 15 lines · Chris Larson
Quoted 11 lines · Otavio Salvador
Quoted 5 lines · Eric Bénard
- this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
- tested on i.MX51, i.MX53 and i.MX6QSigned-off-by Eric Bénard <[email protected]>I like the idea of it dynamically extend the parsed recipes so users don't need to handle it byhand.
Quoted 6 lines
It is quite helpful for this sort of case, either a bsp layer appending to optional layer content, or a common layer appending to bsp layer content, we do something similar for the mentor layer —
http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor/tree/conf/layer.conf#n9,
but this one doesn't hardcode a particular layer.
So you have 'qt5' for it to be enabled when meta-qt5 is added, right?
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://projetos.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
Quoted 18 lines · Otavio Salvador
Quoted 16 lines · Chris Larson
On Tue, May 28, 2013 at 6:29 AM, Otavio Salvador <[email protected]
Quoted 13 lines
wrote:
Quoted 5 lines · Eric Bénard
- this allow to build qt5 with OpenGL ES support for i.MX5 and i.MX6
- tested on i.MX51, i.MX53 and i.MX6QSigned-off-by Eric Bénard <[email protected]>I like the idea of it dynamically extend the parsed recipes so users don't need to handle it byhand.
Quoted 9 lines
Quoted 6 lines
It is quite helpful for this sort of case, either a bsp layer appending to optional layer content, or a common layer appending to bsp layer content, we do something similar for the mentor layer —
http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor/tree/conf/layer.conf#n9,
but this one doesn't hardcode a particular layer.So you have 'qt5' for it to be enabled when meta-qt5 is added, right?
Yeah, that's the one downside to that generic approach, using the name from BBFILE_COLLECTIONS directly also means we end up with directories like 'openembedded-layer' in our layer :)
Signature · 1 line
Christopher Larson