From 808d65c129d283850fa6c1e887dd01f8ee86b64b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 18 Dec 2018 20:07:53 +0000 Subject: qt5: refresh .patch files, meta-qt5/qt* repos and their tags in recipes * in preparation for rebase on 5.12 #136 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 a7849f69..ba7d1543 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.5 +# 5.11.meta-qt5.6 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " -- cgit v1.2.3