Commit Graph

24 Commits

Author SHA1 Message Date
Julien CORJON
59ef95fdae qt5: bump version to 5.6.0
Remove upstream committed patches (qt5base):
  - 0001-Force_egl_visual_ID_33.patch (see [1], [2])
  - 0003-xcb-egl-fixes.patch (see [3])
  - 0005-forkd-disable-eventfd-for-uclibc.patch (see [4], [5])
  - 0009-fix-eglfs-for-sunxi-mali.patch (see [6])
  - 0014-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch (see [7])

Remove MX6_WORKAROUND from qt5base.mk since we do not need to tweak
EGL visual ID to 33.

Remove upstream committed patch (qt5webchannel):
  - 0001-Fix-builds-without-qml-module.patch (see [8], [9])

Fix Qt5Enginio to 1.6.0 version (see [10])

[1] https://bugreports.qt.io/browse/QTBUG-44290
[2] https://codereview.qt-project.org/#/c/108849/
[3] https://codereview.qt-project.org/#/c/115438/
[4] https://bugreports.qt.io/browse/QTBUG-47337
[5] https://codereview.qt-project.org/#/c/121988/
[6] https://codereview.qt-project.org/#/c/125837/
[7] https://codereview.qt-project.org/#/c/126725/
[8] https://bugreports.qt.io/browse/QTBUG-47360
[9] https://codereview.qt-project.org/#/c/122086/
[10] https://bugreports.qt.io/browse/QTBUG-50111

Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-20 23:23:37 +01:00
Peter Seiderer
c2174c1ae4 qt5: bump version to 5.5.1
Reduce hash lists to strongest only (sha256).

Remove upstream committed patches (qt5base):
 - 0004-no-gold-linker-for-host-build.patch (see [1], [2])
 - 0007-big_endian-fix_destformat.patch (see [3])
 - 0008-QtGui-force-image-dir-in-include_path.patch (see [4], [5])

[1] https://bugreports.qt.io/browse/QTBUG-46125
[2] https://codereview.qt-project.org/#/c/113563/
[3] https://codereview.qt-project.org/#/c/120654/
[4] https://bugreports.qt.io/browse/QTBUG-47400
[5] https://codereview.qt-project.org/#/c/122145/

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-02-03 23:26:51 +01:00
Julien CORJON
105c23cedb qt5: bump version to 5.5.0
QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES is no longer useful since eglfs does not
depend on the device makespecs anymore. Instead, backends are autodetected by
configure [1]. We still need specifics include path for rpi eglfs support.

0008-forkd-disable-eventfd-for-uclibc.patch disable missing eventfd in new Qt
3rd party forkd for uClibc toolchains.

Remove patches commited in Qt mainline and update pending one

[1] https://codereview.qt-project.org/#/c/107548/

Passed test :
  - Full compilation on ARM/uClibc
  - Partialy compiled and tested on i.MX6/linaro with OpenGL backend
  - Partialy compiled but not executed for Raspberry Pi (rpi-userland)

Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-21 23:20:47 +02:00
Will Wagner
4668ec8a9b qt5: bump version to 5.4.1
Also remove all patches that have been applied to 5.4.1 branch

Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-04 19:39:05 +01:00
Fatih Aşıcı
1ca2171a64 qt5: update URLs to use Qt's new domain
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-02-02 22:02:57 +01:00
Fatih Aşıcı
9fff65cf1a qt5: bump to version 5.4.0
qt5base:
  - Add patches to fix uClibc build.

qt5connectivity:
  - Add patches to fix build with -no-c++11

qt5declarative:
  - Remove the line that installs accessible plugin. The functionality
    is moved into the qtquick library.

qt5webkit:
  - Remove egl patch. This should be fixed with CONFIG += egl option.

qt5websockets:
  - Remove upstreamed patch.

Changelogs: https://qt-project.org/wiki/Change-files-in-Qt-5.4.0
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-02-02 21:47:39 +01:00
Thomas Petazzoni
ff8c746aba qt5: expose a QT5_QMAKE variable for other Qt5 packages
Much like package/qt/qt.mk exposes a QT_QMAKE variable that other
qmake-based Qt4 libraries/applications can use in their .mk file, this
commit adds a QT5_QMAKE variable to allow the same for Qt5 packages.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-03 23:06:08 +01:00
Fatih Aşıcı
e91713126f qt5: bump to 5.3.2
Only use ccache prefix in QMAKE_CC and QMAKE_CXX since the build system is
broken when QMAKE_AR contains a space character.

Remove the upstreamed uClibc patch.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-16 21:04:02 +02:00
Jerzy Grzegorek
c7f4b96471 package: remove the trailing slash sign from <PKG>_SITE variable
Since the trailing slash is stripped from $($(PKG)_SITE) by pkg-generic.mk:

$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE))

so it is redundant.
This patch removes it from $(PKG)_SITE variable for BR consistency.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-31 23:17:46 +02:00
Thomas De Schampheleire
6f638ea9c9 infra: /usr support: STAGING_DIR can be outside BASE_DIR
If the user sets a custom BR2_HOST_DIR, then STAGING_DIR is not under
BASE_DIR. The .pc/.la file fixup commands incorrectly made this assumption
and thus should be corrected.

Additionally, this patch:
- rewords the comment in pkg-autotools that explains the replacements.
- removes a for statement in favor of xargs

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-07-04 15:49:59 +02:00
Thomas De Schampheleire
9580c178e5 qt5: support buildroot being located in /usr
qt5 performs sed replacements of /usr to $(STAGING_DIR)/usr in .la files.
However, if buildroot itself is located in /usr, then STAGING_DIR also
starts with /usr, and naive replacements of '/usr' can result in paths of
the form:
    /usr/buildroot/.../sysroot/usr/buildroot/.../sysroot/...

This patch makes the replacements more careful, by first replacing the known
paths BASE_DIR and STAGING_DIR to tokens, then performing the actual
replacement, and finally replacing the tokens with the corresponding paths.

Partially fixes bug #5750 (https://bugs.busybox.net/show_bug.cgi?id=5750)

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-29 12:39:57 +02:00
Fatih Aşıcı
9c169981c3 qt5: bump to 5.3.1
Remove upstreamed patch.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-27 13:08:04 +02:00
Fatih Aşıcı
6a5c818cb7 qt5: bump to 5.3.0
Remove upstreamed patches.

See http://qt-project.org/qt5/qt53 for the release information.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-27 13:27:57 +02:00
Peter Kümmel
afebed35a1 Qt5: update to 5.2.1
Removed patches are now part of the 5.2.1 release.

Signed-off-by: Peter Kümmel <syntheticpp@gmx.net>
Acked-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-03-02 21:04:50 +01:00
Jerzy Grzegorek
aa593ddbc1 package: add <pkg>_VERSION_MAJOR variable
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-19 21:37:39 +01:00
Vicente Olivert Riera
e4a839277f qt5: version bump
-bump version to 5.2.0
-remove unneeded patches
-remove invalid configure options

[Peter: uclibc-no-lfs + qatomic patches still needed, new patch for uClibc]
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-19 16:33:47 +01:00
Fatih Aşıcı
5d85af61b7 qt5: bump to 5.1.1
Following patches are removed since they are upstreamed:
  - qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
  - qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch

Remove "-nomake demos" from configure options since "demos" directory is
merged into examples.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-26 14:00:54 +02:00
Jérôme Pouiller
741cbccb74 Fix build reproducibility in Make 3.82
Make 3.82 no longer sort the result of wildcards (see
http://comments.gmane.org/gmane.comp.gnu.make.bugs/4260). This may break
build reproducibility.

This patch sort results of wildcards to ensure reproducibility.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-06 23:27:42 +02:00
Thomas Petazzoni
4ed05f0ff6 qt5: change upstream URL
The Qt5 upstream URL has changed, which leads to build failures in the
autobuilders.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-08-18 19:49:43 +02:00
Thomas Petazzoni
d6b2bac225 qt5: bump to 5.0.2
A new version of Qt5 has been released, 5.0.2, so let's use it, see
http://blog.qt.digia.com/blog/2013/04/10/qt-5-0-2-released/: "Qt 5.0.2
brings over 600 improvements compared to Qt 5.0.1, most of these in
order to address the issues Qt users have noted when bringing their
applications to Qt 5.".

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-15 23:47:04 +02:00
Thomas Petazzoni
0db6298cef qt5: factor <pkg>_SITE variable
Each qt5 package was defining its own QT5<something>_SITE
variable. Unfortunately, the download location has slightly changed
for Qt 5.0.2, so we would have to change it for all packages. Instead,
we factor the <pkg>_SITE variable as QT5_SITE in package/qt5/qt5.mk,
just like we already do for QT5_VERSION.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-15 23:46:59 +02:00
Thomas Petazzoni
22c4c4b949 qt5: factor Qt5 version
Since the Qt5 version will be the same for all Qt5 modules, factor it
in qt5/qt5.mk as QT5_VERSION.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-03-24 14:42:39 +01:00
Thomas Petazzoni
1737b5648c qt5: add macro to fixup Qt5 .la and .prl files
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-03-10 22:36:59 +01:00
Thomas Petazzoni
ca249584cb qt5: base infrastructure
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-03-10 22:36:32 +01:00