diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-22 14:51:05 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-20 10:06:37 +0000 |
| commit | f33be06035faaa59cee17e5a97e82d079b4ab444 (patch) | |
| tree | 79d1a995808932b7e9fae144e2b13ddb0b4908a2 /recipes-qt/qt5/qtmultimedia_git.bb | |
| parent | c7549747b6e83e9630ae37c7e2595e41e4f1ebac (diff) | |
qt5: upgrade to 5.11 Alpha
* use qtwebkit and qtwebkit-examples from dev branch, because there is
no 5.11 branch (there isn't 5.10 as well, but because nobranch=1 in
qt5-git.inc nobody noticed).
* qtbase: drop qml-debug options
removed from qtbase in:
commit 525f8516c2580018f910cfb99ab5e0e36bd55ab1
Author: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri Oct 6 16:27:09 2017 +0200
Subject: Remove qml-debug configure flag and feature
* qtgraphicaleffects, qtquickcontrols2, qtquickcontrols,
qtvirtualkeyboard: add qtdeclarative-native dependency
needed for qmlcachegen binary
* qtwebkit: update LIC_FILES_CHKSUM and remove PACKAGECONFIGs
referenced files disappered in:
commit 6882a04fb36642862b11efe514251d32070c3d65
Author: Konstantin Tokarev <annulen@yandex.ru>
Date: Thu Aug 25 19:20:41 2016 +0300
Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index efe848f0..519e76bb 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -26,8 +26,9 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" -# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.10 -# 5.10.meta-qt5.2 + +# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.11 +# 5.11.meta-qt5.1 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " @@ -36,4 +37,4 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "038716bb1f2d9b95f2d638e2d61d297563343af9" +SRCREV = "0354fdda8b430f7749082ca55ad6c1dc781f3918" |