diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 72 |
1 files changed, 32 insertions, 40 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 50a98b66..f88e5e7d 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -13,26 +13,23 @@ LIC_FILES_CHKSUM = " \ " DEPENDS += " \ + libpng-native \ + nss-native \ + nspr-native \ ninja-native \ yasm-native \ qtwebchannel \ qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtquickcontrols2 \ qtlocation \ - libdrm fontconfig pixman openssl pango cairo icu pciutils \ + libdrm fontconfig pixman openssl pango cairo icu pciutils nss \ libcap \ gperf-native \ ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ " -DEPENDS += "yasm-native" DEPENDS_append_libc-musl = " libexecinfo" -EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm \ - GYP_CONFIG+=generate_character_data=0 \ - GYP_CONFIG+=use_allocator=none \ - GYP_CONFIG+=use_experimental_allocator_shim=false \ -" -EXTRA_QMAKEVARS_CONFIGURE += "-feature-system-ninja -no-feature-system-gn" +EXTRA_QMAKEVARS_CONFIGURE += "-feature-webengine-system-ninja -no-feature-webengine-system-gn" # chromium/third_party/openh264/openh264.gyp adds # -Wno-format to openh264_cflags_add @@ -42,22 +39,26 @@ EXTRA_QMAKEVARS_CONFIGURE += "-feature-system-ninja -no-feature-system-gn" # http://errors.yoctoproject.org/Errors/Details/150333/ SECURITY_STRINGFORMAT = "" -# To use system ffmpeg you need to enable also libwebp, opus, vpx +# To use system ffmpeg you need to enable also libwebp, opus, vpx # Only depenedencies available in oe-core are enabled by default -PACKAGECONFIG ??= "libwebp flac libevent libxslt speex nss" -PACKAGECONFIG[opus] = "WEBENGINE_CONFIG+=use_system_opus,,libopus" -PACKAGECONFIG[icu] = "WEBENGINE_CONFIG+=use_system_icu,,icu" -PACKAGECONFIG[ffmpeg] = "WEBENGINE_CONFIG+=use_system_ffmpeg,,libav" -PACKAGECONFIG[libwebp] = "WEBENGINE_CONFIG+=use_system_libwebp,,libwebp" -PACKAGECONFIG[flac] = "WEBENGINE_CONFIG+=use_system_flac,,flac" -PACKAGECONFIG[libevent] = "WEBENGINE_CONFIG+=use_system_libevent,,libevent" -PACKAGECONFIG[libxslt] = "WEBENGINE_CONFIG+=use_system_libxslt,,libxslt" -PACKAGECONFIG[speex] = "WEBENGINE_CONFIG+=use_system_speex,,speex" -PACKAGECONFIG[vpx] = "WEBENGINE_CONFIG+=use_system_vpx,,libvpx" -PACKAGECONFIG[webrtc] = "WEBENGINE_CONFIG+=use_webrtc,,libvpx" -PACKAGECONFIG[nss] = "WEBENGINE_CONFIG+=use_nss,,nss" - -EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" +PACKAGECONFIG ??= "libwebp libevent libpng" +PACKAGECONFIG[icu] = "-feature-webengine-system-icu,-no-feature-webengine-system-icu,icu" +PACKAGECONFIG[ffmpeg] = "-feature-webengine-system-ffmpeg,-no-feature-webengine-system-ffmpeg,libav" +PACKAGECONFIG[webrtc] = "-feature-webengine-webrtc,-no-feature-webengine-webrtc,libvpx" +PACKAGECONFIG[libwebp] = "-feature-webengine-system-libwebp,-no-feature-webengine-system-libwebp,libwebp" +PACKAGECONFIG[opus] = "-feature-webengine-system-opus,-no-feature-webengine-system-opus,libopus" +PACKAGECONFIG[libvpx] = "-feature-webengine-system-libvpx,-no-feature-webengine-system-libvpx,libvpx" +PACKAGECONFIG[libevent] = "-feature-webengine-system-libevent,-no-feature-webengine-system-libevent,libevent" +PACKAGECONFIG[libpng] = "-feature-webengine-system-png,-no-feature-webengine-system-png,libpng" +PACKAGECONFIG[harfbuzz] = "-feature-webengine-system-harfbuzz,-no-feature-webengine-system-harfbuzz,harfbuzz" +PACKAGECONFIG[glib] = "-feature-webengine-system-glib,-no-feature-webengine-system-glib,glib" +PACKAGECONFIG[zlib] = "-feature-webengine-system-zlib,-no-feature-webengine-system-zlib,zlib" +PACKAGECONFIG[protobuf] = "-feature-webengine-system-protobuf,-no-feature-webengine-system-protobuf,protobuf" +PACKAGECONFIG[jasoncpp] = "-feature-webengine-system-jsoncpp,-no-feature-webengine-system-jsoncpp,jasoncpp" +PACKAGECONFIG[libxml2] = "-feature-webengine-system-libxml2,-no-feature-webengine-system-libxml2,libxml2" +PACKAGECONFIG[minizip] = "-feature-webengine-system-minizip,-no-feature-webengine-system-minizip,minizip" + +EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" COMPATIBLE_MACHINE = "(-)" COMPATIBLE_MACHINE_x86 = "(.*)" @@ -79,18 +80,10 @@ def gettext_oeconf(d): require qt5.inc require qt5-git.inc +export GN_PKG_CONFIG_HOST = "${STAGING_BINDIR_NATIVE}/pkg-config-native" +export GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS = "-I${STAGING_DIR_NATIVE}/usr/include" + do_configure() { - # Disable autodetection from sysroot: - sed -e 's/packagesExist([^)]*vpx[^)]*):/false:/g'\ - -e 's/config_libvpx:/false:/g' \ - -e 's/config_srtp:/false:/g' \ - -e 's/config_snappy:/false:/g' \ - -e 's/packagesExist(nss):/false:/g' \ - -e 's/packagesExist(minizip, zlib):/false:/g' \ - -e 's/packagesExist(libwebp,libwebpdemux):/false:/g' \ - -e 's/packagesExist(libxml-2.0,libxslt):/false:/g'\ - -e 's/^ *packagesExist($$package):/false:/g' \ - -i ${S}/mkspecs/features/configure.prf # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as # arguments here @@ -127,28 +120,27 @@ RDEPENDS_${PN}-examples += " \ qtdeclarative-qmlplugins \ " -QT_MODULE_BRANCH_CHROMIUM = "56-based" +QT_MODULE_BRANCH_CHROMIUM = "61-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 # 5.9.meta-qt5.3 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ - file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ file://0003-Include-dependency-to-QCoreApplication-translate.patch \ file://0004-Force-host-toolchain-configuration.patch \ - file://0005-tests-make-accessibility-tests-conditional.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based # 56-based.meta-qt5.2 SRC_URI += " \ - file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ file://0003-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ " SRC_URI_append_libc-musl = "\ + file://0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ + file://0006-musl-link-against-libexecinfo.patch \ file://0004-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ file://0005-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ file://0006-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ @@ -164,8 +156,8 @@ SRC_URI_append_libc-musl = "\ file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "c11c2c8981e647c1eb2c6753ce77d436b92fff87" -SRCREV_chromium = "cfe8c60903b327ac94406661350f4ac05aa8c21b" +SRCREV_qtwebengine = "efa6d3f0d3a01753dd40823ce119e7d4f9765c8e" +SRCREV_chromium = "e36dcec23b79a52fd7794ed2fad49bbf65a8146b" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" |