diff options
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 316ee622..978416fe 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.9 -# 5.9.meta-qt5.7 +# 5.9.meta-qt5.8 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " @@ -35,4 +35,7 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "2a3c5de691ae25ca37b91cd54bacddb8187ba52f" +# Use 2c22b9c106aee7df19c06f764b25f82ce844121a +# instead of b0df68530506e2b3b17365f07711d80dda6ff44c because +# v5.9.8 tag wasn't merged to 5.9 branch yet +SRCREV = "2c22b9c106aee7df19c06f764b25f82ce844121a" |