diff options
author | Michal Klocek <michal.klocek@qt.io> | 2017-08-31 13:29:09 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-11-23 08:40:06 +0000 |
commit | aa143d8b7f605b9099f7195097cf83c2fa6179c9 (patch) | |
tree | 475c870a4120d040d046d259cf9fadc3151b6b18 | |
parent | 0ffe06cb808b1d321c55ff58c7f1184d6d3465fe (diff) | |
download | meta-qt5-aa143d8b7f605b9099f7195097cf83c2fa6179c9.tar.gz |
Add nss dependency for qtwebengine
Add missing native dependencies
Task-number: QTBUG-62891
Change-Id: Iaa6daf2803039774879b9962aa86d277cb160b1a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index deef5737..5aa15af5 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -13,12 +13,15 @@ LIC_FILES_CHKSUM = " \ | |||
13 | " | 13 | " |
14 | 14 | ||
15 | DEPENDS += " \ | 15 | DEPENDS += " \ |
16 | libpng-native \ | ||
17 | nss-native \ | ||
18 | nspr-native \ | ||
16 | ninja-native \ | 19 | ninja-native \ |
17 | yasm-native \ | 20 | yasm-native \ |
18 | qtwebchannel \ | 21 | qtwebchannel \ |
19 | qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtquickcontrols2 \ | 22 | qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtquickcontrols2 \ |
20 | qtlocation \ | 23 | qtlocation \ |
21 | libdrm fontconfig pixman openssl pango cairo icu pciutils \ | 24 | libdrm fontconfig pixman openssl pango cairo icu pciutils nss \ |
22 | libcap \ | 25 | libcap \ |
23 | gperf-native \ | 26 | gperf-native \ |
24 | ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ | 27 | ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ |
@@ -43,7 +46,7 @@ SECURITY_STRINGFORMAT = "" | |||
43 | 46 | ||
44 | # To use system ffmpeg you need to enable also libwebp, opus, vpx | 47 | # To use system ffmpeg you need to enable also libwebp, opus, vpx |
45 | # Only depenedencies available in oe-core are enabled by default | 48 | # Only depenedencies available in oe-core are enabled by default |
46 | PACKAGECONFIG ??= "libwebp flac libevent libxslt speex nss" | 49 | PACKAGECONFIG ??= "libwebp flac libevent libxslt speex" |
47 | PACKAGECONFIG[opus] = "WEBENGINE_CONFIG+=use_system_opus,,libopus" | 50 | PACKAGECONFIG[opus] = "WEBENGINE_CONFIG+=use_system_opus,,libopus" |
48 | PACKAGECONFIG[icu] = "WEBENGINE_CONFIG+=use_system_icu,,icu" | 51 | PACKAGECONFIG[icu] = "WEBENGINE_CONFIG+=use_system_icu,,icu" |
49 | PACKAGECONFIG[ffmpeg] = "WEBENGINE_CONFIG+=use_system_ffmpeg,,libav" | 52 | PACKAGECONFIG[ffmpeg] = "WEBENGINE_CONFIG+=use_system_ffmpeg,,libav" |
@@ -54,7 +57,6 @@ PACKAGECONFIG[libxslt] = "WEBENGINE_CONFIG+=use_system_libxslt,,libxslt" | |||
54 | PACKAGECONFIG[speex] = "WEBENGINE_CONFIG+=use_system_speex,,speex" | 57 | PACKAGECONFIG[speex] = "WEBENGINE_CONFIG+=use_system_speex,,speex" |
55 | PACKAGECONFIG[vpx] = "WEBENGINE_CONFIG+=use_system_vpx,,libvpx" | 58 | PACKAGECONFIG[vpx] = "WEBENGINE_CONFIG+=use_system_vpx,,libvpx" |
56 | PACKAGECONFIG[webrtc] = "WEBENGINE_CONFIG+=use_webrtc,,libvpx" | 59 | PACKAGECONFIG[webrtc] = "WEBENGINE_CONFIG+=use_webrtc,,libvpx" |
57 | PACKAGECONFIG[nss] = "WEBENGINE_CONFIG+=use_nss,,nss" | ||
58 | 60 | ||
59 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 61 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
60 | 62 | ||