diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-22 14:15:12 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-26 16:53:07 +0000 |
| commit | 1d9fbb1576846318e6f842006bf8c27758f094fb (patch) | |
| tree | 772f2b404ce6bb3c7c06bd381ccc72aa3efa741e /recipes-qt/qt5/qtmultimedia_git.bb | |
| parent | a5aadb7a92558ea33833a189cc6b6fd1019c2a5b (diff) | |
qt5: refresh patches from meta-qt5/qt* repos
* apply:
0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
also for nativesdk-qtbase as the comment says
* drop unused:
0001-Add-missing-include-for-struct-timeval.patch
which wasn't removed in 5.10.1 upgrade
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 1d4527d2..2cb1bd57 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -26,7 +26,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.10 -# 5.10.meta-qt5.1 +# 5.10.meta-qt5.2 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " |