diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-17 23:32:56 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-18 23:04:41 +0000 |
| commit | e2707a016c3475c167a421c9c73d88f81cc61bd1 (patch) | |
| tree | e4bae2a878e4c97496dcd536af717f093c9579f2 /recipes-qt/qt5/qtmultimedia_git.bb | |
| parent | 07784245c1822766d54405d835ac2dc08652df1a (diff) | |
| download | meta-qt5-e2707a016c3475c167a421c9c73d88f81cc61bd1.tar.gz | |
qt5: upgrade to 5.12.3
* be aware that in 3 qt* project the v5.12.3 tag wasn't created yet:
qtknx_git.bb:# v5.12.3 tag wasn't created yet
qtmqtt_git.bb:# v5.12.3 tag wasn't created yet
qtopcua_git.bb:# v5.12.3 tag wasn't created yet
* and qttools, qt3d, qtremoteobjects v5.12.3 tag isn't in 5.12 branch
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 9c2cf501..30f9c9e4 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
| @@ -28,7 +28,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstream | |||
| 28 | CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" | 28 | CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" |
| 29 | 29 | ||
| 30 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.12 | 30 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.12 |
| 31 | # 5.12.meta-qt5.2 | 31 | # 5.12.meta-qt5.3 |
| 32 | SRC_URI += "\ | 32 | SRC_URI += "\ |
| 33 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ | 33 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ |
| 34 | " | 34 | " |
| @@ -37,4 +37,4 @@ SRC_URI += "\ | |||
| 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
| 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 39 | 39 | ||
| 40 | SRCREV = "9caf4812e073829fc961eb466f1325106f041841" | 40 | SRCREV = "64981aee3bbbe2c4f5503b458636a84df822b0ec" |
