Skip to contentSkip to conversation

More Qt5 stuff

PATCH New Thomas Petazzoni 3 participants 30 messages Apr 7, 2013 – Apr 11, 2013

lore
Share & tools
lore
#0 lore raw

v5 cover More Qt5 stuff

Hello,

Here is a set of patches that add more Qt5 support in Buildroot. I have built a number of different combinations, but there are some many different possibilities, that I obviously couldn't test all of them. Some testing will be appreciated, but for sure, only the autobuilders will really help in getting a good build coverage of all this.

Changes v4 -> v5:

* Add some support for static libraries build and installation.
* Add some missing OpenGL ES dependencies.
* Improve the qmake.conf to specify a INCLUDEPATH directive that is needed to properly build certain external Qt5 modules.
* Rebased on top of master.

Changes v3 -> v4:

* Rebased on top of master (and therefore removed all the patches that have already been merged)
* Removed the OpenSSL Qt5 specific option, and automatically enable OpenSSL support when the package is available. Requested by Peter Korsgaard.
* Make Qt4 and Qt5 mutually exclusive. Suggested by Arnout Vandecappelle.

Changes v2 -> v3:

* Drop patches that have been merged upstream.
* Fix the xcb-util package to depend on libxcb.
* Fix the xcb-util-wm package to depend on libxcb.
* Bump the version of Qt5 to 5.0.1 (instead of 5.0.0)
* Add patch from Floris Bos to fix Qt5Webkit build with an OpenGLES backend.
* Fix QT5_BASE -> QT5BASE, noticed by Lionel Orry.
* Add missing "depends on" in Qt5Quick, Qt5Multimedia and Qt5GraphicalEffects. They all select Qt5Declarative, which itself depends on the availability of an OpenGLES backend.

Changes v1 -> v2:

* Make the package that depended on host-jpeg depend on host-libjpeg directly, so that we don't need to provide a virtual host-jpeg package.
* Integrated patches from Floris Bos to fix issues related RPi OpenGLES/EGL libraries, and to get the installation of fonts done by the qt5base package.
* pcre: fixed typo is -> if in commit log [Gustavo Zacarias]
* pcre: fix help text in Config.in [Gustavo Zacarias]

The patches are also available from:

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

Best regards,

Thomas

Floris Bos (1):
qt5webkit: add EGL dir to includepath

Thomas Petazzoni (13):
qt5: disallow the selection of Qt4 and Qt5
qt5base: support static library building
qt5base: adjust linux-buildroot-g++ qmake.conf
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/qt5webkit: new package
qt5/qt5quick1: new package

 package/qt5/Config.in                              |   11 ++++
 package/qt5/qt5base/qt5base-mkspecs-files.patch    |   24 +++++----
 package/qt5/qt5base/qt5base.mk                     |   21 ++++++--
 package/qt5/qt5declarative/Config.in               |   18 +++++++
 package/qt5/qt5declarative/qt5declarative.mk       |   54 ++++++++++++++++++++
 package/qt5/qt5graphicaleffects/Config.in          |   16 ++++++
 .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk |   40 +++++++++++++++
 package/qt5/qt5imageformats/Config.in              |   10 ++++
 package/qt5/qt5imageformats/qt5imageformats.mk     |   41 +++++++++++++++
 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           |   43 ++++++++++++++++
 package/qt5/qt5multimedia/Config.in                |   16 ++++++
 package/qt5/qt5multimedia/qt5multimedia.mk         |   49 ++++++++++++++++++
 package/qt5/qt5quick1/Config.in                    |   22 ++++++++
 package/qt5/qt5quick1/qt5quick1.mk                 |   45 ++++++++++++++++
 package/qt5/qt5script/Config.in                    |   10 ++++
 package/qt5/qt5script/qt5script.mk                 |   43 ++++++++++++++++
 package/qt5/qt5svg/Config.in                       |   11 ++++
 package/qt5/qt5svg/qt5svg.mk                       |   50 ++++++++++++++++++
 package/qt5/qt5webkit/Config.in                    |   14 +++++
 .../qt5/qt5webkit/qt5webkit-egl-includepath.patch  |   40 +++++++++++++++
 package/qt5/qt5webkit/qt5webkit.mk                 |   43 ++++++++++++++++
 package/qt5/qt5xmlpatterns/Config.in               |   10 ++++
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk       |   43 ++++++++++++++++
 26 files changed, 732 insertions(+), 14 deletions(-)
 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
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v5 1/14 qt5: disallow the selection of Qt4 and Qt5

As noticed by Arnout, Qt4 and Qt5 cannot be installed together, because for example the qt.conf installed by one version cannot be understood by the qmake of another version. We therefore make them mutually exclusive, which sounds reasonable for the embedded systems targeted by Buildroot.

---
 package/qt5/Config.in |    1 +
 1 file changed, 1 insertion(+)
package/qt5/Config.in +1 -0
index 1c9f8a6..9e9104a 100644
@@ -7,6 +7,7 @@ menuconfig BR2_PACKAGE_QT5
 	depends on BR2_USE_WCHAR
 	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_PACKAGE_QT
 	help
 	  This option enables the Qt5 framework. Sub-options allow to
 	  select which modules should be built.
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH v5 1/14 qt5: disallow the selection of Qt4 and Qt5

Quoted 7 lines · Thomas Petazzoni

As noticed by Arnout, Qt4 and Qt5 cannot be installed together, because for example the qt.conf installed by one version cannot be understood by the qmake of another version. We therefore make them mutually exclusive, which sounds reasonable for the embedded systems targeted by Buildroot.

Regards,
Arnout

Quoted 17 lines
---
  package/qt5/Config.in |    1 +
  1 file changed, 1 insertion(+)
package/qt5/Config.in +1 -0
index 1c9f8a6..9e9104a 100644
@@ -7,6 +7,7 @@ menuconfig BR2_PACKAGE_QT5
  	depends on BR2_USE_WCHAR
  	depends on BR2_INET_IPV6
  	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_PACKAGE_QT
  	help
  	  This option enables the Qt5 framework. Sub-options allow to
  	  select which modules should be built.
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#3 lore raw

PATCH v5 1/14 qt5: disallow the selection of Qt4 and Qt5

In reply to Thomas Petazzoni
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

Thomas> As noticed by Arnout, Qt4 and Qt5 cannot be installed together, Thomas> because for example the qt.conf installed by one version cannot be Thomas> understood by the qmake of another version. We therefore make them Thomas> mutually exclusive, which sounds reasonable for the embedded systems Thomas> targeted by Buildroot.

Committed, thanks.

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

PATCH v5 2/14 qt5base: support static library building

In reply to Thomas Petazzoni
---
 package/qt5/qt5base/qt5base.mk |   14 ++++++++++++++
 1 file changed, 14 insertions(+)
package/qt5/qt5base/qt5base.mk +14 -0
index d22ab66..0d0fb11 100644
@@ -37,6 +37,14 @@ else
 QT5BASE_CONFIGURE_OPTS += -release
 endif
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+QT5BASE_CONFIGURE_OPTS += -static
+else
+# We apparently can't build both the shared and static variants of the
+# library.
+QT5BASE_CONFIGURE_OPTS += -shared
+endif
+
 ifeq ($(BR2_LARGEFILE),y)
 QT5BASE_CONFIGURE_OPTS += -largefile
 else
@@ -179,10 +187,16 @@ define QT5BASE_INSTALL_TARGET_FONTS
 	fi
 endef
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+define QT5BASE_INSTALL_TARGET_CMDS
+	$(QT5BASE_INSTALL_TARGET_FONTS)
+endef
+else
 define QT5BASE_INSTALL_TARGET_CMDS
 	$(QT5BASE_INSTALL_TARGET_LIBS)
 	$(QT5BASE_INSTALL_TARGET_PLUGINS)
 	$(QT5BASE_INSTALL_TARGET_FONTS)
 endef
+endif
 
 $(eval $(generic-package))
Signature · 1 line
1.7.9.5
#5 lore raw

PATCH v5 2/14 qt5base: support static library building

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

PATCH v5 3/14 qt5base: adjust linux-buildroot-g++ qmake.conf

In reply to Thomas Petazzoni

In order for qmake to generate correct moc command lines, we need to make sure INCLUDEPATH contains $(STAGING_DIR)/usr/include. To do so, we add a new line in our custom qmake.conf.

Also, in order to clearly identify the Buildroot specific variables from the qmake standard variables, we prefix all the custom Buildroot variables by BUILDROOT_ in qmake.conf.

This solves compilation issues of qt5svg such as "Undefined interface", due to the fact that moc isn't passed a -I path pointing to the main header directory.

---
 package/qt5/qt5base/qt5base-mkspecs-files.patch |   24 ++++++++++++-----------
 package/qt5/qt5base/qt5base.mk                  |    7 ++++---
 2 files changed, 17 insertions(+), 14 deletions(-)
package/qt5/qt5base/qt5base-mkspecs-files.patch +13 -11
index d5827f6..bfa9c15 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,41 @@
+@@ -0,0 +1,43 @@
 +MAKEFILE_GENERATOR      = UNIX
 +CONFIG                  += incremental gdb_dwarf_index
 +QMAKE_INCREMENTAL_STYLE = sublib
@@ -27,25 +27,27 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
 +
 +QT_QPA_DEFAULT_PLATFORM = eglfs
 +
-+CROSS_COMPILE =
-+COMPILER_CFLAGS =
-+COMPILER_CXXFLAGS =
++BUILDROOT_CROSS_COMPILE =
++BUILDROOT_COMPILER_CFLAGS =
++BUILDROOT_COMPILER_CXXFLAGS =
++BUILDROOT_INCLUDE_PATH =
 +
 +# modifications to g++.conf
-+QMAKE_CC                = $${CROSS_COMPILE}gcc
-+QMAKE_CXX               = $${CROSS_COMPILE}g++
++QMAKE_CC                = $${BUILDROOT_CROSS_COMPILE}gcc
++QMAKE_CXX               = $${BUILDROOT_CROSS_COMPILE}g++
 +QMAKE_LINK              = $${QMAKE_CXX}
 +QMAKE_LINK_SHLIB        = $${QMAKE_CXX}
 +
 +# modifications to linux.conf
-+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
-+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
-+QMAKE_STRIP             = $${CROSS_COMPILE}strip
++QMAKE_AR                = $${BUILDROOT_CROSS_COMPILE}ar cqs
++QMAKE_OBJCOPY           = $${BUILDROOT_CROSS_COMPILE}objcopy
++QMAKE_STRIP             = $${BUILDROOT_CROSS_COMPILE}strip
 +
 +#modifications to gcc-base.conf
-+QMAKE_CFLAGS           += $${COMPILER_CFLAGS}
-+QMAKE_CXXFLAGS         += $${COMPILER_CXXFLAGS}
++QMAKE_CFLAGS           += $${BUILDROOT_COMPILER_CFLAGS}
++QMAKE_CXXFLAGS         += $${BUILDROOT_COMPILER_CXXFLAGS}
 +QMAKE_CXXFLAGS_RELEASE += -O3
++INCLUDEPATH            += $${BUILDROOT_INCLUDE_PATH}
 +
 +QMAKE_LIBS             += -lrt -lpthread -ldl
 +
package/qt5/qt5base/qt5base.mk +4 -3
index 0d0fb11..303d255 100644
@@ -134,9 +134,10 @@ define QT5BASE_CONFIG_SET
 endef
 
 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,BUILDROOT_CROSS_COMPILE,$(TARGET_CROSS))
+	$(call QT5BASE_CONFIG_SET,BUILDROOT_COMPILER_CFLAGS,$(TARGET_CFLAGS))
+	$(call QT5BASE_CONFIG_SET,BUILDROOT_COMPILER_CXXFLAGS,$(TARGET_CXXFLAGS))
+	$(call QT5BASE_CONFIG_SET,BUILDROOT_INCLUDE_PATH,$(STAGING_DIR)/usr/include)
 	$(call QT5BASE_CONFIG_SET,EGLFS_PLATFORM_HOOKS_SOURCES, \
 		$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES))
 	(cd $(@D); \
Signature · 1 line
1.7.9.5
#7 lore raw

PATCH v5 3/14 qt5base: adjust linux-buildroot-g++ qmake.conf

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

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

Thomas> In order for qmake to generate correct moc command lines, we need to Thomas> make sure INCLUDEPATH contains $(STAGING_DIR)/usr/include. To do so, Thomas> we add a new line in our custom qmake.conf.

Thomas> Also, in order to clearly identify the Buildroot specific variables Thomas> from the qmake standard variables, we prefix all the custom Buildroot Thomas> variables by BUILDROOT_ in qmake.conf.

Thomas> This solves compilation issues of qt5svg such as "Undefined Thomas> interface", due to the fact that moc isn't passed a -I path pointing Thomas> to the main header directory.

Committed, thanks.

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

PATCH v5 4/14 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 |   50 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 package/qt5/qt5svg/Config.in
 create mode 100644 package/qt5/qt5svg/qt5svg.mk
package/qt5/Config.in +1 -0
index 9e9104a..f0585ab 100644
@@ -16,4 +16,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 +50 -0

50 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#9 lore raw

PATCH v5 4/14 qt5/qt5svg: new package

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

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

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

Committed, thanks.

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

PATCH v5 5/14 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 |   43 ++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 package/qt5/qt5script/Config.in
 create mode 100644 package/qt5/qt5script/qt5script.mk
package/qt5/Config.in +1 -0
index f0585ab..01bedfd 100644
@@ -16,5 +16,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 +43 -0

43 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#11 lore raw

PATCH v5 5/14 qt5/qt5script: 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
#12 lore raw

PATCH v5 6/14 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 |   41 ++++++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 package/qt5/qt5imageformats/Config.in
 create mode 100644 package/qt5/qt5imageformats/qt5imageformats.mk
package/qt5/Config.in +1 -0
index 01bedfd..b90c6e8 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/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 +41 -0

41 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#13 lore raw

PATCH v5 6/14 qt5/qt5imageformats: 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
#14 lore raw

PATCH v5 7/14 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 |   43 ++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 package/qt5/qt5xmlpatterns/Config.in
 create mode 100644 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
package/qt5/Config.in +1 -0
index b90c6e8..84efa89 100644
@@ -19,4 +19,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 +43 -0

43 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#15 lore raw

PATCH v5 7/14 qt5/qt5xmlpatterns: 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
#16 lore raw

PATCH v5 8/14 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           |   43 ++++++++++++++++++++
 5 files changed, 116 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 84efa89..e149706 100644
@@ -17,6 +17,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 +43 -0

43 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#17 lore raw

PATCH v5 8/14 qt5/qt5jsbackend: 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
#18 lore raw

PATCH v5 9/14 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 |   54 ++++++++++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 package/qt5/qt5declarative/Config.in
 create mode 100644 package/qt5/qt5declarative/qt5declarative.mk
package/qt5/Config.in +1 -0
index e149706..089e29b 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/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 +54 -0

54 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#19 lore raw

PATCH v5 9/14 qt5/qt5declarative: 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
#20 lore raw

PATCH v5 10/14 qt5/qt5graphicaleffects: new package

In reply to Thomas Petazzoni
---
 package/qt5/Config.in                              |    1 +
 package/qt5/qt5graphicaleffects/Config.in          |   16 ++++++++
 .../qt5/qt5graphicaleffects/qt5graphicaleffects.mk |   40 ++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 package/qt5/qt5graphicaleffects/Config.in
 create mode 100644 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
package/qt5/Config.in +1 -0
index 089e29b..fe85ee6 100644
@@ -17,6 +17,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 +16 -0
new file mode 100644
index 0000000..9a32bc7
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_QT5GRAPHICALEFFECTS
+	bool "qt5graphicaleffects"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5DECLARATIVE
+	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 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
#21 lore raw

PATCH v5 10/14 qt5/qt5graphicaleffects: 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
#22 lore raw

PATCH v5 11/14 qt5/qt5multimedia: new package

In reply to Thomas Petazzoni
---
 package/qt5/Config.in                      |    1 +
 package/qt5/qt5multimedia/Config.in        |   16 +++++++++
 package/qt5/qt5multimedia/qt5multimedia.mk |   49 ++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 package/qt5/qt5multimedia/Config.in
 create mode 100644 package/qt5/qt5multimedia/qt5multimedia.mk
package/qt5/Config.in +1 -0
index fe85ee6..7dff33f 100644
@@ -20,6 +20,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 +16 -0
new file mode 100644
index 0000000..fd36672
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_QT5MULTIMEDIA
+	bool "qt5multimedia"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5DECLARATIVE
+	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 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 +49 -0

49 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#23 lore raw

PATCH v5 11/14 qt5/qt5multimedia: 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
#24 lore raw

PATCH v5 12/14 qt5/qt5webkit: new package

In reply to Thomas Petazzoni
---
 package/qt5/Config.in              |    1 +
 package/qt5/qt5webkit/Config.in    |   14 ++++++++++++
 package/qt5/qt5webkit/qt5webkit.mk |   43 ++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 package/qt5/qt5webkit/Config.in
 create mode 100644 package/qt5/qt5webkit/qt5webkit.mk
package/qt5/Config.in +1 -0
index 7dff33f..e328b0e 100644
@@ -23,5 +23,6 @@ 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/qt5webkit/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
 endif
package/qt5/qt5webkit/Config.in new file +14 -0
new file mode 100644
index 0000000..319d84a
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_QT5WEBKIT
+	bool "qt5webkit"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_ICU
+	select BR2_PACKAGE_SQLITE
+	# This module does not support static linking
+	depends on !BR2_PREFER_STATIC_LIB
+	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
#25 lore raw

PATCH v5 12/14 qt5/qt5webkit: 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
#26 lore raw

PATCH v5 13/14 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
#28 lore raw

PATCH v5 14/14 qt5/qt5quick1: new package

In reply to Thomas Petazzoni
---
 package/qt5/Config.in              |    1 +
 package/qt5/qt5quick1/Config.in    |   22 ++++++++++++++++++
 package/qt5/qt5quick1/qt5quick1.mk |   45 ++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 package/qt5/qt5quick1/Config.in
 create mode 100644 package/qt5/qt5quick1/qt5quick1.mk
package/qt5/Config.in +1 -0
index e328b0e..2945d96 100644
@@ -21,6 +21,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/qt5webkit/Config.in"
package/qt5/qt5quick1/Config.in new file +22 -0
new file mode 100644
index 0000000..99fd5a4
@@ -0,0 +1,22 @@
+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
+	# This module does not support static linking
+	depends on !BR2_PREFER_STATIC_LIB
+	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 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
#29 lore raw

PATCH v5 14/14 qt5/qt5quick1: 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