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 0b0e0d12..d861b69f 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
| @@ -28,8 +28,8 @@ EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstream | |||
| 28 | 28 | ||
| 29 | CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" | 29 | CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" |
| 30 | 30 | ||
| 31 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.14 | 31 | # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.15 |
| 32 | # 5.14.meta-qt5.1 | 32 | # 5.15.meta-qt5.1 |
| 33 | SRC_URI += "\ | 33 | SRC_URI += "\ |
| 34 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ | 34 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ |
| 35 | " | 35 | " |
| @@ -38,7 +38,7 @@ SRC_URI += "\ | |||
| 38 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 38 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
| 39 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 39 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 40 | 40 | ||
| 41 | SRCREV = "541440649aac5488a8cb44f0c867095b18405c49" | 41 | SRCREV = "040378a91fee4aa1e0740e1e5d3438e652b6f2eb" |
| 42 | 42 | ||
| 43 | # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory | 43 | # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory |
| 44 | do_install_append() { | 44 | do_install_append() { |