diff options
Diffstat (limited to 'recipes-qt/qt5/qtmultimedia_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 96331422..0dccc436 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -27,8 +27,8 @@ EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstream | |||
27 | 27 | ||
28 | CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" | 28 | CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" |
29 | 29 | ||
30 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.13 | 30 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.14 |
31 | # 5.13.meta-qt5.1 | 31 | # 5.14.meta-qt5.1 |
32 | SRC_URI += "\ | 32 | SRC_URI += "\ |
33 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ | 33 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ |
34 | " | 34 | " |
@@ -37,4 +37,4 @@ SRC_URI += "\ | |||
37 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
39 | 39 | ||
40 | SRCREV = "d9f2a814eb5d8c2c0e985f60b345fefd956e2bb0" | 40 | SRCREV = "2091eac697ff6f7be03203d3180633a417c8c58c" |