Add Qt5 packages
PATCH v2 1/1 Add Qt5 packages
Hello,
Here is a set of patches that add 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:
* Patch 1 improves our pcre package to add support for 16 bits and 32 bits variants, need by Qt5.
* Patches 2 to 4 bump the version or add new XCB-util packages that are needed to build the XCB backend of Qt5.
* Patches 5 to 8 add virtual packages for OpenGLES, OpenVG and EGL, and make rpi-userland provide an implementation of those virtual packages, and do other related fixes to RPi OpenGLES/EGL support.
* Patch 9 makes packages using host-jpeg use host-libjpeg instead so that we don't have to provide a virtual host-jpeg package.
* Patch 10 converts the jpeg virtual package to a real package.
* Patch 11 and 12 adds some basic infrastructure to support the Qt5 packages.
* Patch 13 adds the Qt5Base package.
* Patches 14 to 23 extend the Qt5Base package with various features (GUI, OpenSSL, EGL, D-Bus, etc.)
* Patch 24 creates a common variable to share the Qt5 version between all the Qt5 packages.
* Patches 25 to 34 add more Qt5 libraries: Qt5Svg, Qt5Webkit, Qt5Script, and more.
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 1/34 pcre: add support for 16 bits and 32 bits variants
Until now, we have been building only the 8bits PCRE variant. However, Qt5 requires the 16bits variant. This commit therefore adds support to build the 16bits and 32bits variants of PCRE. In order to preserve backward compatibility, the 8bits variant is automatically chosen if no specific variant is defined.
---
Changes v1->v2:
* Fix commit message is -> if [Gustavo Zacarias]
* Fix help text in Config.in [Gustavo Zacarias]
--- package/pcre/Config.in | 22 ++++++++++++++++++++++ package/pcre/pcre.mk | 4 ++++ 2 files changed, 26 insertions(+)
package/pcre/Config.in +22 -0
@@ -1,6 +1,28 @@ config BR2_PACKAGE_PCRE bool "pcre" + # Ensure at least the default 8-bit library is enabled. + select BR2_PACKAGE_PCRE_8 if \ + (!BR2_PACKAGE_PCRE_16 && !BR2_PACKAGE_PCRE_32) help Perl Compatible Regular Expressions http://www.pcre.org/ + +if BR2_PACKAGE_PCRE + +config BR2_PACKAGE_PCRE_8 + bool "8-bit pcre" + help + This option builds the 8-bits pcre library, i.e 'libpcre' + +config BR2_PACKAGE_PCRE_16 + bool "16-bit pcre" + help + This option builds the 16-bits pcre library, i.e 'libpcre16' + +config BR2_PACKAGE_PCRE_32 + bool "32-bit pcre" + help + This option builds the 32-bits pcre library, i.e 'libpcre32' + +endif
package/pcre/pcre.mk +4 -0
@@ -16,4 +16,8 @@ ifneq ($(BR2_INSTALL_LIBSTDCPP),y) PCRE_CONF_OPT = --disable-cpp endif +PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_8),--enable-pcre8,--disable-pcre8) +PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_16),--enable-pcre16,--disable-pcre16) +PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_32),--enable-pcre32,--disable-pcre32) + $(eval $(autotools-package))
Signature · 1 line
1.7.9.5
PATCH 1/34 pcre: add support for 16 bits and 32 bits variants
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Until now, we have been building only the 8bits PCRE Thomas> variant. However, Qt5 requires the 16bits variant. This commit Thomas> therefore adds support to build the 16bits and 32bits variants Thomas> of PCRE. In order to preserve backward compatibility, the 8bits Thomas> variant is automatically chosen if no specific variant is Thomas> defined.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/34 x11r7/xcb-util: bump to 0.3.9
In reply to Thomas Petazzoni--- package/x11r7/xcb-util/xcb-util.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/x11r7/xcb-util/xcb-util.mk +1 -1
@@ -3,7 +3,7 @@ # xcb-util # ############################################################# -XCB_UTIL_VERSION = 0.3.6 +XCB_UTIL_VERSION = 0.3.9 XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2 XCB_UTIL_SITE = http://xcb.freedesktop.org/dist/ XCB_UTIL_INSTALL_STAGING = YES
Signature · 1 line
1.7.9.5
PATCH 2/34 x11r7/xcb-util: bump to 0.3.9
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 3/34 x11r7/xcb-util-wm: new package
In reply to Thomas Petazzoni--- package/x11r7/Config.in | 1 + package/x11r7/xcb-util-wm/Config.in | 15 +++++++++++++++ package/x11r7/xcb-util-wm/xcb-util-wm.mk | 13 +++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 package/x11r7/xcb-util-wm/Config.in create mode 100644 package/x11r7/xcb-util-wm/xcb-util-wm.mk
package/x11r7/Config.in +1 -0
@@ -16,6 +16,7 @@ if BR2_PACKAGE_XORG7 source package/x11r7/mesa3d/Config.in source package/x11r7/xcb-util/Config.in source package/x11r7/xcb-util-keysyms/Config.in + source package/x11r7/xcb-util-wm/Config.in source package/x11r7/xlib_libFS/Config.in source package/x11r7/xlib_libICE/Config.in source package/x11r7/xlib_libSM/Config.in
package/x11r7/xcb-util-wm/Config.in new file +15 -0
@@ -0,0 +1,15 @@ +config BR2_PACKAGE_XCB_UTIL_WM + bool "xcb-util-wm" + help + The XCB util modules provides a number of libraries which sit on top + of libxcb, the core X protocol library, and some of the extension + libraries. These experimental libraries provide convenience functions + and interfaces which make the raw X protocol more usable. Some of the + libraries also provide client-side code which is not strictly part of + the X protocol but which have traditionally been provided by Xlib. + + XCB util-wm module provides the following libraries: + - ewmh: Both client and window-manager helpers for EWMH. + - icccm: Both client and window-manager helpers for ICCCM. + + http://xcb.freedesktop.org/
package/x11r7/xcb-util-wm/xcb-util-wm.mk new file +13 -0
@@ -0,0 +1,13 @@ +############################################################# +# +# xcb-util-wm +# +############################################################# + +XCB_UTIL_WM_VERSION = 0.3.9 +XCB_UTIL_WM_SITE = http://xcb.freedesktop.org/dist/ +XCB_UTIL_WM_SOURCE = xcb-util-wm-$(XCB_UTIL_WM_VERSION).tar.bz2 +XCB_UTIL_WM_INSTALL_STAGING = YES +XCB_UTIL_WM_LICENSE = MIT + +$(eval $(autotools-package))
Signature · 1 line
1.7.9.5
PATCH 3/34 x11r7/xcb-util-wm: 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/x11r7/Config.in | 1 + Thomas> package/x11r7/xcb-util-wm/Config.in | 15 +++++++++++++++ Thomas> package/x11r7/xcb-util-wm/xcb-util-wm.mk | 13 +++++++++++++ Thomas> 3 files changed, 29 insertions(+) Thomas> create mode 100644 package/x11r7/xcb-util-wm/Config.in Thomas> create mode 100644 package/x11r7/xcb-util-wm/xcb-util-wm.mk
Thomas> diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in Thomas> index 706574c..2abd593 100644
Thomas> --- a/package/x11r7/Config.in
Thomas> +++ b/package/x11r7/Config.in
Thomas> @@ -16,6 +16,7 @@ if BR2_PACKAGE_XORG7
Thomas> source package/x11r7/mesa3d/Config.in Thomas> source package/x11r7/xcb-util/Config.in Thomas> source package/x11r7/xcb-util-keysyms/Config.in Thomas> + source package/x11r7/xcb-util-wm/Config.in Thomas> source package/x11r7/xlib_libFS/Config.in Thomas> source package/x11r7/xlib_libICE/Config.in Thomas> source package/x11r7/xlib_libSM/Config.in
Thomas> diff --git a/package/x11r7/xcb-util-wm/Config.in b/package/x11r7/xcb-util-wm/Config.in Thomas> new file mode 100644
Thomas> index 0000000..491e7a3
Thomas> --- /dev/null
Thomas> +++ b/package/x11r7/xcb-util-wm/Config.in
Thomas> @@ -0,0 +1,15 @@
Thomas> +config BR2_PACKAGE_XCB_UTIL_WM
Thomas> + bool "xcb-util-wm"
Thomas> + help
Doesn't this need to depend on libxcb or atleast host-pkgconf?
checking for XCB... no
configure: error: in `/home/peko/source/buildroot/output/build/xcb-util-wm-0.3.9':
configure: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config.
Alternatively, you may set the environment variables XCB_CFLAGS and XCB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See `config.log' for more details
make: *** [/home/peko/source/buildroot/output/build/xcb-util-wm-0.3.9/.stamp_configured] Error 1
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/34 x11r7/xcb-util-image: new package
In reply to Thomas Petazzoni--- package/x11r7/Config.in | 1 + package/x11r7/xcb-util-image/Config.in | 15 +++++++++++++++ package/x11r7/xcb-util-image/xcb-util-image.mk | 14 ++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 package/x11r7/xcb-util-image/Config.in create mode 100644 package/x11r7/xcb-util-image/xcb-util-image.mk
package/x11r7/Config.in +1 -0
@@ -15,6 +15,7 @@ if BR2_PACKAGE_XORG7 source package/x11r7/libxcb/Config.in source package/x11r7/mesa3d/Config.in source package/x11r7/xcb-util/Config.in + source package/x11r7/xcb-util-image/Config.in source package/x11r7/xcb-util-keysyms/Config.in source package/x11r7/xcb-util-wm/Config.in source package/x11r7/xlib_libFS/Config.in
package/x11r7/xcb-util-image/Config.in new file +15 -0
@@ -0,0 +1,15 @@ +config BR2_PACKAGE_XCB_UTIL_IMAGE + bool "xcb-util-image" + select BR2_PACKAGE_XCB_UTIL + help + The XCB util modules provides a number of libraries which sit on top + of libxcb, the core X protocol library, and some of the extension + libraries. These experimental libraries provide convenience functions + and interfaces which make the raw X protocol more usable. Some of the + libraries also provide client-side code which is not strictly part of + the X protocol but which have traditionally been provided by Xlib. + + XCB util-image module provides the following library: + - image: Port of Xlib's XImage and XShmImage functions. + + http://xcb.freedesktop.org/
package/x11r7/xcb-util-image/xcb-util-image.mk new file +14 -0
@@ -0,0 +1,14 @@ +############################################################# +# +# xcb-util-image +# +############################################################# + +XCB_UTIL_IMAGE_VERSION = 0.3.9 +XCB_UTIL_IMAGE_SITE = http://xcb.freedesktop.org/dist/ +XCB_UTIL_IMAGE_SOURCE = xcb-util-image-$(XCB_UTIL_IMAGE_VERSION).tar.bz2 +XCB_UTIL_IMAGE_INSTALL_STAGING = YES +XCB_UTIL_IMAGE_LICENSE = MIT +XCB_UTIL_IMAGE_DEPENDENCIES = xcb-util + +$(eval $(autotools-package))
Signature · 1 line
1.7.9.5
PATCH 4/34 x11r7/xcb-util-image: 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/x11r7/Config.in | 1 + Thomas> package/x11r7/xcb-util-image/Config.in | 15 +++++++++++++++ Thomas> package/x11r7/xcb-util-image/xcb-util-image.mk | 14 ++++++++++++++ Thomas> 3 files changed, 30 insertions(+) Thomas> create mode 100644 package/x11r7/xcb-util-image/Config.in Thomas> create mode 100644 package/x11r7/xcb-util-image/xcb-util-image.mk
Thomas> diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in Thomas> index 2abd593..5d0f991 100644
Thomas> --- a/package/x11r7/Config.in
Thomas> +++ b/package/x11r7/Config.in
Thomas> @@ -15,6 +15,7 @@ if BR2_PACKAGE_XORG7
Thomas> source package/x11r7/libxcb/Config.in Thomas> source package/x11r7/mesa3d/Config.in Thomas> source package/x11r7/xcb-util/Config.in Thomas> + source package/x11r7/xcb-util-image/Config.in Thomas> source package/x11r7/xcb-util-keysyms/Config.in Thomas> source package/x11r7/xcb-util-wm/Config.in Thomas> source package/x11r7/xlib_libFS/Config.in
Thomas> diff --git a/package/x11r7/xcb-util-image/Config.in b/package/x11r7/xcb-util-image/Config.in Thomas> new file mode 100644
Thomas> index 0000000..31fc61a
Thomas> --- /dev/null
Thomas> +++ b/package/x11r7/xcb-util-image/Config.in
Thomas> @@ -0,0 +1,15 @@
Thomas> +config BR2_PACKAGE_XCB_UTIL_IMAGE
Thomas> + bool "xcb-util-image"
Thomas> + select BR2_PACKAGE_XCB_UTIL
Same here:
checking for XCB... no
configure: error: in `/home/peko/source/buildroot/output/build/xcb-util-0.3.9':
configure: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config.
Alternatively, you may set the environment variables XCB_CFLAGS and XCB_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See `config.log' for more details
make: *** [/home/peko/source/buildroot/output/build/xcb-util-0.3.9/.stamp_configured] Error 1
Signature · 1 line
Bye, Peter Korsgaard
PATCH 5/34 package: create virtual package for libGLES, libOpenVG and libEGL
In reply to Thomas PetazzoniThose acceleration libraries typically have multiple implementations:
some are free (Mesa), some are proprietary (generally SoC specific).
--- package/Config.in | 1 + package/opengl/Config.in | 8 ++++++++ package/opengl/libegl/libegl.mk | 16 ++++++++++++++++ package/opengl/libgles/libgles.mk | 16 ++++++++++++++++ package/opengl/libopenvg/libopenvg.mk | 16 ++++++++++++++++ package/opengl/opengl.mk | 1 + 6 files changed, 58 insertions(+) create mode 100644 package/opengl/Config.in create mode 100644 package/opengl/libegl/libegl.mk create mode 100644 package/opengl/libgles/libgles.mk create mode 100644 package/opengl/libopenvg/libopenvg.mk create mode 100644 package/opengl/opengl.mk
package/Config.in +1 -0
@@ -435,6 +435,7 @@ source "package/librsvg/Config.in" source "package/libsvgtiny/Config.in" source "package/libungif/Config.in" source "package/opencv/Config.in" +source "package/opengl/Config.in" source "package/pango/Config.in" source "package/pixman/Config.in" source "package/tiff/Config.in"
package/opengl/Config.in new file +8 -0
@@ -0,0 +1,8 @@ +config BR2_PACKAGE_HAS_OPENGL_EGL + bool + +config BR2_PACKAGE_HAS_OPENGL_ES + bool + +config BR2_PACKAGE_HAS_OPENVG + bool
package/opengl/libegl/libegl.mk new file +16 -0
@@ -0,0 +1,16 @@ +############################################################# +# +# Virtual package for libEGL +# +############################################################# + +LIBEGL_SOURCE = + +ifeq ($(LIBEGL_DEPENDENCIES),y) +define LIBEGL_CONFIGURE_CMDS + echo "No libEGL implementation selected. Configuration error." + exit 1 +endef +endif + +$(eval $(generic-package))
package/opengl/libgles/libgles.mk new file +16 -0
@@ -0,0 +1,16 @@ +############################################################# +# +# Virtual package for libGLES +# +############################################################# + +LIBGLES_SOURCE = + +ifeq ($(LIBGLES_DEPENDENCIES),y) +define LIBGLES_CONFIGURE_CMDS + echo "No libGLES implementation selected. Configuration error." + exit 1 +endef +endif + +$(eval $(generic-package))
package/opengl/libopenvg/libopenvg.mk new file +16 -0
@@ -0,0 +1,16 @@ +############################################################# +# +# Virtual package for libOpenVG +# +############################################################# + +LIBOPENVG_SOURCE = + +ifeq ($(LIBOPENVG_DEPENDENCIES),y) +define LIBOPENVG_CONFIGURE_CMDS + echo "No libOpenVG implementation selected. Configuration error." + exit 1 +endef +endif + +$(eval $(generic-package))
package/opengl/opengl.mk new file +1 -0
@@ -0,0 +1 @@ +include package/opengl/*/*.mk
Signature · 1 line
1.7.9.5
PATCH 5/34 package: create virtual package for libGLES, libOpenVG and libEGL
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Those acceleration libraries typically have multiple implementations:
Thomas> some are free (Mesa), some are proprietary (generally SoC specific).
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---
Thomas> package/Config.in | 1 + Thomas> package/opengl/Config.in | 8 ++++++++ Thomas> package/opengl/libegl/libegl.mk | 16 ++++++++++++++++ Thomas> package/opengl/libgles/libgles.mk | 16 ++++++++++++++++ Thomas> package/opengl/libopenvg/libopenvg.mk | 16 ++++++++++++++++ Thomas> package/opengl/opengl.mk | 1 + Thomas> 6 files changed, 58 insertions(+) Thomas> create mode 100644 package/opengl/Config.in Thomas> create mode 100644 package/opengl/libegl/libegl.mk Thomas> create mode 100644 package/opengl/libgles/libgles.mk Thomas> create mode 100644 package/opengl/libopenvg/libopenvg.mk Thomas> create mode 100644 package/opengl/opengl.mk
Committed, thanks.
I personally don't really like the opengl subdir, and I think we need to be clear about what we mean when we say opengles (E.G. v1/v2/v3), but we can fix that up later.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 5/34 package: create virtual package for libGLES, libOpenVG and libEGL
Dear Peter Korsgaard,
Quoted 3 lines · Peter Korsgaard
I personally don't really like the opengl subdir, and I think we need to be clear about what we mean when we say opengles (E.G. v1/v2/v3), but we can fix that up later.
Yes, I agree with those comments. We can move things out of the opengl/ subdir as an immediate follow-up. As per the version thing, it maybe can wait until we really have a version problem, no?
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 5/34 package: create virtual package for libGLES, libOpenVG and libEGL
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Dear Peter Korsgaard,
Quoted 3 lines · Peter Korsgaard
Quoted 3 lines
I personally don't really like the opengl subdir, and I think we need to be clear about what we mean when we say opengles (E.G. v1/v2/v3), but we can fix that up later.
Thomas> Yes, I agree with those comments. We can move things out of the Thomas> opengl/ subdir as an immediate follow-up. As per the version Thomas> thing, it maybe can wait until we really have a version Thomas> problem, no?
Well, yes - But I would like to not rename symbols once they have been in a release unless we really have to, so I would prefer to think about the version issue sooner rather than later.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 6/34 rpi-userland: provides OpenGL ES, EGL and OpenVG
In reply to Thomas Petazzoni--- package/opengl/libegl/libegl.mk | 4 ++++ package/opengl/libgles/libgles.mk | 4 ++++ package/opengl/libopenvg/libopenvg.mk | 4 ++++ package/rpi-userland/Config.in | 3 +++ 4 files changed, 15 insertions(+)
package/opengl/libegl/libegl.mk +4 -0
@@ -6,6 +6,10 @@ LIBEGL_SOURCE = +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +LIBEGL_DEPENDENCIES += rpi-userland +endif + ifeq ($(LIBEGL_DEPENDENCIES),y) define LIBEGL_CONFIGURE_CMDS echo "No libEGL implementation selected. Configuration error."
package/opengl/libgles/libgles.mk +4 -0
@@ -6,6 +6,10 @@ LIBGLES_SOURCE = +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +LIBGLES_DEPENDENCIES += rpi-userland +endif + ifeq ($(LIBGLES_DEPENDENCIES),y) define LIBGLES_CONFIGURE_CMDS echo "No libGLES implementation selected. Configuration error."
package/opengl/libopenvg/libopenvg.mk +4 -0
@@ -6,6 +6,10 @@ LIBOPENVG_SOURCE = +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +LIBOPENVG_DEPENDENCIES += rpi-userland +endif + ifeq ($(LIBOPENVG_DEPENDENCIES),y) define LIBOPENVG_CONFIGURE_CMDS echo "No libOpenVG implementation selected. Configuration error."
package/rpi-userland/Config.in +3 -0
@@ -3,6 +3,9 @@ config BR2_PACKAGE_RPI_USERLAND depends on BR2_arm depends on BR2_INSTALL_LIBSTDCPP depends on BR2_LARGEFILE + select BR2_PACKAGE_HAS_OPENGL_EGL + select BR2_PACKAGE_HAS_OPENGL_ES + select BR2_PACKAGE_HAS_OPENVG help Raspberry Pi Userland contains the necessary library to use the VideoCore driver.
Signature · 1 line
1.7.9.5
PATCH 6/34 rpi-userland: provides OpenGL ES, EGL and OpenVG
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 7/34 rpi-userland: add .pc files for OpenGLESv2 and EGL libs
In reply to Thomas Petazzoni--- .../rpi-userland-add-pkgconfig-files.patch | 53 ++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/rpi-userland/rpi-userland-add-pkgconfig-files.patch
package/rpi-userland/rpi-userland-add-pkgconfig-files.patch new file +53 -0
@@ -0,0 +1,53 @@ +Add .pc files for the OpenGLESv2 and EGL libraries + +Those pkg-config files make it easier for Qt5 to find those libraries +and the appropriate link flags. + +Signed-off-by: Thomas Petazzoni <[email protected]> + +Index: b/interface/khronos/egl/egl.pc.in +=================================================================== +--- /dev/null ++++ b/interface/khronos/egl/egl.pc.in +@@ -0,0 +1,10 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include ++ ++Name: egl ++Description: RasberryPi implementation of EGL ++Version: 1.0 ++Libs: -L${libdir} -lEGL -lGLESv2 ++Cflags: -I${includedir}/ -I${includedir}/interface/vcos/pthreads/ +Index: b/interface/khronos/CMakeLists.txt +=================================================================== +--- a/interface/khronos/CMakeLists.txt ++++ b/interface/khronos/CMakeLists.txt +@@ -73,3 +73,11 @@ + + install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION lib) + install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib) ++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/egl/egl.pc.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc" @ONLY) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") ++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/glxx/glesv2.pc.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc" @ONLY) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") +Index: b/interface/khronos/glxx/glesv2.pc.in +=================================================================== +--- /dev/null ++++ b/interface/khronos/glxx/glesv2.pc.in +@@ -0,0 +1,10 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include ++ ++Name: glesv2 ++Description: RasberryPi implementation of OpenGL ESv2 ++Version: 2.0 ++Libs: -L${libdir} -lGLESv2 ++Cflags: -I${includedir}/
Signature · 1 line
1.7.9.5
PATCH 8/34 rpi-userland: add bcm_host to egl.pc
In reply to Thomas PetazzoniFrom: Floris Bos <[email protected]>
bcm_host is the Broadcom hardware interface library And is currently a dependency to use the EGL functions
--- .../rpi-userland-add-pkgconfig-files.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
package/rpi-userland/rpi-userland-add-pkgconfig-files.patch +4 -3
@@ -9,7 +9,7 @@ Index: b/interface/khronos/egl/egl.pc.in =================================================================== --- /dev/null +++ b/interface/khronos/egl/egl.pc.in -@@ -0,0 +1,10 @@ +@@ -0,0 +1,11 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib
@@ -18,8 +18,9 @@ Index: b/interface/khronos/egl/egl.pc.in +Name: egl +Description: RasberryPi implementation of EGL +Version: 1.0 -+Libs: -L${libdir} -lEGL -lGLESv2 -+Cflags: -I${includedir}/ -I${includedir}/interface/vcos/pthreads/ ++Libs: -L${libdir} -lEGL -lGLESv2 -lbcm_host ++Cflags: -I${includedir}/ -I${includedir}/interface/vcos/pthreads/ \ ++ -I${includedir}/interface/vmcs_host/linux/ Index: b/interface/khronos/CMakeLists.txt =================================================================== --- a/interface/khronos/CMakeLists.txt
Signature · 1 line
1.7.9.5
PATCH 9/34 efl/libeet, efl/libevas: use host-libjpeg instead of host-jpeg
In reply to Thomas PetazzoniBefore creating a real virtual package named 'jpeg', we want to ensure that no package is using the host variant of the virtual package. Instead, we make them use directly the host-libjpeg package.
--- package/efl/libeet/libeet.mk | 2 +- package/efl/libevas/libevas.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/efl/libeet/libeet.mk +1 -1
@@ -13,7 +13,7 @@ LIBEET_LICENSE_FILES = COPYING LIBEET_INSTALL_STAGING = YES LIBEET_DEPENDENCIES = host-pkgconf zlib jpeg libeina -HOST_LIBEET_DEPENDENCIES = host-pkgconf host-zlib host-jpeg host-libeina +HOST_LIBEET_DEPENDENCIES = host-pkgconf host-zlib host-libjpeg host-libeina ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy) LIBEET_DEPENDENCIES += gnutls libgcrypt
package/efl/libevas/libevas.mk +1 -1
@@ -15,7 +15,7 @@ LIBEVAS_INSTALL_STAGING = YES LIBEVAS_DEPENDENCIES = host-pkgconf zlib libeina freetype HOST_LIBEVAS_DEPENDENCIES = host-pkgconf host-zlib host-libeina \ - host-freetype host-libpng host-jpeg + host-freetype host-libpng host-libjpeg HOST_LIBEVAS_CONF_OPT += \ --enable-image-loader-png \ --enable-image-loader-jpeg \
Signature · 1 line
1.7.9.5
PATCH 10/34 jpeg: convert to a real package
In reply to Thomas Petazzonijpeg is a virtual package, but since it is listed in the dependencies of other packages, it should obey to all the normal make rules for packages. Notably, the jpeg-show-depends target is mandatory for the graph-depends script to work.
Instead to implement such a make target manually, make jpeg a normal generic-package, except that it doesn't have any source.
--- package/jpeg/jpeg.mk | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
package/jpeg/jpeg.mk +18 -4
@@ -1,10 +1,24 @@ ############################################################# # -# jpeg +# Virtual jpeg package # ############################################################# -jpeg: $(if $(BR2_PACKAGE_JPEG_TURBO),jpeg-turbo,libjpeg) +JPEG_SOURCE = -host-jpeg: host-libjpeg -host-jpeg-source: host-libjpeg-source +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) +JPEG_DEPENDENCIES += jpeg-turbo +endif + +ifeq ($(BR2_PACKAGE_LIBJPEG),y) +JPEG_DEPENDENCIES += libjpeg +endif + +ifeq ($(JPEG_DEPENDENCIES),) +define JPEG_CONFIGURE_CMDS + echo "No JPEG implementation defined. Configuration error" + exit 1 +endef +endif + +$(eval $(generic-package))
Signature · 1 line
1.7.9.5
PATCH 11/34 qt5: base infrastructure
In reply to Thomas Petazzoni--- package/qt5/Config.in | 18 ++++++++++++++++++ package/qt5/qt5.mk | 1 + 2 files changed, 19 insertions(+) create mode 100644 package/qt5/Config.in create mode 100644 package/qt5/qt5.mk
package/qt5/Config.in new file +18 -0
@@ -0,0 +1,18 @@ +comment "Qt5 needs a toolchain with WCHAR, IPv6, thread and C++ support" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS + +menuconfig BR2_PACKAGE_QT5 + bool "Qt5" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR + depends on BR2_INET_IPV6 + depends on BR2_TOOLCHAIN_HAS_THREADS + help + This option enables the Qt5 framework. Sub-options allow to + select which modules should be built. + + http://qt-project.org + +if BR2_PACKAGE_QT5 + +endif
package/qt5/qt5.mk new file +1 -0
@@ -0,0 +1 @@ +include package/qt5/*/*.mk
Signature · 1 line
1.7.9.5
PATCH 12/34 qt5: add macro to fixup Qt5 .la and .prl files
In reply to Thomas Petazzoni--- package/qt5/qt5.mk | 10 ++++++++++ 1 file changed, 10 insertions(+)
package/qt5/qt5.mk +10 -0
@@ -1 +1,11 @@ include package/qt5/*/*.mk + +define QT5_LA_PRL_FILES_FIXUP + for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.la"); do \ + $(SED) "s:\(['= ]\)/usr:\\1$(STAGING_DIR)/usr:g" $$i; \ + $(SED) "/^dependency_libs=/s%-L/usr/lib %%g" $$i ; \ + done + for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.prl"); do \ + $(SED) "s%-L/usr/lib%%" $$i; \ + done +endef
Signature · 1 line
1.7.9.5
PATCH 13/34 qt5base: new package
In reply to Thomas PetazzoniThis is the beginning of the Qt5 packaging. This commit allows to build only the qtbase module, which contains QtCore, QtNetwork, QtXml, QtTest, QtSql and QtConcurrent.
--- package/Config.in | 1 + package/qt5/Config.in | 2 +- package/qt5/qt5base/Config.in | 56 ++++++++++ package/qt5/qt5base/qt5base-mkspecs-files.patch | 61 +++++++++++ package/qt5/qt5base/qt5base-uclibc-no-lfs.patch | 36 +++++++ package/qt5/qt5base/qt5base.mk | 131 +++++++++++++++++++++++ 6 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 package/qt5/qt5base/Config.in create mode 100644 package/qt5/qt5base/qt5base-mkspecs-files.patch create mode 100644 package/qt5/qt5base/qt5base-uclibc-no-lfs.patch create mode 100644 package/qt5/qt5base/qt5base.mk
package/Config.in +1 -0
@@ -148,6 +148,7 @@ source "package/qtuio/Config.in" source "package/qwt/Config.in" endif +source "package/qt5/Config.in" source "package/x11r7/Config.in" comment "X libraries and helper libraries"
package/qt5/Config.in +1 -1
@@ -14,5 +14,5 @@ menuconfig BR2_PACKAGE_QT5 http://qt-project.org if BR2_PACKAGE_QT5 - +source "package/qt5/qt5base/Config.in" endif
package/qt5/qt5base/Config.in new file +56 -0
56 lines not on this page · raw message
package/qt5/qt5base/qt5base-mkspecs-files.patch new file +61 -0
61 lines not on this page · raw message
package/qt5/qt5base/qt5base-uclibc-no-lfs.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 6f88b27de256266947a7f6a3e70e18510754aab2 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard <[email protected]> +Date: Sat, 14 Apr 2012 20:36:07 +0200 +Subject: [PATCH] mkspecs/common/posix: fix !largefile builds on uClibc + +uClibc doesn't even define O_LARGEFILE when not configured with large file +support, so ensure this define is only used when Qt is built with +-largefile, otherwise the build fails with: + +io/qtemporaryfile.cpp: In function 'bool createFileFromTemplate( + NativeFileHandle&, QFileSystemEntry::NativePath&, size_t, size_t, + QSystemError&)': +io/qtemporaryfile.cpp:197:57: error: 'O_LARGEFILE' was not declared in + this scope + +Moved to qt5 by Thomas Petazzoni. + +Reported-Upstream: https://bugreports.qt-project.org/browse/QTBUG-25321 +Signed-off-by: Peter Korsgaard <[email protected]> + +Index: b/mkspecs/common/posix/qplatformdefs.h +=================================================================== +--- a/mkspecs/common/posix/qplatformdefs.h ++++ b/mkspecs/common/posix/qplatformdefs.h +@@ -123,7 +123,11 @@ + #define QT_READ ::read + #define QT_WRITE ::write + ++#ifdef QT_LARGEFILE_SUPPORT + #define QT_OPEN_LARGEFILE O_LARGEFILE ++#else ++#define QT_OPEN_LARGEFILE 0 ++#endif + #define QT_OPEN_RDONLY O_RDONLY + #define QT_OPEN_WRONLY O_WRONLY + #define QT_OPEN_RDWR O_RDWR
package/qt5/qt5base/qt5base.mk new file +131 -0
131 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 13/34 qt5base: new package
Hi, Thomas!
package/qt5/qt5base/qt5base.mk line 7
Quoted 5 lines · Thomas Petazzoni
package/qt5/qt5base/qt5base.mk new file +5
-0+# qt5base +# +############################################################# + +QT5BASE_VERSION = 5.0.0
Why not 5.0.1, which was rolled out quite quickly after 5.0.0
with fixes for many bugs? Please see
http://blog.qt.digia.com/blog/2013/01/31/qt-5-0-1-released/
and e.g.
https://qt.gitorious.org/qt/qtbase/blobs/release/dist/changes-5.0.1
for some details.
--
Best regards,
Alexander Lukichev
PATCH 13/34 qt5base: new package
Dear Alexander Lukichev,
Quoted 8 lines · Alexander Lukichev
Why not 5.0.1, which was rolled out quite quickly after 5.0.0
with fixes for many bugs? Please seehttp://blog.qt.digia.com/blog/2013/01/31/qt-5-0-1-released/
and e.g.
https://qt.gitorious.org/qt/qtbase/blobs/release/dist/changes-5.0.1
Good point, I'll update the patch set to 5.0.1, thanks!
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 14/34 qt5base: add GUI support
In reply to Thomas Petazzoni--- package/qt5/qt5base/Config.in | 44 ++++++++++++++++++++++++++++++++++++++++ package/qt5/qt5base/qt5base.mk | 29 +++++++++++++++++++++----- 2 files changed, 68 insertions(+), 5 deletions(-)
package/qt5/qt5base/Config.in +44 -0
@@ -53,4 +53,48 @@ config BR2_PACKAGE_QT5BASE_XML help This options enables the Qt5Xml library. +config BR2_PACKAGE_QT5BASE_GUI + bool "gui module" + # At least one graphic backend must be enabled, so enable + # linuxfb if nothing is enabled. + select BR2_PACKAGE_QT5BASE_LINUXFB if \ + !BR2_PACKAGE_QT5BASE_DIRECTFB && \ + !BR2_PACKAGE_QT5BASE_XCB + help + This option enables the Qt5Gui library. + +if BR2_PACKAGE_QT5BASE_GUI + +config BR2_PACKAGE_QT5BASE_WIDGETS + bool "widgets module" + help + This option enables the Qt5Widgets library. + +config BR2_PACKAGE_QT5BASE_LINUXFB + bool "linuxfb support" + +config BR2_PACKAGE_QT5BASE_DIRECTFB + bool "directfb support" + select BR2_PACKAGE_DIRECTFB + +config BR2_PACKAGE_QT5BASE_XCB + bool "X.org XCB support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBX11 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_IMAGE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_WM + +comment "X.org XCB backend available if X.org is enabled" + depends on !BR2_PACKAGE_XORG7 + +config BR2_PACKAGE_QT5BASE_PRINTSUPPORT + bool "print support module" + select BR2_PACKAGE_QT5BASE_WIDGETS + help + This option enables the Qt5PrintSupport + +endif + endif
package/qt5/qt5base/qt5base.mk +24 -5
@@ -20,13 +20,8 @@ QT5BASE_INSTALL_STAGING = YES # want to use the one packaged in Buildroot QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ - -no-linuxfb \ - -no-xcb \ - -no-directfb \ -no-eglfs \ -no-kms \ - -no-gui \ - -no-widgets \ -no-opengl \ -no-glib \ -no-cups \
@@ -61,6 +56,26 @@ QT5BASE_LICENSE = Commercial license QT5BASE_REDISTRIBUTE = NO endif +# We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb +# is to add a link against the "inuxfb" library. +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) + +ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) +QT5BASE_CONFIGURE_OPTS += -xcb +QT5BASE_DEPENDENCIES += \ + libxcb \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xlib_libX11 +else +QT5_BASE_CONFIGURE_OPTS += -no-xcb +endif + # Build the list of libraries to be installed on the target QT5BASE_INSTALL_LIBS_y += Qt5Core QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network
@@ -69,6 +84,10 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport + # 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 14/34 qt5base: add GUI support
Hi Thomas,
Quoted 89 lines · Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>--- package/qt5/qt5base/Config.in | 44 ++++++++++++++++++++++++++++++++++++++++ package/qt5/qt5base/qt5base.mk | 29 +++++++++++++++++++++----- 2 files changed, 68 insertions(+), 5 deletions(-)package/qt5/qt5base/Config.in +44
-0@@ -53,4 +53,48 @@ config BR2_PACKAGE_QT5BASE_XML help This options enables the Qt5Xml library. +config BR2_PACKAGE_QT5BASE_GUI + bool "gui module" + # At least one graphic backend must be enabled, so enable + # linuxfb if nothing is enabled. + select BR2_PACKAGE_QT5BASE_LINUXFB if \ + !BR2_PACKAGE_QT5BASE_DIRECTFB && \ + !BR2_PACKAGE_QT5BASE_XCB + help + This option enables the Qt5Gui library. + +if BR2_PACKAGE_QT5BASE_GUI + +config BR2_PACKAGE_QT5BASE_WIDGETS + bool "widgets module" + help + This option enables the Qt5Widgets library. + +config BR2_PACKAGE_QT5BASE_LINUXFB + bool "linuxfb support" + +config BR2_PACKAGE_QT5BASE_DIRECTFB + bool "directfb support" + select BR2_PACKAGE_DIRECTFB + +config BR2_PACKAGE_QT5BASE_XCB + bool "X.org XCB support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBX11 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_IMAGE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_WM + +comment "X.org XCB backend available if X.org is enabled" + depends on !BR2_PACKAGE_XORG7 + +config BR2_PACKAGE_QT5BASE_PRINTSUPPORT + bool "print support module" + select BR2_PACKAGE_QT5BASE_WIDGETS + help + This option enables the Qt5PrintSupport + +endif + endifpackage/qt5/qt5base/qt5base.mk +8
-5@@ -20,13 +20,8 @@ QT5BASE_INSTALL_STAGING = YES # want to use the one packaged in Buildroot QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ - -no-linuxfb \ - -no-xcb \ - -no-directfb \ -no-eglfs \ -no-kms \ - -no-gui \ - -no-widgets \ -no-opengl \ -no-glib \ -no-cups \@@ -61,6 +56,26 @@ QT5BASE_LICENSE = Commercial license QT5BASE_REDISTRIBUTE = NO endif +# We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb +# is to add a link against the "inuxfb" library. +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) +
package/qt5/qt5base/qt5base.mk QT5BASE_LICENSE = Commercial license · line 76
Quoted 10 lines
package/qt5/qt5base/qt5base.mk +10
-0+ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) +QT5BASE_CONFIGURE_OPTS += -xcb +QT5BASE_DEPENDENCIES += \ + libxcb \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xlib_libX11 +else +QT5_BASE_CONFIGURE_OPTS += -no-xcb
typo here: should be
QT5BASE_CONFIGURE_OPTS += -no-xcb
Quoted 19 lines
package/qt5/qt5base/qt5base.mk +6
-1+endif + # Build the list of libraries to be installed on the target QT5BASE_INSTALL_LIBS_y += Qt5Core QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network@@ -69,6 +84,10 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport + # 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 --1.7.9.5
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Best regards,
Lionel
PATCH 14/34 qt5base: add GUI support
Dear Lionel Orry,
Quoted 5 lines · Lionel Orry
Quoted 1 line
+QT5_BASE_CONFIGURE_OPTS += -no-xcb
typo here: should be
QT5BASE_CONFIGURE_OPTS+= -no-xcb
Well spotted, thanks! I'm fixing this.
Thanks a lot for your review,
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 14/34 qt5base: add GUI support
Hi Thomas,
Quoted 6 lines · Thomas Petazzoni
Dear Lionel Orry,
Quoted 2 lines · Lionel Orry
Quoted 1 line
+QT5_BASE_CONFIGURE_OPTS += -no-xcb
Quoted 7 lines
Quoted 3 lines
typo here: should be
QT5BASE_CONFIGURE_OPTS+= -no-xcbWell spotted, thanks! I'm fixing this.
Thanks a lot for your review,
You're welcome. While I'm at it, I switched to 5.0.1 and noticed the "-fast" option to configure is not recognised. I suppose the equivalent options are (extract from ./configure -help):
* -process ........... Generate only a top-level Makefile. -fully-process ..... Generate Makefiles for the entire Qt tree. -dont-process ...... Do not generate any Makefiles.
Quoted 7 lines
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
Regards,
Lionel
PATCH 14/34 qt5base: add GUI support
Dear Lionel Orry,
Quoted 2 lines · Lionel Orry
You're welcome. While I'm at it, I switched to 5.0.1 and noticed the "-fast" option to configure is not recognised.
Yes, I also moved to 5.0.1. I simply removed this option. I will repost an updated version of my patch set, hopefully this afternoon.
Quoted 6 lines
I suppose the
equivalent options are (extract from ./configure -help):* -process ........... Generate only a top-level
Makefile. -fully-process ..... Generate Makefiles for the entire Qt tree. -dont-process ...... Do not generate any Makefiles.
Hum, yes, maybe. Not sure which one is the correct choice, though. I've just left the default value and it seems to work nicely.
Thanks,
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 15/34 qt5base: support debug or release modes
In reply to Thomas Petazzoni--- package/qt5/qt5base/qt5base.mk | 6 ++++++ 1 file changed, 6 insertions(+)
package/qt5/qt5base/qt5base.mk +6 -0
@@ -41,6 +41,12 @@ QT5BASE_CONFIGURE_OPTS += \ -system-pcre \ -no-pch +ifeq ($(BR2_ENABLE_DEBUG),y) +QT5BASE_CONFIGURE_OPTS += -debug +else +QT5BASE_CONFIGURE_OPTS += -release +endif + ifeq ($(BR2_LARGEFILE),y) QT5BASE_CONFIGURE_OPTS += -largefile else
Signature · 1 line
1.7.9.5
PATCH 16/34 qt5base: add OpenSSL support
In reply to Thomas Petazzoni--- package/qt5/qt5base/Config.in | 8 ++++++++ package/qt5/qt5base/qt5base.mk | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-)
package/qt5/qt5base/Config.in +8 -0
@@ -33,6 +33,14 @@ config BR2_PACKAGE_QT5BASE_NETWORK help This options enables the Qt5Network library. +config BR2_PACKAGE_QT5BASE_NETWORK_OPENSSL + bool "OpenSSL support" + select BR2_PACKAGE_OPENSSL + depends on BR2_PACKAGE_QT5BASE_NETWORK + help + This option enables the OpenSSL support in the Qt5Network + library. + config BR2_PACKAGE_QT5BASE_CONCURRENT bool "concurrent module" help
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 QT5_BASE_CONFIGURE_OPTS += -no-xcb endif +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_OPENSSL),-openssl,-no-openssl) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_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 17/34 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
@@ -67,7 +67,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.
@@ -97,6 +98,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 QT5_BASE_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_QT5BASE_OPENSSL),-openssl,-no-openssl) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_OPENSSL),openssl)
Signature · 1 line
1.7.9.5
PATCH 18/34 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
@@ -112,6 +112,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_QT5BASE_OPENSSL),-openssl,-no-openssl) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_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 19/34 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
@@ -140,4 +140,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 20/34 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 21/34 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
@@ -148,4 +148,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 22/34 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 23/34 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
@@ -173,9 +173,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 24/34 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.0 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.0 +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 25/34 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 26/34 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 27/34 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 28/34 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 29/34 qt5/qt5jsbackend: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5jsbackend/Config.in | 10 +++++ .../qt5/qt5jsbackend/qt5jsbackend-fix-uclibc.patch | 33 ++++++++++++++++ package/qt5/qt5jsbackend/qt5jsbackend.mk | 41 ++++++++++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 package/qt5/qt5jsbackend/Config.in 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-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 30/34 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 31/34 qt5/qt5graphicaleffects: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5graphicaleffects/Config.in | 11 ++++++ .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 40 ++++++++++++++++++++ 3 files changed, 52 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 +11 -0
@@ -0,0 +1,11 @@ +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
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 32/34 qt5/qt5multimedia: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5multimedia/Config.in | 11 +++++++ package/qt5/qt5multimedia/qt5multimedia.mk | 43 ++++++++++++++++++++++++++++ 3 files changed, 55 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 +11 -0
@@ -0,0 +1,11 @@ +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
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 33/34 qt5/qt5quick1: new package
In reply to Thomas Petazzoni--- package/qt5/Config.in | 1 + package/qt5/qt5quick1/Config.in | 15 ++++++++++++ package/qt5/qt5quick1/qt5quick1.mk | 45 ++++++++++++++++++++++++++++++++++++ 3 files changed, 61 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 +15 -0
@@ -0,0 +1,15 @@ +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
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 34/34 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