From f9e80edff01159375b6e03f3cb9ea1f8ed5ced79 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 Sep 2018 08:37:18 +0000 Subject: qt5: update to latest revision in 5.11 branch * drop nobranch=1 again * update the branches and tags on meta-qt5/qt* forks and the tag name in recipes * use latest revision in 5.11 branch instead of 5.11.2 which might be removed again 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 03e8bc29..e057030e 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.4 +# 5.11.meta-qt5.5 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 = "320a109d19a515eec370761c8ccb0a83d4e1de2f" +SRCREV = "2c5efb49495e31afa399a1c1ea003a9b630ba113" -- cgit v1.2.3