Skip to contentSkip to conversation

Add Qt5 packages

PATCH Superseded Thomas Petazzoni 4 participants 53 messages Mar 7, 2013 – Mar 12, 2013

lore
Share & tools
lore
#0 lore raw

v3 cover 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 fixes xcb-util to have the proper dependency on libxcb.

* Patches 2 and 3 add the xcb-util-wm and xcb-util-image packages, that are needed to build the XCB backend of Qt5.

* Patches 4 and 5 improve the rpi-userland package to provide a .pc file that allows to easily link against the RPi implementation of OpenGLES and EGL.

* Patch 6 makes packages using host-jpeg use host-libjpeg instead so that we don't have to provide a virtual host-jpeg package.

* Patch 7 converts the jpeg virtual package to a real package.

* Patches 8 and 9 adds some basic infrastructure to support the Qt5 packages.

* Patch 10 adds the Qt5Base package.

* Patches 11 to 20 extend the Qt5Base package with various features (GUI, OpenSSL, EGL, D-Bus, etc.)

* Patch 21 creates a common variable to share the Qt5 version between all the Qt5 packages.

* Patches 22 to 31 add more Qt5 libraries: Qt5Svg, Qt5Webkit, Qt5Script, and more.

* Patch 32 fixes a build problem of Qt5Webkit when an OpenGLES backend is used (it forgets to add the right include paths).

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

Floris Bos (4):
rpi-userland: add bcm_host to egl.pc
qt5base: add rPi EGL glue code
qt5base: install bundled fonts to target
qt5webkit: add EGL dir to includepath

Thomas Petazzoni (28):
xcb-util: add dependency on libxcb x11r7/xcb-util-wm: new package
x11r7/xcb-util-image: new package
rpi-userland: add .pc files for OpenGLESv2 and EGL libs efl/libeet, efl/libevas: use host-libjpeg instead of host-jpeg
jpeg: convert to a real package
qt5: base infrastructure
qt5: add macro to fixup Qt5 .la and .prl files
qt5base: new package
qt5base: add GUI support
qt5base: support debug or release modes
qt5base: add OpenSSL support
qt5base: add eglfs graphics backend
qt5base: add support for fontconfig, png, jpeg, gif
qt5base: add D-Bus support
qt5base: add glib support
qt5base: add support to build against ICU
qt5: factor Qt5 version
qt5/qt5svg: new package
qt5/qt5script: new package
qt5/qt5imageformats: new package
qt5/qt5xmlpatterns: new package
qt5/qt5jsbackend: new package
qt5/qt5declarative: new package qt5/qt5graphicaleffects: new package qt5/qt5multimedia: new package
qt5/qt5quick1: new package
qt5/qt5webkit: new package

 package/Config.in                                  |    1 +
 package/efl/libeet/libeet.mk                       |    2 +-
 package/efl/libevas/libevas.mk                     |    2 +-
 package/jpeg/jpeg.mk                               |   22 ++-
 package/qt5/Config.in                              |   28 +++
 package/qt5/qt5.mk                                 |   12 ++
 package/qt5/qt5base/Config.in                      |  158 ++++++++++++++++
 ...nce-add-egl-to-CONFIG-to-get-correct-incl.patch |   32 ++++
 package/qt5/qt5base/qt5base-mkspecs-files.patch    |   64 +++++++
 package/qt5/qt5base/qt5base-uclibc-no-lfs.patch    |   36 ++++
 package/qt5/qt5base/qt5base.mk                     |  188 ++++++++++++++++++++
 package/qt5/qt5declarative/Config.in               |   18 ++
 package/qt5/qt5declarative/qt5declarative.mk       |   48 +++++
 package/qt5/qt5graphicaleffects/Config.in          |   14 ++
 .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk |   40 +++++
 package/qt5/qt5imageformats/Config.in              |   10 ++
 package/qt5/qt5imageformats/qt5imageformats.mk     |   39 ++++
 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 +++++
 package/qt5/qt5multimedia/Config.in                |   14 ++
 package/qt5/qt5multimedia/qt5multimedia.mk         |   43 +++++
 package/qt5/qt5quick1/Config.in                    |   18 ++
 package/qt5/qt5quick1/qt5quick1.mk                 |   45 +++++
 package/qt5/qt5script/Config.in                    |   10 ++
 package/qt5/qt5script/qt5script.mk                 |   41 +++++
 package/qt5/qt5svg/Config.in                       |   11 ++
 package/qt5/qt5svg/qt5svg.mk                       |   47 +++++
 package/qt5/qt5webkit/Config.in                    |   12 ++
 .../qt5/qt5webkit/qt5webkit-egl-includepath.patch  |   40 +++++
 package/qt5/qt5webkit/qt5webkit.mk                 |   43 +++++
 package/qt5/qt5xmlpatterns/Config.in               |   10 ++
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk       |   41 +++++
 .../rpi-userland-add-pkgconfig-files.patch         |   54 ++++++
 package/x11r7/Config.in                            |    2 +
 package/x11r7/xcb-util-image/Config.in             |   15 ++
 package/x11r7/xcb-util-image/xcb-util-image.mk     |   14 ++
 package/x11r7/xcb-util-wm/Config.in                |   16 ++
 package/x11r7/xcb-util-wm/xcb-util-wm.mk           |   14 ++
 package/x11r7/xcb-util/Config.in                   |    1 +
 package/x11r7/xcb-util/xcb-util.mk                 |    2 +-
 42 files changed, 1313 insertions(+), 7 deletions(-)
 create mode 100644 package/qt5/Config.in
 create mode 100644 package/qt5/qt5.mk
 create mode 100644 package/qt5/qt5base/Config.in
 create mode 100644 package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
 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
 create mode 100644 package/qt5/qt5declarative/Config.in
 create mode 100644 package/qt5/qt5declarative/qt5declarative.mk
 create mode 100644 package/qt5/qt5graphicaleffects/Config.in
 create mode 100644 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
 create mode 100644 package/qt5/qt5imageformats/Config.in
 create mode 100644 package/qt5/qt5imageformats/qt5imageformats.mk
 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
 create mode 100644 package/qt5/qt5multimedia/Config.in
 create mode 100644 package/qt5/qt5multimedia/qt5multimedia.mk
 create mode 100644 package/qt5/qt5quick1/Config.in
 create mode 100644 package/qt5/qt5quick1/qt5quick1.mk
 create mode 100644 package/qt5/qt5script/Config.in
 create mode 100644 package/qt5/qt5script/qt5script.mk
 create mode 100644 package/qt5/qt5svg/Config.in
 create mode 100644 package/qt5/qt5svg/qt5svg.mk
 create mode 100644 package/qt5/qt5webkit/Config.in
 create mode 100644 package/qt5/qt5webkit/qt5webkit-egl-includepath.patch
 create mode 100644 package/qt5/qt5webkit/qt5webkit.mk
 create mode 100644 package/qt5/qt5xmlpatterns/Config.in
 create mode 100644 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
 create mode 100644 package/rpi-userland/rpi-userland-add-pkgconfig-files.patch
 create mode 100644 package/x11r7/xcb-util-image/Config.in
 create mode 100644 package/x11r7/xcb-util-image/xcb-util-image.mk
 create mode 100644 package/x11r7/xcb-util-wm/Config.in
 create mode 100644 package/x11r7/xcb-util-wm/xcb-util-wm.mk
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v3 1/32 xcb-util: add dependency on libxcb

The xcb-util lacks a dependency on libxcb. Without this dependency, it fails to build with:

checking for XCB... no
configure: error: in `/home/thomas/projets/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.

---
 package/x11r7/xcb-util/Config.in   |    1 +
 package/x11r7/xcb-util/xcb-util.mk |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
package/x11r7/xcb-util/Config.in +1 -0
index cf79327..dd77b1d 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XCB_UTIL
 	bool "xcb-util"
+	depends on BR2_PACKAGE_LIBXCB
 	help
 	  Libraries which sit on top of libxcb, the core X protocol library,
 	  and some of the extension libraries.
package/x11r7/xcb-util/xcb-util.mk +1 -1
index fcf99ea..a1948e1 100644
@@ -7,7 +7,7 @@ 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
-XCB_UTIL_DEPENDENCIES = host-gperf
+XCB_UTIL_DEPENDENCIES = host-gperf libxcb
 
 $(eval $(autotools-package))
 
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/32 xcb-util: add dependency on libxcb

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> The xcb-util lacks a dependency on libxcb. Without this dependency, it Thomas> fails to build with:

Thomas> checking for XCB... no

Thomas> configure: error: in
Thomas> `/home/thomas/projets/buildroot/output/build/xcb-util-0.3.9':
Thomas> configure: error: The pkg-config script could not be found or Thomas> is too old. Make sure it is in your PATH or set the PKG_CONFIG Thomas> environment variable to the full path to pkg-config.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH v3 2/32 x11r7/xcb-util-wm: new package

In reply to Thomas Petazzoni
---
 package/x11r7/Config.in                  |    1 +
 package/x11r7/xcb-util-wm/Config.in      |   16 ++++++++++++++++
 package/x11r7/xcb-util-wm/xcb-util-wm.mk |   14 ++++++++++++++
 3 files changed, 31 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
index 706574c..2abd593 100644
@@ -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 +16 -0
new file mode 100644
index 0000000..5e7d94e
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_XCB_UTIL_WM
+	bool "xcb-util-wm"
+	select BR2_PACKAGE_LIBXCB
+	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 +14 -0
new file mode 100644
index 0000000..0338b85
@@ -0,0 +1,14 @@
+#############################################################
+#
+# 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
+XCB_UTIL_WM_DEPENDENCIES = libxcb
+
+$(eval $(autotools-package))
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH 2/32 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]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH v3 3/32 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
index 2abd593..5d0f991 100644
@@ -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
new file mode 100644
index 0000000..31fc61a
@@ -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
new file mode 100644
index 0000000..0309f3b
@@ -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
#6 lore raw

PATCH 3/32 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]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH v3 4/32 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
new file mode 100644
index 0000000..0da9afd
@@ -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
#8 lore raw

PATCH 4/32 rpi-userland: add .pc files for OpenGLESv2 and EGL libs

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
#9 lore raw

PATCH v3 5/32 rpi-userland: add bcm_host to egl.pc

In reply to Thomas Petazzoni

From: 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
index 0da9afd..4ffc2b0 100644
@@ -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
#10 lore raw

PATCH 5/32 rpi-userland: add bcm_host to egl.pc

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> bcm_host is the Broadcom hardware interface library Thomas> And is currently a dependency to use the EGL functions

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#11 lore raw

PATCH v3 6/32 efl/libeet, efl/libevas: use host-libjpeg instead of host-jpeg

In reply to Thomas Petazzoni

Before 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
index 3d5b460..db3ec6e 100644
@@ -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
index 0a90842..5bdcba5 100644
@@ -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
#12 lore raw

PATCH 6/32 efl/libeet, efl/libevas: use host-libjpeg instead of host-jpeg

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Before creating a real virtual package named 'jpeg', we want to ensure Thomas> that no package is using the host variant of the virtual Thomas> package. Instead, we make them use directly the host-libjpeg package.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#13 lore raw

PATCH v3 7/32 jpeg: convert to a real package

In reply to Thomas Petazzoni

jpeg 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
index 3caacaa..962908d 100644
@@ -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
#14 lore raw

PATCH 7/32 jpeg: convert to a real package

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> jpeg is a virtual package, but since it is listed in the dependencies Thomas> of other packages, it should obey to all the normal make rules for Thomas> packages. Notably, the jpeg-show-depends target is mandatory for the Thomas> graph-depends script to work.

Thomas> Instead to implement such a make target manually, make jpeg a normal Thomas> generic-package, except that it doesn't have any source.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#15 lore raw

PATCH v3 8/32 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
new file mode 100644
index 0000000..0acb89e
@@ -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
new file mode 100644
index 0000000..8b1a7ed
@@ -0,0 +1 @@
+include package/qt5/*/*.mk
Signature · 1 line
1.7.9.5
#16 lore raw

PATCH 8/32 qt5: base infrastructure

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
#17 lore raw

PATCH v3 9/32 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
index 8b1a7ed..f220508 100644
@@ -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
#18 lore raw

PATCH 9/32 qt5: add macro to fixup Qt5 .la and .prl files

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
#19 lore raw

PATCH v3 10/32 qt5base: new package

In reply to Thomas Petazzoni

This 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                  |  130 +++++++++++++++++++++++
 6 files changed, 285 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
index 22e64f8..afe7440 100644
@@ -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
index 0acb89e..1c9f8a6 100644
@@ -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
new file mode 100644
index 0000000..9772d49
@@ -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 +130 -0

130 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#20 lore raw

PATCH 10/32 qt5base: new package

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> This is the beginning of the Qt5 packaging. This commit allows to Thomas> build only the qtbase module, which contains QtCore, QtNetwork, QtXml, Thomas> QtTest, QtSql and QtConcurrent.

Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#21 lore raw

PATCH v3 11/32 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
index 4cd6ce0..801ef6f 100644
@@ -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
index fd85c4d..cad7b8d 100644
@@ -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
+QT5BASE_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
#22 lore raw

PATCH 11/32 qt5base: add GUI 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
#23 lore raw

PATCH v3 12/32 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
index cad7b8d..33555ae 100644
@@ -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
#24 lore raw

PATCH 12/32 qt5base: support debug or release modes

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
#25 lore raw

PATCH v3 13/32 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
index 801ef6f..540c8b2 100644
@@ -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
index 33555ae..c30bf48 100644
@@ -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_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
#26 lore raw

PATCH 13/32 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]> Thomas> ---

 Thomas>  package/qt5/qt5base/Config.in  |    8 ++++++++
 Thomas>  package/qt5/qt5base/qt5base.mk |    4 +++-

Thomas> 2 files changed, 11 insertions(+), 1 deletion(-)

Thomas> diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in Thomas> index 801ef6f..540c8b2 100644
Thomas> --- a/package/qt5/qt5base/Config.in
Thomas> +++ b/package/qt5/qt5base/Config.in
Thomas> @@ -33,6 +33,14 @@ config BR2_PACKAGE_QT5BASE_NETWORK
Thomas> help
Thomas> This options enables the Qt5Network library.

Thomas> +config BR2_PACKAGE_QT5BASE_NETWORK_OPENSSL
Thomas> + bool "OpenSSL support"
Thomas> + select BR2_PACKAGE_OPENSSL
Thomas> + depends on BR2_PACKAGE_QT5BASE_NETWORK
Thomas> + help
Thomas> + This option enables the OpenSSL support in the Qt5Network
Thomas> + library.

I know we do similar for qt4, but why not just automatically enable ssl support if openssl is enabled like elsewhere?

Signature · 1 line
Bye, Peter Korsgaard
#27 lore raw

PATCH v3 14/32 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
index 540c8b2..e91c405 100644
@@ -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
new file mode 100644
index 0000000..a85a5aa
@@ -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
index c30bf48..af6c578 100644
@@ -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_QT5BASE_OPENSSL),-openssl,-no-openssl)
 QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_OPENSSL),openssl)
 
Signature · 1 line
1.7.9.5
#28 lore raw

PATCH 14/32 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]> Thomas> ---

 Thomas>  package/qt5/qt5base/Config.in                      |   11 ++++++-
 Thomas>  ...nce-add-egl-to-CONFIG-to-get-correct-incl.patch |   32 ++++++++++++++++++++
 Thomas>  package/qt5/qt5base/qt5base.mk                     |    9 ++++--

Thomas> 3 files changed, 49 insertions(+), 3 deletions(-)
Thomas> create mode 100644 package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch

Thomas> +++ b/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch Thomas> @@ -0,0 +1,32 @@
Thomas> +From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001 Thomas> +From: Thomas Petazzoni <[email protected]>
Thomas> +Date: Sun, 13 Jan 2013 14:36:48 +0100
Thomas> +Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct include Thomas> + paths
Thomas> +

It seems this somehow (before adding to buildroot) got wordwrapped? E.G. 'paths' should normally be part of the subject line.

Other than that it looks good.

Signature · 1 line
Bye, Peter Korsgaard
#29 lore raw

PATCH 14/32 qt5base: add eglfs graphics backend

Peter, Thomas, All,

Quoted 19 lines · On Sunday 10 March 2013 Peter Korsgaard wrote:
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/qt5base/Config.in                      |   11 ++++++-
 Thomas>  ...nce-add-egl-to-CONFIG-to-get-correct-incl.patch |   32 ++++++++++++++++++++
 Thomas>  package/qt5/qt5base/qt5base.mk                     |    9 ++++--

Thomas> 3 files changed, 49 insertions(+), 3 deletions(-)
Thomas> create mode 100644 package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch

Thomas> +++ b/package/qt5/qt5base/qt5base-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch Thomas> @@ -0,0 +1,32 @@
Thomas> +From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001 Thomas> +From: Thomas Petazzoni <[email protected]>
Thomas> +Date: Sun, 13 Jan 2013 14:36:48 +0100
Thomas> +Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct include Thomas> + paths
Thomas> +

Quoted 2 lines

It seems this somehow (before adding to buildroot) got wordwrapped? E.G. 'paths' should normally be part of the subject line.

Notice how 'paths' has a space in front of it? That's the way line continuation is expresed in an e-mail.

I expect (in fact I'm pretty sure) git-am correctly handles this case, and folds back this part into the previous line, thus restoring the initial subject line.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#30 lore raw

PATCH v3 15/32 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
index e91c405..08e3c16 100644
@@ -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
index af6c578..e2f9d4e 100644
@@ -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
#31 lore raw

PATCH v3 16/32 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
index 08e3c16..baf471f 100644
@@ -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
index e2f9d4e..e5a04f8 100644
@@ -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
#32 lore raw

PATCH v3 17/32 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
index e5a04f8..c24a6bc 100644
@@ -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
#33 lore raw

PATCH v3 18/32 qt5base: add support to build against ICU

In reply to Thomas Petazzoni

Qt5Webkit 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
index baf471f..71c2ccd 100644
@@ -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
index c24a6bc..6317457 100644
@@ -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
#34 lore raw

PATCH v3 19/32 qt5base: add rPi EGL glue code

In reply to Thomas Petazzoni

From: 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
index a86d0b1..d5827f6 100644
@@ -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
index 6317457..708da8f 100644
@@ -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
#35 lore raw

PATCH v3 20/32 qt5base: install bundled fonts to target

In reply to Thomas Petazzoni

From: 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
index 708da8f..ee2f6ad 100644
@@ -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
#36 lore raw

PATCH v3 21/32 qt5: factor Qt5 version

In reply to Thomas Petazzoni

Since 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
index f220508..83cc0e1 100644
@@ -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
index ee2f6ad..faa16da 100644
@@ -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
#37 lore raw

PATCH v3 22/32 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
index 1c9f8a6..f4d2b45 100644
@@ -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
new file mode 100644
index 0000000..27e6b05
@@ -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
#38 lore raw

PATCH v3 23/32 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
index f4d2b45..3f303e2 100644
@@ -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
new file mode 100644
index 0000000..3c5d60c
@@ -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
#39 lore raw

PATCH v3 24/32 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
index 3f303e2..397f9c2 100644
@@ -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
new file mode 100644
index 0000000..d37e08f
@@ -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
new file mode 100644
index 0000000..c40d545
@@ -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
#40 lore raw

PATCH v3 25/32 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
index 397f9c2..3979fa5 100644
@@ -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
new file mode 100644
index 0000000..6ea7466
@@ -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
#41 lore raw

PATCH v3 26/32 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
index 3979fa5..8a4ed53 100644
@@ -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
new file mode 100644
index 0000000..89d5067
@@ -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
new file mode 100644
index 0000000..08f343e
@@ -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
new file mode 100644
index 0000000..50a6dbc
@@ -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
#42 lore raw

PATCH 1/1 qt5jsbackend: Remove dependency on bz2 module

From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>

The Python bz2 module is only needed in certain cases, so only import it when needed. In the normal qt5jsbackend build, this allows to remove the dependency on this module.

---
Thomas, feel free to squash this with the qt5jsbackend patch.

---
 ...8-js2c.py-Remove-dependency-on-bz2-module.patch |   38 ++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-0001-v8-js2c.py-Remove-dependency-on-bz2-module.patch
package/qt5/qt5jsbackend/qt5jsbackend-0001-v8-js2c.py-Remove-dependency-on-bz2-module.patch new file +38 -0
new file mode 100644
index 0000000..17ceda1
@@ -0,0 +1,38 @@
+From 51d6d005eb383908a4d7031c61cef14cc4cbdc38 Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>
+Date: Tue, 12 Mar 2013 08:07:09 +0100
+Subject: [PATCH] v8: js2c.py: Remove dependency on bz2 module
+
+The Python bz2 module is only needed in certain cases, so only import
+it when needed. In the normal qtjsbackend build, this allows to remove the
+dependency on this module.
+
+[arnout at mind.be: ported patch from nodejs]
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]>
+---
+ src/3rdparty/v8/tools/js2c.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/v8/tools/js2c.py b/src/3rdparty/v8/tools/js2c.py
+index d06cbe4..c63a640 100644
+--- 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 @@ def JS2C(source, target, env):
+   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)
+-- 
Signature · 1 line
1.7.10.4
#43 lore raw

PATCH 1/1 qt5jsbackend: Remove dependency on bz2 module

Dear Arnout Vandecappelle (Essensium/Mind),

Quoted 8 lines · Arnout Vandecappelle (Essensium/Mind)

From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>

The Python bz2 module is only needed in certain cases, so only import it when needed. In the normal qt5jsbackend build, this allows to remove the dependency on this module.

Hum, thanks but my Qt5 branch already has a similar patch:
http://git.free-electrons.com/users/thomas-petazzoni/buildroot/commit/?h=qt5&id=7c841620816f18bb4547bc905aa3255c7cb967b5

Or did I miss something?

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
#44 lore raw

PATCH 1/1 qt5jsbackend: Remove dependency on bz2 module

Quoted 10 lines · Thomas Petazzoni

Dear Arnout Vandecappelle (Essensium/Mind),

Quoted 6 lines · Arnout Vandecappelle (Essensium/Mind)

From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>

The Python bz2 module is only needed in certain cases, so only import it when needed. In the normal qt5jsbackend build, this allows to remove the dependency on this module.

Quoted 5 lines
Quoted 2 lines

Hum, thanks but my Qt5 branch already has a similar patch:
http://git.free-electrons.com/users/thomas-petazzoni/buildroot/commit/?h=qt5&id=7c841620816f18bb4547bc905aa3255c7cb967b5

Yeah, sorry, since you hadn't pushed I was still working against the
older version of your patch - and I didn't actually look at the mail I was replying to :-)

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
#45 lore raw

PATCH v3 27/32 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
index 8a4ed53..ff98b9e 100644
@@ -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
new file mode 100644
index 0000000..f862b94
@@ -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
#46 lore raw

PATCH v3 28/32 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
index ff98b9e..59234dd 100644
@@ -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
new file mode 100644
index 0000000..859cd5a
@@ -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
new file mode 100644
index 0000000..c4b7231
@@ -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
#47 lore raw

PATCH v3 29/32 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
index 59234dd..e8e581c 100644
@@ -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
new file mode 100644
index 0000000..9065f87
@@ -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
#48 lore raw

PATCH v3 30/32 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
index e8e581c..0db6c45 100644
@@ -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
new file mode 100644
index 0000000..0267c59
@@ -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
#49 lore raw

PATCH v3 31/32 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
index 0db6c45..5662f55 100644
@@ -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
new file mode 100644
index 0000000..17ee3ab
@@ -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
#50 lore raw

PATCH v3 32/32 qt5webkit: add EGL dir to includepath

In reply to Thomas Petazzoni

From: 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
new file mode 100644
index 0000000..de5bcff
@@ -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
#51 lore raw

v3 cover Add Qt5 packages

In reply to Thomas Petazzoni
Quoted 3 lines · Thomas Petazzoni

The patches are also available from:

http://git.free-electrons.com/users/thomas-petazzoni/buildroot/log/?h=qt5

It looks like they're not available there... Did you push?

BTW it would be convenient to have a git URL there.

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
#52 lore raw

v3 cover Add Qt5 packages

Dear Arnout Vandecappelle,

Quoted 6 lines · Arnout Vandecappelle
Quoted 3 lines · Thomas Petazzoni

The patches are also available from:

http://git.free-electrons.com/users/thomas-petazzoni/buildroot/log/?h=qt5

It looks like they're not available there... Did you push?

I have now pushed an updated branch, rebased on top of master.

Quoted 1 line

BTW it would be convenient to have a git URL there.

git://git.free-electrons.com/users/thomas-petazzoni/buildroot.git qt5

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