diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-18 20:07:53 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 00:56:48 +0000 |
commit | 808d65c129d283850fa6c1e887dd01f8ee86b64b (patch) | |
tree | 6aaa270319d34651537cb04295398d8894617539 /recipes-qt/qt5/qtmultimedia_git.bb | |
parent | a55a9936e29b4aaaebc742d52af3b61f738d10c5 (diff) |
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ " |