diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-31 11:40:30 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-31 15:26:55 +0000 |
| commit | 81156172a83da2210e9af290f95f45fd194c84a2 (patch) | |
| tree | 1026e1a48d6ac51358cec65c1a8552eb1d5c77a7 /recipes-qt/qt5/qtmultimedia_git.bb | |
| parent | 267e64612558cd562a63925e07e3e87e976a8a44 (diff) | |
| download | meta-qt5-81156172a83da2210e9af290f95f45fd194c84a2.tar.gz | |
qt5: Upgrade to Qt 5.13.2
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index b24f2a4c..11b53496 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
| @@ -27,8 +27,8 @@ EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstream | |||
| 27 | 27 | ||
| 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.13 |
| 31 | # 5.12.meta-qt5.3 | 31 | # 5.13.meta-qt5.1 |
| 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 = "f5c4fdd1f57bfbcb0a286ca10de5f6d5d0e47047" | 40 | SRCREV = "dce51b45e8d50ad37fea3debb51a84d62e944b5d" |