qttranslations: add ${PN}-qtserialport
PATCH 1/7 qttranslations: add ${PN}-qtserialport
--- recipes-qt/qt5/qttranslations_git.bb | 5 +++++ 1 file changed, 5 insertions(+)
recipes-qt/qt5/qttranslations_git.bb +5 -0
@@ -26,6 +26,7 @@ PACKAGES =. " \ ${PN}-qtconfig \ ${PN}-qtquick1 \ ${PN}-qtscript \ + ${PN}-qtserialport \ ${PN}-qtbase \ ${PN}-qthelp \ ${PN}-qt \
@@ -87,6 +88,10 @@ FILES_${PN}-qtscript = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qtscript_*.qm \ " +FILES_${PN}-qtserialport = " \ + ${OE_QMAKE_PATH_TRANSLATIONS}/qtserialport_*.qm \ +" + FILES_${PN}-qtbase = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qtbase_*.qm \ "
Signature · 1 line
2.6.2
PATCH 2/7 qtwebengine: bump SRCREV and re-add 0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
* it's still needed, just somewhere else a bit
--- ...rf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 2 +- ...rf-Make-sure-we-only-use-the-file-name-to.patch | 2 +- ...s.prf-allow-build-for-linux-oe-g-platform.patch | 27 ++++++++++++++++++++++ recipes-qt/qt5/qtwebengine_git.bb | 3 ++- 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +1 -1
@@ -1,7 +1,7 @@ From 38efc016f223a1277bd3a92e4c78ac816adbcdaa Mon Sep 17 00:00:00 2001 From: Martin Jansa <[email protected]> Date: Mon, 30 Jun 2014 20:08:17 +0200 -Subject: [PATCH 1/2] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H +Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H anywhere in path, but at the end Signed-off-by: Martin Jansa <[email protected]>
recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +1 -1
@@ -1,7 +1,7 @@ From ebfec8ca32379bffd18cbab1f4335a458fcc7e41 Mon Sep 17 00:00:00 2001 From: Simon Busch <[email protected]> Date: Tue, 18 Nov 2014 10:38:18 +0100 -Subject: [PATCH 2/2] functions.prf: Make sure we only use the file name to +Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to generate it's moc'ed abbreviation Signed-off-by: Simon Busch <[email protected]>
recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch new file +27 -0
@@ -0,0 +1,27 @@ +From daf1deee393576f86b22178a7cc18717962cb68e Mon Sep 17 00:00:00 2001 +From: Frieder Schrempf <[email protected]> +Date: Mon, 1 Dec 2014 14:34:40 +0000 +Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Frieder Schrempf <[email protected]> +Signed-off-by: Martin Jansa <[email protected]> +--- + tools/qmake/mkspecs/features/functions.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf +index f761b64..ab5f018 100644 +--- a/tools/qmake/mkspecs/features/functions.prf ++++ b/tools/qmake/mkspecs/features/functions.prf +@@ -1,5 +1,5 @@ + defineTest(isPlatformSupported) { +- !linux-g++*:!linux-clang:!win32-msvc2013*:!win32-msvc2015*:!macx-clang*:!boot2qt { ++ !linux-g++*:!linux-oe-g++*:!linux-clang:!win32-msvc2013*:!win32-msvc2015*:!macx-clang*:!boot2qt { + skipBuild("Qt WebEngine can currently only be built for Linux (GCC/clang), Windows (MSVC 2013 or 2015), OS X (10.9/XCode 5.1+) or Qt for Device Creation.") + return(false) + } +-- +2.6.2 +
recipes-qt/qt5/qtwebengine_git.bb +2 -1
@@ -77,9 +77,10 @@ SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ + file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \ " -SRCREV_qtwebengine = "cfee452174c58fe4048b1604503d03de2764fc8e" +SRCREV_qtwebengine = "40ef43e0d69c4a86c9430b7f264d2cde6340ee0f" SRCREV_chromium = "ec5b3304fc266dfdec7666b8b73d57a3971ea35f" SRCREV = "${SRCREV_qtwebengine}"
Signature · 1 line
2.6.2
PATCH 3/7 qtwebengine: add dependency on libxscrnsaver with x11 in DISTRO_FEATURES
In reply to Martin Jansa* when qtbase is built with x11 support, xcb is enabled in QT_CONFIG and qtwebengine checks for libxscrnsaver.
Unfortunately such check isn't fatal for do_configure task, it will only show something like this:
libxscrnsaver wasn't found, qtwebengine won't be built
in log.do_configure and continue to do_compile and do_install (which will also finish successfully, saying "Nothing to do").
--- recipes-qt/qt5/qtwebengine_git.bb | 6 ++++++ 1 file changed, 6 insertions(+)
recipes-qt/qt5/qtwebengine_git.bb +6 -0
@@ -17,6 +17,12 @@ DEPENDS += " \ libcap \ " +# when qtbase is built with xcb enabled (default with x11 in DISTRO_FEATURES), +# qtwebengine will have additional dependencies: +# contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst +# xscreensaver isn't covered in qtbase DEPENDS +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'libxscrnsaver', '', d)}" + COMPATIBLE_MACHINE = "(-)" COMPATIBLE_MACHINE_x86 = "(.*)" COMPATIBLE_MACHINE_x86-64 = "(.*)"
Signature · 1 line
2.6.2
PATCH 4/7 qtwebengine: fix QMAKE_AR variable
In reply to Martin Jansa* OE_QMAKE_AR is only the tool, qtbase and other modules add correct
parameters to it in linux-oe-g++ platform:
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch:+QMAKE_AR = $(OE_QMAKE_AR) cqs
but here it was missing "cqs" causing following error at the end of
qtwebengine build:
i586-oe-linux-ar Release/libqtwebenginecoreapi.a .obj/qwebenginecookiestoreclient.o .obj/qwebengineurlrequestinfo.o .obj/qwebengineurlrequestjob.o .obj/qwebengineurlschemehandler.o .obj/moc_qwebenginecookiestoreclient.o .obj/moc_qwebengineurlrequestinterceptor.o .obj/moc_qwebengineurlrequestjob.o .obj/moc_qwebengineurlschemehandler.o
i586-oe-linux-ar: invalid option -- 'R'
Usage: i586-oe-linux-ar [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin <name>] [member-name] [count] archive-file file...
...
--- recipes-qt/qt5/qtwebengine_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-qt/qt5/qtwebengine_git.bb +1 -1
@@ -59,7 +59,7 @@ do_configure() { QMAKE_LINK="${OE_QMAKE_LINK}" \ QMAKE_CFLAGS="${OE_QMAKE_CFLAGS}" \ QMAKE_CXXFLAGS="${OE_QMAKE_CXXFLAGS}" \ - QMAKE_AR="${OE_QMAKE_AR}" \ + QMAKE_AR="${OE_QMAKE_AR} cqs" \ -after ${EXTRA_QMAKEVARS_POST} }
Signature · 1 line
2.6.2
PATCH 5/7 qtwebengine: add dependency on yasm-native and use it
In reply to Martin Jansa* latest chromium is failing to build yasm, because it's mixing native
(x86_64) with target (x86 qemux86) libraries during the build:
FAILED: /OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/i586-oe-linux/i586-oe-linux-g++ -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/sysroots/qemux86 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,now -Wl,-z,relro -Wl,--fatal-warnings -Wl,-z,defs -pthread -Wl,-z,noexecstack -fPIC -Wl,--disable-new-dtags -Wl,--gc-sections -o genstring -Wl,--start-group obj.host/src/3rdparty/chromium/third_party/yasm/source/patched-yasm/genstring.genstring.o -Wl,--end-group /OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/i586-oe-linux/gcc/i586-oe-linux/5.2.0/ld: i386:x86-64 architecture of input file `obj.host/src/3rdparty/chromium/third_party/yasm/source/patched-yasm/genstring.genstring.o' is incompatible with i386 output
/OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/i586-oe-linux/gcc/i586-oe-linux/5.2.0/ld: obj.host/src/3rdparty/chromium/third_party/yasm/source/patched-yasm/genstring.genstring.o: file class ELFCLASS64 incompatible with ELFCLASS32
/OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/i586-oe-linux/gcc/i586-oe-linux/5.2.0/ld: final link failed: File in wrong format
collect2: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.
Makefile.gyp_run:262: recipe for target 'invoke_ninja' failed
make[3]: *** [invoke_ninja] Error 1
--- recipes-qt/qt5/qtwebengine_git.bb | 3 +++ 1 file changed, 3 insertions(+)
recipes-qt/qt5/qtwebengine_git.bb +3 -0
@@ -23,6 +23,9 @@ DEPENDS += " \ # xscreensaver isn't covered in qtbase DEPENDS DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'libxscrnsaver', '', d)}" +DEPENDS += "yasm-native" +EXTRA_QMAKEVARS_PRE += "WEBENGINE_CONFIG+=use_system_yasm" + COMPATIBLE_MACHINE = "(-)" COMPATIBLE_MACHINE_x86 = "(.*)" COMPATIBLE_MACHINE_x86-64 = "(.*)"
Signature · 1 line
2.6.2
Re: [PATCH][meta-qt5 5/7] qtwebengine: add dependency on yasm-native and use it
Quoted 21 lines · Martin Jansa
* latest chromium is failing to build yasm, because it's mixing native
(x86_64) with target (x86 qemux86) libraries during the build:
FAILED: /OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/i586-oe-linux/i586-oe-linux-g++ -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/sysroots/qemux86 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,now -Wl,-z,relro -Wl,--fatal-warnings -Wl,-z,defs -pthread -Wl,-z,noexecstack -fPIC -Wl,--disable-new-dtags -Wl,--gc-sections -o genstring -Wl,--start-groupobj.host/src/3rdparty/chromium/third_party/yasm/source/patched-yasm/genstring.genstring.o-Wl,--end-group /OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/i586-oe-linux/gcc/i586-oe-linux/5.2.0/ld: i386:x86-64 architecture of input file `obj.host/src/3rdparty/chromium/third_party/yasm/source/patched-yasm/genstring.genstring.o' is incompatible with i386 output
/OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/i586-oe-linux/gcc/i586-oe-linux/5.2.0/ld:obj.host/src/3rdparty/chromium/third_party/yasm/source/patched-yasm/genstring.genstring.o: file class ELFCLASS64 incompatible with ELFCLASS32
/OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux/usr/libexec/i586-oe-linux/gcc/i586-oe-linux/5.2.0/ld: final link failed: File in wrong format
collect2: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.
Makefile.gyp_run:262: recipe for target 'invoke_ninja' failed
make[3]: *** [invoke_ninja] Error 1Signed-off-by Martin Jansa <[email protected]>--- recipes-qt/qt5/qtwebengine_git.bb | 3 +++ 1 file changed, 3 insertions(+)recipes-qt/qt5/qtwebengine_git.bb +0
-0
recipes-qt/qt5/qtwebengine_git.bb DEPENDS += " \ · line 27
Quoted 5 lines
recipes-qt/qt5/qtwebengine_git.bb +2
-0@@ -23,6 +23,9 @@ DEPENDS += " \ # xscreensaver isn't covered in qtbase DEPENDS DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'libxscrnsaver', '', d)}" +DEPENDS += "yasm-native" +EXTRA_QMAKEVARS_PRE += "WEBENGINE_CONFIG+=use_system_yasm"
This should be GYP_CONFIG, I've sent wrong version of the patch, correct version is in master-next and jansa/master branches.
There are some issues when system nss is detected and used, I'll look into it later.
Quoted 7 lines
recipes-qt/qt5/qtwebengine_git.bb +1
-0+ COMPATIBLE_MACHINE = "(-)" COMPATIBLE_MACHINE_x86 = "(.*)" COMPATIBLE_MACHINE_x86-64 = "(.*)"Signature · 1 line
2.6.2
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
PATCH 6/7 qtwebengine: include chromium SRCREV in SRCPV
In reply to Martin Jansa* some projects can update chromium and qtwebengine SRCREVs independenty (we do that in LuneOS) and without this qtwebengine won't rebuild automatically when just SRCREV_chromium is changed (other alternative is to add do_fetch[vardeps] += "SRCREV_chromium", but having both SRCREVs in SRCPV is useful in these cases so just include both.
--- recipes-qt/qt5/qtwebengine_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-qt/qt5/qtwebengine_git.bb +1 -1
@@ -93,6 +93,6 @@ SRCREV_qtwebengine = "40ef43e0d69c4a86c9430b7f264d2cde6340ee0f" SRCREV_chromium = "ec5b3304fc266dfdec7666b8b73d57a3971ea35f" SRCREV = "${SRCREV_qtwebengine}" -SRCREV_FORMAT = "qtwebengine" +SRCREV_FORMAT = "qtwebengine_chromium" S = "${WORKDIR}/git"
Signature · 1 line
2.6.2
PATCH 7/7 qtwebengine: add dependency on flac
In reply to Martin Jansa* autodetected from sysroot:
WARNING: QA Issue: qtwebengine rdepends on libflac, but it isn't a build dependency? [build-deps]
--- recipes-qt/qt5/qtwebengine_git.bb | 2 ++ 1 file changed, 2 insertions(+)
recipes-qt/qt5/qtwebengine_git.bb +2 -0
@@ -23,6 +23,8 @@ DEPENDS += " \ # xscreensaver isn't covered in qtbase DEPENDS DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'libxscrnsaver', '', d)}" +DEPENDS += "flac" + DEPENDS += "yasm-native" EXTRA_QMAKEVARS_PRE += "WEBENGINE_CONFIG+=use_system_yasm"
Signature · 1 line
2.6.2