From ef5f5d912da50e43015de0e7fecb482a7cd4a2fd Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 21 Jun 2018 19:34:01 +0000 Subject: qt5: upgrade to 5.11.1 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtmultimedia_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-qt/qt5/qtmultimedia_git.bb') 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 CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.11 -# 5.11.meta-qt5.3 +# 5.11.meta-qt5.4 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " @@ -37,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 = "b39c391853245f8293d19431541eab20d78b8678" +SRCREV = "dfefe794b9d87fd04c9a529e1ca0aa1d18d44ddd" -- cgit v1.2.3-54-g00ecf