diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-12 13:04:09 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-13 09:05:12 +0000 |
| commit | f48752cc10266ffedee451813ceceec3e67c167f (patch) | |
| tree | 35e442075f13781e49d9eb1dcfea17bcfde63ce9 /recipes-qt/qt5/qtmultimedia_git.bb | |
| parent | 4e7ba65ba6ad4f88683701428aba037f2091fafc (diff) | |
| download | meta-qt5-f48752cc10266ffedee451813ceceec3e67c167f.tar.gz | |
qt5: upgrade to 5.9.5
* use latest revision from 5.9, because 5.9.5 tag is only on 5.9.5
branch which might get removed in future I was told
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 f0ac4834..0268c87a 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
| @@ -26,7 +26,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | |||
| 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.9 |
| 29 | # 5.9.meta-qt5.4 | 29 | # 5.9.meta-qt5.5 |
| 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 | " |
| @@ -35,4 +35,4 @@ SRC_URI += "\ | |||
| 35 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 35 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
| 36 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 36 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 37 | 37 | ||
| 38 | SRCREV = "d83467be15486090ee23709dc325c2c28d34c0cd" | 38 | SRCREV = "01fd723848fd6007b03c27edd85d8e9c6b6ce881" |
