More Qt5 stuff
PATCH v4 1/1 More Qt5 stuff
Hello,
Here is a set of patches that add more Qt5 support in Buildroot. I have built a number of different combinations, but there are some many different possibilities, that I obviously couldn't test all of them. Some testing will be appreciated, but for sure, only the autobuilders will really help in getting a good build coverage of all this.
In short:
* Patches 1 to 8 extend the Qt5Base package with various features (OpenSSL, EGL, D-Bus, etc.)
* Patch 9 creates a common variable to share the Qt5 version between all the Qt5 packages.
* Patches 10 to 19 add more Qt5 libraries: Qt5Svg, Qt5Webkit, Qt5Script, and more.
* Patch 20 fixes a build problem of Qt5Webkit when an OpenGLES backend is used (it forgets to add the right include paths).
* Patch 21 makes Qt4 and Qt5 mutually exclusive.
Changes v3 -> v4:
* Rebased on top of master (and therefore removed all the patches that have already been merged)
* Removed the OpenSSL Qt5 specific option, and automatically enable OpenSSL support when the package is available. Requested by Peter Korsgaard.
* Make Qt4 and Qt5 mutually exclusive. Suggested by Arnout Vandecappelle.
Changes v2 -> v3:
* Drop patches that have been merged upstream.
* Fix the xcb-util package to depend on libxcb.
* Fix the xcb-util-wm package to depend on libxcb.
* Bump the version of Qt5 to 5.0.1 (instead of 5.0.0)
* Add patch from Floris Bos to fix Qt5Webkit build with an OpenGLES backend.
* Fix QT5_BASE -> QT5BASE, noticed by Lionel Orry.
* Add missing "depends on" in Qt5Quick, Qt5Multimedia and Qt5GraphicalEffects. They all select Qt5Declarative, which itself depends on the availability of an OpenGLES backend.
Changes v1 -> v2:
* Make the package that depended on host-jpeg depend on host-libjpeg directly, so that we don't need to provide a virtual host-jpeg package.
* Integrated patches from Floris Bos to fix issues related RPi OpenGLES/EGL libraries, and to get the installation of fonts done by the qt5base package.
* pcre: fixed typo is -> if in commit log [Gustavo Zacarias]
* pcre: fix help text in Config.in [Gustavo Zacarias]
The patches are also available from:
http://git.free-electrons.com/users/thomas-petazzoni/buildroot/log/?h=qt5
Best regards,
Thomas
PATCH v4 1/21 qt5base: add OpenSSL support
--- package/qt5/qt5base/qt5base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
package/qt5/qt5base/qt5base.mk +3 -1
@@ -28,7 +28,6 @@ QT5BASE_CONFIGURE_OPTS += \ -no-nis \ -no-libudev \ -no-iconv \ - -no-openssl \ -no-fontconfig \ -no-gif \ -no-libpng \
@@ -82,6 +81,9 @@ else QT5BASE_CONFIGURE_OPTS += -no-xcb endif +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) + # Build the list of libraries to be installed on the target QT5BASE_INSTALL_LIBS_y += Qt5Core QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network
Signature · 1 line
1.7.9.5
PATCH v4 1/21 qt5base: add OpenSSL support
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v4 2/21 qt5base: add eglfs graphics backend
In reply to Thomas Petazzoni--- package/qt5/qt5base/Config.in | 11 ++++++- ...nce-add-egl-to-CONFIG-to-get-correct-incl.patch | 32 ++++++++++++++++++++ package/qt5/qt5base/qt5base.mk | 9 ++++-- 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
package/qt5/qt5base/Config.in +10 -1
@@ -59,7 +59,8 @@ config BR2_PACKAGE_QT5BASE_GUI # linuxfb if nothing is enabled. select BR2_PACKAGE_QT5BASE_LINUXFB if \ !BR2_PACKAGE_QT5BASE_DIRECTFB && \ - !BR2_PACKAGE_QT5BASE_XCB + !BR2_PACKAGE_QT5BASE_XCB && \ + !BR2_PACKAGE_QT5BASE_EGLFS help This option enables the Qt5Gui library.
@@ -89,6 +90,14 @@ config BR2_PACKAGE_QT5BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT5BASE_EGLFS + bool "eglfs support" + depends on BR2_PACKAGE_HAS_OPENGL_EGL + depends on BR2_PACKAGE_HAS_OPENGL_ES + +comment "eglfs backend available if OpenGLES and EGL are enabled" + depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES + config BR2_PACKAGE_QT5BASE_PRINTSUPPORT bool "print support module" select BR2_PACKAGE_QT5BASE_WIDGETS
package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <[email protected]> +Date: Sun, 13 Jan 2013 14:36:48 +0100 +Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct include + paths + +The eglconvenience code includes <EGL/egl.h>. Therefore, it should get +the appropriate EGL-specific include paths from QMAKE_INCDIR_EGL, +otherwise the build might if the EGL library has its headers in +special locations. In order to achieve this, we simply add the "egl" +feature to the list of features imported by eglconvenience. + +Signed-off-by: Thomas Petazzoni <[email protected]> +--- + .../eglconvenience/eglconvenience.pri | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri +index 188eb1c..8996cea 100644 +--- a/src/platformsupport/eglconvenience/eglconvenience.pri ++++ b/src/platformsupport/eglconvenience/eglconvenience.pri +@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) { + SOURCES += \ + $$PWD/qeglconvenience.cpp \ + $$PWD/qeglplatformcontext.cpp ++ CONFIG += egl + + contains(QT_CONFIG,xlib) { + HEADERS += \ +-- +1.7.9.5 +
package/qt5/qt5base/qt5base.mk +7 -2
@@ -20,9 +20,7 @@ QT5BASE_INSTALL_STAGING = YES # want to use the one packaged in Buildroot QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ - -no-eglfs \ -no-kms \ - -no-opengl \ -no-glib \ -no-cups \ -no-nis \
@@ -81,6 +79,13 @@ else QT5BASE_CONFIGURE_OPTS += -no-xcb endif +ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) +QT5BASE_CONFIGURE_OPTS += -opengl es2 -eglfs +QT5BASE_DEPENDENCIES += libgles libegl +else +QT5BASE_CONFIGURE_OPTS += -no-opengl -no-eglfs +endif + QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl)
Signature · 1 line
1.7.9.5
PATCH v4 2/21 qt5base: add eglfs graphics backend
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v4 3/21 qt5base: add support for fontconfig, png, jpeg, gif
In reply to Thomas Petazzoni--- package/qt5/qt5base/Config.in | 26 ++++++++++++++++++++++++++ package/qt5/qt5base/qt5base.mk | 12 ++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-)
package/qt5/qt5base/Config.in +26 -0
@@ -104,6 +104,32 @@ config BR2_PACKAGE_QT5BASE_PRINTSUPPORT help This option enables the Qt5PrintSupport +config BR2_PACKAGE_QT5BASE_FONTCONFIG + bool "fontconfig support" + select BR2_PACKAGE_FONTCONFIG + help + This option enables Fontconfig and Freetype support using + the system fontconfig and freetype2 libraries. + +config BR2_PACKAGE_QT5BASE_GIF + bool "GIF support" + help + This compiles and installs the plugin for GIF reading support. + +config BR2_PACKAGE_QT5BASE_JPEG + bool "JPEG support" + select BR2_PACKAGE_JPEG + help + This option enables JPEG support using the system libjpeg + library. + +config BR2_PACKAGE_QT5BASE_PNG + bool "PNG support" + select BR2_PACKAGE_LIBPNG + help + This option enables PNG support using the system libpng + library. + endif endif
package/qt5/qt5base/qt5base.mk +8 -4
@@ -26,10 +26,6 @@ QT5BASE_CONFIGURE_OPTS += \ -no-nis \ -no-libudev \ -no-iconv \ - -no-fontconfig \ - -no-gif \ - -no-libpng \ - -no-libjpeg \ -no-icu \ -no-dbus \ -no-gstreamer \
@@ -89,6 +85,14 @@ endif QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GIF),,-no-gif) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_JPEG),-system-libjpeg,-no-libjpeg) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-no-libpng) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng) + # Build the list of libraries to be installed on the target QT5BASE_INSTALL_LIBS_y += Qt5Core QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network
Signature · 1 line
1.7.9.5
PATCH v4 3/21 qt5base: add support for fontconfig, png, jpeg, gif
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v4 4/21 qt5base: add D-Bus support
In reply to Thomas Petazzoni--- package/qt5/qt5base/Config.in | 8 ++++++++ package/qt5/qt5base/qt5base.mk | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-)
package/qt5/qt5base/Config.in +8 -0
@@ -132,4 +132,12 @@ config BR2_PACKAGE_QT5BASE_PNG endif +config BR2_PACKAGE_QT5BASE_DBUS + bool "DBus module" + select BR2_PACKAGE_DBUS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + help + This option enables the D-Bus module. + endif
package/qt5/qt5base/qt5base.mk +5 -1
@@ -27,7 +27,6 @@ QT5BASE_CONFIGURE_OPTS += \ -no-libudev \ -no-iconv \ -no-icu \ - -no-dbus \ -no-gstreamer \ -no-gtkstyle \ -system-zlib \
@@ -93,6 +92,9 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-no-libpng) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DBUS),-dbus,-no-dbus) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus) + # Build the list of libraries to be installed on the target QT5BASE_INSTALL_LIBS_y += Qt5Core QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network
@@ -105,6 +107,8 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus + # Ideally, we could use -device-option to substitute variable values # in our linux-buildroot-g++/qmake.config, but this mechanism doesn't # nicely support variable values that contain spaces. So we use the
Signature · 1 line
1.7.9.5
PATCH v4 4/21 qt5base: add D-Bus support
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v4 5/21 qt5base: add glib support
In reply to Thomas Petazzoni--- package/qt5/qt5base/qt5base.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
package/qt5/qt5base/qt5base.mk +3 -1
@@ -21,7 +21,6 @@ QT5BASE_INSTALL_STAGING = YES QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ -no-kms \ - -no-glib \ -no-cups \ -no-nis \ -no-libudev \
@@ -95,6 +94,9 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DBUS),-dbus,-no-dbus) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBGLIB2),-glib,-no-glib) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) + # Build the list of libraries to be installed on the target QT5BASE_INSTALL_LIBS_y += Qt5Core QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network
Signature · 1 line
1.7.9.5
PATCH v4 5/21 qt5base: add glib support
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>
Committed, thanks.
Thomas> ---
Thomas> package/qt5/qt5base/qt5base.mk | 4 +++-
Thomas> 1 file changed, 3 insertions(+), 1 deletion(-)
Thomas> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk Thomas> index 62f0b9a..d5dcb7d 100644
Thomas> --- a/package/qt5/qt5base/qt5base.mk
Thomas> +++ b/package/qt5/qt5base/qt5base.mk
Thomas> @@ -21,7 +21,6 @@ QT5BASE_INSTALL_STAGING = YES
Thomas> QT5BASE_CONFIGURE_OPTS += \ Thomas> -optimized-qmake \ Thomas> -no-kms \ Thomas> - -no-glib \ Thomas> -no-cups \ Thomas> -no-nis \ Thomas> -no-libudev \
Thomas> @@ -95,6 +94,9 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)
Thomas> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DBUS),-dbus,-no-dbus)
Thomas> QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus)
Thomas> +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBGLIB2),-glib,-no-glib)
Thomas> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2)
You're adding a mix of:
- Explicit suboptions which selects the needed libraries (fontconfig/jpeg/png/dbus)
- Automatic enabling/disabling support if package is enabled
Is there any specific reason for this?
Signature · 1 line
Bye, Peter Korsgaard
PATCH v4 5/21 qt5base: add glib support
Dear Peter Korsgaard,
Quoted 7 lines · Peter Korsgaard
Thomas> @@ -95,6 +94,9 @@
QT5BASE_DEPENDENCIES+= $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)
Thomas>QT5BASE_CONFIGURE_OPTS+= $(if $(BR2_PACKAGE_QT5BASE_DBUS),-dbus,-no-dbus)
Thomas>QT5BASE_DEPENDENCIES+= $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus)Thomas> +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBGLIB2),-glib,-no-glib)
Thomas> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2)
Quoted 7 lines
You're adding a mix of:
- Explicit suboptions which selects the needed libraries (fontconfig/jpeg/png/dbus)
- Automatic enabling/disabling support if package is enabledIs there any specific reason for this?
For the specific cases you're pointing at (glib and dbus), I modeled things to be similar to what we have for Qt4.
Also it kind of makes sense because adding DBus support creates an additional Qt5DBus.so library, while the libglib2 support doesn't.
But admittedly, the boundary between automatic enabling/disabling support and explicit suboptions is a bit fuzzy. It's sometimes a bit strange to have a suboption for something very small, and automatic enabling/disabling for something rather "big". I don't really have a good idea on how to clearly draw the line between the two solutions. One radical solution is: whenever it can be automatic, it should be. Don't know if it's reasonable, though. I'm open to suggestions on this, and we should probably update the documentation with details on this topic.
Best regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v4 5/21 qt5base: add glib support
Quoted 9 lines · Thomas Petazzoni
But admittedly, the boundary between automatic enabling/disabling support and explicit suboptions is a bit fuzzy. It's sometimes a bit strange to have a suboption for something very small, and automatic enabling/disabling for something rather "big". I don't really have a good idea on how to clearly draw the line between the two solutions. One radical solution is: whenever it can be automatic, it should be. Don't know if it's reasonable, though. I'm open to suggestions on this, and we should probably update the documentation with details on this topic.
For me, the default is to have automatic enable/disable, with the
following exceptions:
- the "wrapper library" is rather large, so you want to be able to build without the wrapper library. I can't actually find an example of this. Even the QtDbus example: the QtDbus+QtXml libraries total 650K (stripped), which is not that much compared to 3M for QtCore.
- it's not obvious to the user that the dependency should be selected. BR2_PACKAGE_DIRECTFB_MULTI is a good example: you wouldn't have the idea that you have to select linux-fusion in order to get multi-application support on DirectFB.
That said, I don't think it every hurts to have a Config.in option when
it is not strictly required. It increases our code size, but there's no important maintenance effort (at least if it's a simple bool option). So I would say it's mostly up to the contributors.
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v4 6/21 qt5base: add support to build against ICU
In reply to Thomas PetazzoniQt5Webkit requires Qt5Base to be built with ICU support, so we add such support.
--- package/qt5/qt5base/Config.in | 7 +++++++ package/qt5/qt5base/qt5base.mk | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-)
package/qt5/qt5base/Config.in +7 -0
@@ -140,4 +140,11 @@ config BR2_PACKAGE_QT5BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT5BASE_ICU + bool "Enable ICU support" + select BR2_PACKAGE_ICU + help + This option enables ICU support in Qt5. This is for example + needed for Qt5Webkit. + endif
package/qt5/qt5base/qt5base.mk +3 -1
@@ -25,7 +25,6 @@ QT5BASE_CONFIGURE_OPTS += \ -no-nis \ -no-libudev \ -no-iconv \ - -no-icu \ -no-gstreamer \ -no-gtkstyle \ -system-zlib \
@@ -97,6 +96,9 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBGLIB2),-glib,-no-glib) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_ICU),-icu,-no-icu) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu) + # Build the list of libraries to be installed on the target QT5BASE_INSTALL_LIBS_y += Qt5Core QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network
Signature · 1 line
1.7.9.5
PATCH v4 6/21 qt5base: add support to build against ICU
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Qt5Webkit requires Qt5Base to be built with ICU support, so we add Thomas> such support.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v4 7/21 qt5base: add rPi EGL glue code
In reply to Thomas PetazzoniFrom: Floris Bos <[email protected]>
When the rpi-userland package is selected, assume we are targetting the Raspberry Pi, and add the right platform glue code when building the Qt5 EGLFS plugin.
--- package/qt5/qt5base/qt5base-mkspecs-files.patch | 5 ++++- package/qt5/qt5base/qt5base.mk | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-)
package/qt5/qt5base/qt5base-mkspecs-files.patch +4 -1
@@ -14,7 +14,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf =================================================================== --- /dev/null +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf -@@ -0,0 +1,38 @@ +@@ -0,0 +1,41 @@ +MAKEFILE_GENERATOR = UNIX +CONFIG += incremental gdb_dwarf_index +QMAKE_INCREMENTAL_STYLE = sublib
@@ -49,6 +49,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf + +QMAKE_LIBS += -lrt -lpthread -ldl + ++# device specific glue code ++EGLFS_PLATFORM_HOOKS_SOURCES = ++ +# Sanity check +deviceSanityCheckCompiler() +
package/qt5/qt5base/qt5base.mk +6 -0
@@ -75,6 +75,10 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) QT5BASE_CONFIGURE_OPTS += -opengl es2 -eglfs QT5BASE_DEPENDENCIES += libgles libegl +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \ + $(@D)/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp +endif else QT5BASE_CONFIGURE_OPTS += -no-opengl -no-eglfs endif
@@ -125,6 +129,8 @@ define QT5BASE_CONFIGURE_CMDS $(call QT5BASE_CONFIG_SET,CROSS_COMPILE,$(TARGET_CROSS)) $(call QT5BASE_CONFIG_SET,COMPILER_CFLAGS,$(TARGET_CFLAGS)) $(call QT5BASE_CONFIG_SET,COMPILER_CXXFLAGS,$(TARGET_CXXFLAGS)) + $(call QT5BASE_CONFIG_SET,EGLFS_PLATFORM_HOOKS_SOURCES, \ + $(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES)) (cd $(@D); \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
Signature · 1 line
1.7.9.5
PATCH v4 7/21 qt5base: add rPi EGL glue code
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> From: Floris Bos <[email protected]>
Thomas> When the rpi-userland package is selected, assume we are targetting Thomas> the Raspberry Pi, and add the right platform glue code when building Thomas> the Qt5 EGLFS plugin.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v4 8/21 qt5base: install bundled fonts to target
In reply to Thomas PetazzoniFrom: Floris Bos <[email protected]>
If not using font-config, Qt 5 offers a set of standard fonts to use instead. Install these to target.
--- package/qt5/qt5base/qt5base.mk | 8 ++++++++ 1 file changed, 8 insertions(+)
package/qt5/qt5base/qt5base.mk +8 -0
@@ -172,9 +172,17 @@ define QT5BASE_INSTALL_TARGET_PLUGINS fi endef +define QT5BASE_INSTALL_TARGET_FONTS + if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \ + mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \ + cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \ + fi +endef + define QT5BASE_INSTALL_TARGET_CMDS $(QT5BASE_INSTALL_TARGET_LIBS) $(QT5BASE_INSTALL_TARGET_PLUGINS) + $(QT5BASE_INSTALL_TARGET_FONTS) endef $(eval $(generic-package))
Signature · 1 line
1.7.9.5
PATCH v4 8/21 qt5base: install bundled fonts to target
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> From: Floris Bos <[email protected]>
Thomas> If not using font-config, Qt 5 offers a set of standard fonts to Thomas> use instead. Install these to target.
Should that then only happen if !BR2_PACKAGE_QT5BASE_FONTCONFIG?
Signature · 1 line
Bye, Peter Korsgaard
PATCH v4 8/21 qt5base: install bundled fonts to target
Quoted 6 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> From: Floris Bos <[email protected]>
Thomas> If not using font-config, Qt 5 offers a set of standard fonts to Thomas> use instead. Install these to target.Should that then only happen if !BR2_PACKAGE_QT5BASE_FONTCONFIG?
Could add a check to only execute QT5BASE_INSTALL_TARGET_FONTS if !BR2_PACKAGE_QT5BASE_FONTCONFIG, if that looks cleaner.
But the standard Qt build script already causes that:
==
mkspecs/features/qpa/genericunixfontdatabase.prf
CONFIG += qpa/basicunixfontdatabase
contains(QT_CONFIG, fontconfig) {
DEFINES += Q_FONTCONFIGDATABASE
LIBS += -lfontconfig
} else { fonts.path = $$[QT_INSTALL_LIBS]/fonts
fonts.files = $$QT_SOURCE_TREE/lib/fonts/*
INSTALLS += fonts
}
==
If fonts are not installed to staging (by INSTALLS += fonts), they are not copied to target either.
Signature · 3 lines
Yours sincerely, Floris Bos
PATCH v4 9/21 qt5: factor Qt5 version
In reply to Thomas PetazzoniSince the Qt5 version will be the same for all Qt5 modules, factor it in qt5/qt5.mk as QT5_VERSION.
--- package/qt5/qt5.mk | 1 + package/qt5/qt5base/qt5base.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
package/qt5/qt5.mk +1 -0
@@ -1,3 +1,4 @@ +QT5_VERSION = 5.0.1 include package/qt5/*/*.mk define QT5_LA_PRL_FILES_FIXUP
package/qt5/qt5base/qt5base.mk +1 -1
@@ -4,7 +4,7 @@ # ############################################################# -QT5BASE_VERSION = 5.0.1 +QT5BASE_VERSION = $(QT5_VERSION) QT5BASE_SITE = http://releases.qt-project.org/qt5/$(QT5BASE_VERSION)/submodules_tar/ QT5BASE_SOURCE = qtbase-opensource-src-$(QT5BASE_VERSION).tar.xz
Signature · 1 line
1.7.9.5
PATCH v4 9/21 qt5: factor Qt5 version
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Since the Qt5 version will be the same for all Qt5 modules, factor it Thomas> in qt5/qt5.mk as QT5_VERSION.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v4 10/21 qt5/qt5svg: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5svg/Config.in | 11 ++++++++++ package/qt5/qt5svg/qt5svg.mk | 47 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 package/qt5/qt5svg/Config.in create mode 100644 package/qt5/qt5svg/qt5svg.mk
package/qt5/Config.in +1 -0
@@ -15,4 +15,5 @@ menuconfig BR2_PACKAGE_QT5 if BR2_PACKAGE_QT5 source "package/qt5/qt5base/Config.in" +source "package/qt5/qt5svg/Config.in" endif
package/qt5/qt5svg/Config.in new file +11 -0
@@ -0,0 +1,11 @@ +config BR2_PACKAGE_QT5SVG + bool "qt5svg" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5BASE_GUI + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5svg module. + + http://qt-project.org
package/qt5/qt5svg/qt5svg.mk new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v4 10/21 qt5/qt5svg: new package
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---
Thomas> package/qt5/Config.in | 1 + Thomas> package/qt5/qt5svg/Config.in | 11 ++++++++++ Thomas> package/qt5/qt5svg/qt5svg.mk | 47 ++++++++++++++++++++++++++++++++++++++++++ Thomas> 3 files changed, 59 insertions(+) Thomas> create mode 100644 package/qt5/qt5svg/Config.in Thomas> create mode 100644 package/qt5/qt5svg/qt5svg.mk
Thomas> diff --git a/package/qt5/Config.in b/package/qt5/Config.in Thomas> index 1c9f8a6..f4d2b45 100644
Thomas> --- a/package/qt5/Config.in
Thomas> +++ b/package/qt5/Config.in
Thomas> @@ -15,4 +15,5 @@ menuconfig BR2_PACKAGE_QT5
Thomas> if BR2_PACKAGE_QT5
Thomas> source "package/qt5/qt5base/Config.in"
Thomas> +source "package/qt5/qt5svg/Config.in"
Thomas> endif
Thomas> diff --git a/package/qt5/qt5svg/Config.in b/package/qt5/qt5svg/Config.in Thomas> new file mode 100644
Thomas> index 0000000..27e6b05
Thomas> --- /dev/null
Thomas> +++ b/package/qt5/qt5svg/Config.in
Thomas> @@ -0,0 +1,11 @@
Thomas> +config BR2_PACKAGE_QT5SVG
Thomas> + bool "qt5svg"
Thomas> + select BR2_PACKAGE_QT5BASE
Thomas> + select BR2_PACKAGE_QT5BASE_GUI
Thomas> + help
Thomas> + Qt is a cross-platform application and UI framework for
Thomas> + developers using C++.
Thomas> +
Thomas> + This package corresponds to the qt5svg module.
Thomas> +
Thomas> + http://qt-project.org
Thomas> diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk Thomas> new file mode 100644
Thomas> index 0000000..8db28ba
Thomas> --- /dev/null
Thomas> +++ b/package/qt5/qt5svg/qt5svg.mk
Thomas> @@ -0,0 +1,47 @@
Thomas> +############################################################# Thomas> +#
Thomas> +# qt5svg
Thomas> +#
Thomas> +############################################################# Thomas> +
Thomas> +QT5SVG_VERSION = $(QT5_VERSION)
Thomas> +QT5SVG_SITE = http://releases.qt-project.org/qt5/$(QT5SVG_VERSION)/submodules_tar/
Thomas> +QT5SVG_SOURCE = qtsvg-opensource-src-$(QT5SVG_VERSION).tar.xz Thomas> +QT5SVG_DEPENDENCIES = qt5base
Thomas> +QT5SVG_INSTALL_STAGING = YES
Thomas> +
Thomas> +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
Thomas> +QT5SVG_CONFIGURE_OPTS += -opensource -confirm-license
Thomas> +QT5SVG_LICENSE = LGPLv2.1 or GPLv3.0
Thomas> +# Here we would like to get license files from qt5base, but qt5base Thomas> +# may not be extracted at the time we get the legal-info for qt5svg. Thomas> +else
Thomas> +QT5SVG_LICENSE = Commercial license
Thomas> +QT5SVG_REDISTRIBUTE = NO
Thomas> +endif
Thomas> +
Thomas> +define QT5SVG_CONFIGURE_CMDS
Thomas> + (cd $(@D); $(HOST_DIR)/usr/bin/qmake)
Thomas> +endef
Thomas> +
Thomas> +define QT5SVG_BUILD_CMDS
Thomas> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
Thomas> +endef
Thomas> +
Thomas> +define QT5SVG_INSTALL_STAGING_CMDS
Thomas> + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
Thomas> + $(QT5_LA_PRL_FILES_FIXUP)
Thomas> +endef
Thomas> +
Thomas> +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
Thomas> +define QT5SVG_INSTALL_ICONENGINES
Thomas> + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/iconengines $(TARGET_DIR)/usr/lib/qt/plugins
Thomas> +endef
Thomas> +endif
Thomas> +define QT5SVG_INSTALL_TARGET_CMDS
Thomas> + cp -dpf $(STAGING_DIR)/usr/lib/libQt5Svg*.so.* $(TARGET_DIR)/usr/lib
How about BR2_PREFER_STATIC_LIB builds, or don't we support that for qt5?
Signature · 1 line
Bye, Peter Korsgaard
PATCH v4 10/21 qt5/qt5svg: new package
Quoted 2 lines · Peter Korsgaard
How about
BR2_PREFER_STATIC_LIBbuilds, or don't we support that for qt5?
Not at the moment, at least. The configure script does support -static,
but I guess Thomas never tested it.
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v4 11/21 qt5/qt5script: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5script/Config.in | 10 +++++++++ package/qt5/qt5script/qt5script.mk | 41 ++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 package/qt5/qt5script/Config.in create mode 100644 package/qt5/qt5script/qt5script.mk
package/qt5/Config.in +1 -0
@@ -15,5 +15,6 @@ menuconfig BR2_PACKAGE_QT5 if BR2_PACKAGE_QT5 source "package/qt5/qt5base/Config.in" +source "package/qt5/qt5script/Config.in" source "package/qt5/qt5svg/Config.in" endif
package/qt5/qt5script/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_QT5SCRIPT + bool "qt5script" + select BR2_PACKAGE_QT5BASE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5script module. + + http://qt-project.org
package/qt5/qt5script/qt5script.mk new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v4 12/21 qt5/qt5imageformats: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5imageformats/Config.in | 10 ++++++ package/qt5/qt5imageformats/qt5imageformats.mk | 39 ++++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 package/qt5/qt5imageformats/Config.in create mode 100644 package/qt5/qt5imageformats/qt5imageformats.mk
package/qt5/Config.in +1 -0
@@ -15,6 +15,7 @@ menuconfig BR2_PACKAGE_QT5 if BR2_PACKAGE_QT5 source "package/qt5/qt5base/Config.in" +source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5svg/Config.in" endif
package/qt5/qt5imageformats/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_QT5IMAGEFORMATS + bool "qt5imageformats" + select BR2_PACKAGE_QT5BASE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5imageformats module. + + http://qt-project.org
package/qt5/qt5imageformats/qt5imageformats.mk new file +39 -0
@@ -0,0 +1,39 @@ +############################################################# +# +# qt5imageformats +# +############################################################# + +QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) +QT5IMAGEFORMATS_SITE = http://releases.qt-project.org/qt5/$(QT5IMAGEFORMATS_VERSION)/submodules_tar/ +QT5IMAGEFORMATS_SOURCE = qtimageformats-opensource-src-$(QT5IMAGEFORMATS_VERSION).tar.xz +QT5IMAGEFORMATS_DEPENDENCIES = qt5base +QT5IMAGEFORMATS_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5IMAGEFORMATS_CONFIGURE_OPTS += -opensource -confirm-license +QT5IMAGEFORMATS_LICENSE = LGPLv2.1 or GPLv3.0 +# Here we would like to get license files from qt5base, but qt5base +# may not be extracted at the time we get the legal-info for qt5svg. +else +QT5IMAGEFORMATS_LICENSE = Commercial license +QT5IMAGEFORMATS_REDISTRIBUTE = NO +endif + +define QT5IMAGEFORMATS_CONFIGURE_CMDS + (cd $(@D); $(HOST_DIR)/usr/bin/qmake) +endef + +define QT5IMAGEFORMATS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5IMAGEFORMATS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install +endef + +define QT5IMAGEFORMATS_INSTALL_TARGET_CMDS + cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/imageformats/*.so $(TARGET_DIR)/usr/lib/qt/plugins/imageformats/ +endef + +$(eval $(generic-package))
Signature · 1 line
1.7.9.5
PATCH v4 13/21 qt5/qt5xmlpatterns: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5xmlpatterns/Config.in | 10 +++++++ package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 41 ++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 package/qt5/qt5xmlpatterns/Config.in create mode 100644 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
package/qt5/Config.in +1 -0
@@ -18,4 +18,5 @@ source "package/qt5/qt5base/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5svg/Config.in" +source "package/qt5/qt5xmlpatterns/Config.in" endif
package/qt5/qt5xmlpatterns/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_QT5XMLPATTERNS + bool "qt5xmlpatterns" + select BR2_PACKAGE_QT5BASE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5xmlpatterns module. + + http://qt-project.org
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v4 14/21 qt5/qt5jsbackend: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5jsbackend/Config.in | 10 +++++ ...t5jsbackend-dont-import-bz2-python-module.patch | 29 ++++++++++++++ .../qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch | 33 ++++++++++++++++ package/qt5/qt5jsbackend/qt5jsbackend.mk | 41 ++++++++++++++++++++ 5 files changed, 114 insertions(+) create mode 100644 package/qt5/qt5jsbackend/Config.in create mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-dont-import-bz2-python-module.patch create mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch create mode 100644 package/qt5/qt5jsbackend/qt5jsbackend.mk
package/qt5/Config.in +1 -0
@@ -16,6 +16,7 @@ menuconfig BR2_PACKAGE_QT5 if BR2_PACKAGE_QT5 source "package/qt5/qt5base/Config.in" source "package/qt5/qt5imageformats/Config.in" +source "package/qt5/qt5jsbackend/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5xmlpatterns/Config.in"
package/qt5/qt5jsbackend/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_QT5JSBACKEND + bool "qt5jsbackend" + select BR2_PACKAGE_QT5BASE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5jsbackend module. + + http://qt-project.org
package/qt5/qt5jsbackend/qt5jsbackend-dont-import-bz2-python-module.patch new file +29 -0
@@ -0,0 +1,29 @@ +Only import bz2 python module when needed + +The js2c.py script imports the bz2 module unconditionnally, which +would require us to build the bzip2 support in host-python. Since in +fact bzip2 support is not technically used when building this package, +we ensure that the bz2 module is only imported when needed. + +Signed-off-by: Thomas Petazzoni <[email protected]> + +Index: b/src/3rdparty/v8/tools/js2c.py +=================================================================== +--- a/src/3rdparty/v8/tools/js2c.py ++++ b/src/3rdparty/v8/tools/js2c.py +@@ -33,7 +33,6 @@ + + import os, re, sys, string + import jsmin +-import bz2 + + + def ToCAsciiArray(lines): +@@ -344,6 +343,7 @@ + else: + raw_sources_declaration = RAW_SOURCES_COMPRESSION_DECLARATION + if env['COMPRESSION'] == 'bz2': ++ import bz2 + all_sources = bz2.compress("".join(all_sources)) + total_length = len(all_sources) + sources_data = ToCArray(all_sources)
package/qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch new file +33 -0
@@ -0,0 +1,33 @@ +Fix build on uClibc + +Patch taken from https://code.google.com/p/v8/source/detail?r=12094. + +Review URL: https://chromiumcodereview.appspot.com/10784012 +Patch from Remi Duraffort <[email protected]>. + +Signed-off-by: Thomas Petazzoni <[email protected]> + +Index: qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc +=================================================================== +--- qt5jsbackend-5.0.0.orig/src/3rdparty/v8/src/platform-linux.cc 2012-12-18 20:04:01.000000000 +0100 ++++ qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc 2013-03-03 20:31:46.000000000 +0100 +@@ -1030,7 +1030,8 @@ + sample->fp = reinterpret_cast<Address>(mcontext.gregs[REG_RBP]); + #elif V8_HOST_ARCH_ARM + // An undefined macro evaluates to 0, so this applies to Android's Bionic also. +-#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) ++#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && \ ++ !defined(__UCLIBC__)) + sample->pc = reinterpret_cast<Address>(mcontext.gregs[R15]); + sample->sp = reinterpret_cast<Address>(mcontext.gregs[R13]); + sample->fp = reinterpret_cast<Address>(mcontext.gregs[R11]); +@@ -1038,7 +1039,8 @@ + sample->pc = reinterpret_cast<Address>(mcontext.arm_pc); + sample->sp = reinterpret_cast<Address>(mcontext.arm_sp); + sample->fp = reinterpret_cast<Address>(mcontext.arm_fp); +-#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) ++#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && ++ // !defined(__UCLIBC__)) + #elif V8_HOST_ARCH_MIPS + sample->pc = reinterpret_cast<Address>(mcontext.pc); + sample->sp = reinterpret_cast<Address>(mcontext.gregs[29]);
package/qt5/qt5jsbackend/qt5jsbackend.mk new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v4 15/21 qt5/qt5declarative: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5declarative/Config.in | 18 ++++++++++ package/qt5/qt5declarative/qt5declarative.mk | 48 ++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 package/qt5/qt5declarative/Config.in create mode 100644 package/qt5/qt5declarative/qt5declarative.mk
package/qt5/Config.in +1 -0
@@ -15,6 +15,7 @@ menuconfig BR2_PACKAGE_QT5 if BR2_PACKAGE_QT5 source "package/qt5/qt5base/Config.in" +source "package/qt5/qt5declarative/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5jsbackend/Config.in" source "package/qt5/qt5script/Config.in"
package/qt5/qt5declarative/Config.in new file +18 -0
@@ -0,0 +1,18 @@ +config BR2_PACKAGE_QT5DECLARATIVE + bool "qt5declarative" + select BR2_PACKAGE_QT5XMLPATTERNS + select BR2_PACKAGE_QT5JSBACKEND + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5BASE_EGLFS + depends on BR2_PACKAGE_HAS_OPENGL_EGL + depends on BR2_PACKAGE_HAS_OPENGL_ES + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5declarative module. + + http://qt-project.org + +comment "qt5declarative requires an OpenGL-capable backend" + depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
package/qt5/qt5declarative/qt5declarative.mk new file +48 -0
48 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v4 16/21 qt5/qt5graphicaleffects: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5graphicaleffects/Config.in | 14 +++++++ .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 40 ++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 package/qt5/qt5graphicaleffects/Config.in create mode 100644 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
package/qt5/Config.in +1 -0
@@ -16,6 +16,7 @@ menuconfig BR2_PACKAGE_QT5 if BR2_PACKAGE_QT5 source "package/qt5/qt5base/Config.in" source "package/qt5/qt5declarative/Config.in" +source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5jsbackend/Config.in" source "package/qt5/qt5script/Config.in"
package/qt5/qt5graphicaleffects/Config.in new file +14 -0
@@ -0,0 +1,14 @@ +config BR2_PACKAGE_QT5GRAPHICALEFFECTS + bool "qt5graphicaleffects" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5DECLARATIVE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5graphicaleffects module. + + http://qt-project.org + +comment "qt5graphicaleffects requires an OpenGL-capable backend" + depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk new file +40 -0
@@ -0,0 +1,40 @@ +############################################################# +# +# qt5graphicaleffects +# +############################################################# + +QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) +QT5GRAPHICALEFFECTS_SITE = http://releases.qt-project.org/qt5/$(QT5GRAPHICALEFFECTS_VERSION)/submodules_tar/ +QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-opensource-src-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz +QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative +QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5GRAPHICALEFFECTS_CONFIGURE_OPTS += -opensource -confirm-license +QT5GRAPHICALEFFECTS_LICENSE = LGPLv2.1 or GPLv3.0 +# Here we would like to get license files from qt5base, but qt5base +# may not be extracted at the time we get the legal-info for +# qt5script. +else +QT5GRAPHICALEFFECTS_LICENSE = Commercial license +QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO +endif + +define QT5GRAPHICALEFFECTS_CONFIGURE_CMDS + (cd $(@D); $(HOST_DIR)/usr/bin/qmake) +endef + +define QT5GRAPHICALEFFECTS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5GRAPHICALEFFECTS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install +endef + +define QT5GRAPHICALEFFECTS_INSTALL_TARGET_CMDS + cp -dpfr $(STAGING_DIR)/usr/qml/QtGraphicalEffects $(TARGET_DIR)/usr/qml +endef + +$(eval $(generic-package))
Signature · 1 line
1.7.9.5
PATCH v4 16/21 qt5/qt5graphicaleffects: new package
Hi Thomas,
2013/3/19 Thomas Petazzoni <[email protected]>:
[...]
Quoted 10 lines
package/qt5/qt5graphicaleffects/Config.in new file +4
-0@@ -0,0 +1,14 @@ +config BR2_PACKAGE_QT5GRAPHICALEFFECTS + bool "qt5graphicaleffects" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5DECLARATIVE
package/qt5/qt5graphicaleffects/Config.in line 14
Quoted 10 lines
package/qt5/qt5graphicaleffects/Config.in new file +10
-0+ help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5graphicaleffects module. + + http://qt-project.org + +comment "qt5graphicaleffects requires an OpenGL-capable backend" + depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
I think you mean:
depends on ! ( BR2_PACKAGE_HAS_OPENGL_EGL || BR2_PACKAGE_HAS_OPENGL_ES )
Also, the opposite 'depends on' statement is missing in the config entry.
Regards,
Signature · 1 line
Samuel
PATCH v4 17/21 qt5/qt5multimedia: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5multimedia/Config.in | 14 +++++++++ package/qt5/qt5multimedia/qt5multimedia.mk | 43 ++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 package/qt5/qt5multimedia/Config.in create mode 100644 package/qt5/qt5multimedia/qt5multimedia.mk
package/qt5/Config.in +1 -0
@@ -19,6 +19,7 @@ source "package/qt5/qt5declarative/Config.in" source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5jsbackend/Config.in" +source "package/qt5/qt5multimedia/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5xmlpatterns/Config.in"
package/qt5/qt5multimedia/Config.in new file +14 -0
@@ -0,0 +1,14 @@ +config BR2_PACKAGE_QT5MULTIMEDIA + bool "qt5multimedia" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5DECLARATIVE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5multimedia module. + + http://qt-project.org + +comment "qt5multimedia requires an OpenGL-capable backend" + depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
package/qt5/qt5multimedia/qt5multimedia.mk new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v4 18/21 qt5/qt5quick1: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5quick1/Config.in | 18 +++++++++++++++ package/qt5/qt5quick1/qt5quick1.mk | 45 ++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 package/qt5/qt5quick1/Config.in create mode 100644 package/qt5/qt5quick1/qt5quick1.mk
package/qt5/Config.in +1 -0
@@ -20,6 +20,7 @@ source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5jsbackend/Config.in" source "package/qt5/qt5multimedia/Config.in" +source "package/qt5/qt5quick1/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5xmlpatterns/Config.in"
package/qt5/qt5quick1/Config.in new file +18 -0
@@ -0,0 +1,18 @@ +config BR2_PACKAGE_QT5QUICK1 + bool "qt5quick1" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5SCRIPT + select BR2_PACKAGE_QT5XMLPATTERNS + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5JSBACKEND + select BR2_PACKAGE_QT5WEBKIT + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5quick1 module. + + http://qt-project.org + +comment "qt5quick1 requires an OpenGL-capable backend" + depends on !BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES
package/qt5/qt5quick1/qt5quick1.mk new file +45 -0
45 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v4 19/21 qt5/qt5webkit: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5webkit/Config.in | 12 ++++++++++ package/qt5/qt5webkit/qt5webkit.mk | 43 ++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 package/qt5/qt5webkit/Config.in create mode 100644 package/qt5/qt5webkit/qt5webkit.mk
package/qt5/Config.in +1 -0
@@ -23,5 +23,6 @@ source "package/qt5/qt5multimedia/Config.in" source "package/qt5/qt5quick1/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5svg/Config.in" +source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" endif
package/qt5/qt5webkit/Config.in new file +12 -0
@@ -0,0 +1,12 @@ +config BR2_PACKAGE_QT5WEBKIT + bool "qt5webkit" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5BASE_ICU + select BR2_PACKAGE_SQLITE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5webkit module. + + http://qt-project.org
package/qt5/qt5webkit/qt5webkit.mk new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v4 20/21 qt5webkit: add EGL dir to includepath
In reply to Thomas PetazzoniFrom: Floris Bos <[email protected]>
--- .../qt5/qt5webkit/qt5webkit-egl-includepath.patch | 40 ++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package/qt5/qt5webkit/qt5webkit-egl-includepath.patch
package/qt5/qt5webkit/qt5webkit-egl-includepath.patch new file +40 -0
@@ -0,0 +1,40 @@ +From d6b1b33a12c0cf6c52667afafe34e58a7b00d0d8 Mon Sep 17 00:00:00 2001 +From: Floris Bos <[email protected]> +Date: Thu, 7 Mar 2013 19:25:17 +0100 +Subject: [PATCH] Webcore: add EGL and OpenGL (ES) INCDIR to INCLUDEPATH + +When building with 3D graphics support enabled, add the +OpenGL (ES) and EGL include directories to the include path. + +Signed-off-by: Floris Bos <[email protected]> +--- + Source/WebCore/Target.pri | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri +index 2669748..421a849 100644 +--- a/Source/WebCore/Target.pri ++++ b/Source/WebCore/Target.pri +@@ -3992,15 +3992,19 @@ use?(3D_GRAPHICS) { + + contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) { + !contains(QT_CONFIG, opengles2) { ++ INCLUDEPATH += $$QMAKE_INCDIR_OPENGL + SOURCES += \ + platform/graphics/opengl/GraphicsContext3DOpenGL.cpp \ + platform/graphics/opengl/Extensions3DOpenGL.cpp + } else { ++ INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 + SOURCES += \ + platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp \ + platform/graphics/opengl/Extensions3DOpenGLES.cpp + } + ++ !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL ++ + HEADERS += platform/graphics/opengl/Extensions3DOpenGL.h + + SOURCES += \ +-- +1.7.10.4 +
Signature · 1 line
1.7.9.5
PATCH v4 21/21 qt5: disallow the selection of Qt4 and Qt5
In reply to Thomas PetazzoniAs noticed by Arnout, Qt4 and Qt5 cannot be installed together, because for example the qt.conf installed by one version cannot be understood by the qmake of another version. We therefore make them mutually exclusive, which sounds reasonable for the embedded systems targeted by Buildroot.
--- package/qt5/Config.in | 1 + 1 file changed, 1 insertion(+)
package/qt5/Config.in +1 -0
@@ -7,6 +7,7 @@ menuconfig BR2_PACKAGE_QT5 depends on BR2_USE_WCHAR depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_PACKAGE_QT help This option enables the Qt5 framework. Sub-options allow to select which modules should be built.
Signature · 1 line
1.7.9.5
PATCH v4 21/21 qt5: disallow the selection of Qt4 and Qt5
Quoted 7 lines · Thomas Petazzoni
As noticed by Arnout, Qt4 and Qt5 cannot be installed together, because for example the qt.conf installed by one version cannot be understood by the qmake of another version. We therefore make them mutually exclusive, which sounds reasonable for the embedded systems targeted by Buildroot.
Signed-off-by Thomas Petazzoni <[email protected]>
Given that this may expose hard to understand problems when compiling
Qt applications, I'd like to see this committed rather soon.
Regards,
Arnout
Quoted 17 lines
--- package/qt5/Config.in | 1 + 1 file changed, 1 insertion(+)package/qt5/Config.in +1
-0@@ -7,6 +7,7 @@ menuconfig BR2_PACKAGE_QT5 depends on BR2_USE_WCHAR depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_PACKAGE_QT help This option enables the Qt5 framework. Sub-options allow to select which modules should be built.
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F