summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtmultimedia_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-06-21 19:34:01 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-06-22 14:35:29 +0000
commitef5f5d912da50e43015de0e7fecb482a7cd4a2fd (patch)
tree8f89fe21421a93ffd0141c5743d1cd67d4961bcd /recipes-qt/qt5/qtmultimedia_git.bb
parent820f3ef827b874340e9e42000657a110c9a99440 (diff)
downloadmeta-qt5-ef5f5d912da50e43015de0e7fecb482a7cd4a2fd.tar.gz
qt5: upgrade to 5.11.1
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.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index deb193f9..69ca00e7 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
28CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" 28CXXFLAGS += "${@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.11 30# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.11
31# 5.11.meta-qt5.3 31# 5.11.meta-qt5.4
32SRC_URI += "\ 32SRC_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/
38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
39 39
40SRCREV = "b39c391853245f8293d19431541eab20d78b8678" 40SRCREV = "dfefe794b9d87fd04c9a529e1ca0aa1d18d44ddd"