diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 12:47:51 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 14:21:42 +0000 |
| commit | ce766374432309b85fdcfe8ef287dbb2ef11b337 (patch) | |
| tree | f82903a0c4d5519c6f2fb8e1a83758dc6e450705 /recipes-qt/qt5/qtmultimedia_git.bb | |
| parent | 229f819b97e653399455e7b1d491de5ea49d5ba5 (diff) | |
| download | meta-qt5-ce766374432309b85fdcfe8ef287dbb2ef11b337.tar.gz | |
qt: refresh remaining patches and tags in meta-qt5 repos
* update tag name to match the patches in meta-qt5 repository
where the meta-qt5 .patch files are maintained, so that it's
more clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 7a7e14b0..c9c36113 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
| @@ -25,8 +25,8 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | |||
| 25 | # Disable GStreamer if completely disabled | 25 | # Disable GStreamer if completely disabled |
| 26 | EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" | 26 | EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" |
| 27 | 27 | ||
| 28 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9 | 28 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.10 |
| 29 | # 5.9.meta-qt5.2 | 29 | # 5.10.meta-qt5.1 |
| 30 | SRC_URI += "\ | 30 | SRC_URI += "\ |
| 31 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ | 31 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ |
| 32 | " | 32 | " |
