diff options
Diffstat (limited to 'external/meta-qt5/recipes-qt/qt5/qtmultimedia_git.bb')
| -rw-r--r-- | external/meta-qt5/recipes-qt/qt5/qtmultimedia_git.bb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/external/meta-qt5/recipes-qt/qt5/qtmultimedia_git.bb b/external/meta-qt5/recipes-qt/qt5/qtmultimedia_git.bb index ba7d1543..768ce189 100644 --- a/external/meta-qt5/recipes-qt/qt5/qtmultimedia_git.bb +++ b/external/meta-qt5/recipes-qt/qt5/qtmultimedia_git.bb @@ -12,7 +12,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ +PACKAGECONFIG ??= "gstreamer \ + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" @@ -27,8 +28,8 @@ EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstream CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" -# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.11 -# 5.11.meta-qt5.6 +# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.14 +# 5.14.meta-qt5.1 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " @@ -37,4 +38,4 @@ 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 = "6966a09c9a6a2c134a739446cc582e47d0c6ed6d" +SRCREV = "c012f0a727144714f9480e98938ca8eb2137c213" |