From 2736dcf9ac98fc6e24649aaacdca4df093040802 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Mon, 9 Jul 2018 14:06:04 -0700 Subject: qtbase: Add a kde PACKAGECONFIG If trying to build KDE there are extra package config options required. This patch adds a KDE DISTRO_CONFIG that enables the extra PACKAGECONFIG options required. Signed-off-by: Alistair Francis --- recipes-qt/qt5/qtbase_git.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index fdaf031f..627b2f23 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -61,6 +61,7 @@ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -f PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xinput2 glib xkb xkbcommon-evdev', '', d)}" +PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput', '', d)}" PACKAGECONFIG_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" PACKAGECONFIG_DISTRO ?= "" @@ -80,6 +81,7 @@ PACKAGECONFIG ?= " \ ${PACKAGECONFIG_GL} \ ${PACKAGECONFIG_FB} \ ${PACKAGECONFIG_X11} \ + ${PACKAGECONFIG_KDE} \ ${PACKAGECONFIG_FONTS} \ ${PACKAGECONFIG_SYSTEM} \ ${PACKAGECONFIG_DISTRO} \ -- cgit v1.2.3-54-g00ecf From 539e4f09f749f024d6e157a49559e5ad7f51470a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 Aug 2018 12:37:03 +0000 Subject: qtbase: fix build with glibc-2.28 Fixes: qtbase/5.11.1+gitAUTOINC+74305ba470-r0/git/src/corelib/io/qfilesystemengine_unix.cpp:94: qtbase/5.11.1+gitAUTOINC+74305ba470-r0/recipe-sysroot/usr/include/linux/stat.h:56:8: error: redefinition of 'struct statx_timestamp' struct statx_timestamp { ^~~~~~~~~~~~~~~ qtbase/5.11.1+gitAUTOINC+74305ba470-r0/recipe-sysroot/usr/include/bits/statx.h:25:8: note: previous definition of 'struct statx_timestamp' struct statx_timestamp ^~~~~~~~~~~~~~~ You might encounter another error: qtbase/5.11.1+gitAUTOINC+74305ba470-r0/git/src/corelib/io/qfilesystemengine_unix.cpp:109:12: error: 'int renameat2(int, const char*, int, const char*, unsigned int)' was declared 'extern' and later 'static' [-fpermissive] static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newpath, unsigned flags) ^~~~~~~~~ qtbase/5.11.1+gitAUTOINC+74305ba470-r0/recipe-sysroot/usr/include/stdio.h:164:12: note: previous declaration of 'int renameat2(int, const char*, int, const char*, unsigned int)' extern int renameat2 (int __oldfd, const char *__old, int __newfd, ^~~~~~~~~ In that case enable renameat2 in your PACKAGECONFIG. Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 7 ++- recipes-qt/qt5/qtbase-native_git.bb | 9 +-- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 27 +-------- .../qtbase/0014-Always-build-uic-and-qvkgen.patch | 28 --------- .../0014-Fix-qmake-build-with-glibc-2.28.patch | 69 ++++++++++++++++++++++ .../qtbase/0015-Always-build-uic-and-qvkgen.patch | 28 +++++++++ .../0015-Bootstrap-without-linkat-feature.patch | 27 --------- .../0016-Bootstrap-without-linkat-feature.patch | 27 +++++++++ recipes-qt/qt5/qtbase_git.bb | 3 +- 9 files changed, 136 insertions(+), 89 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0014-Always-build-uic-and-qvkgen.patch create mode 100644 recipes-qt/qt5/qtbase/0014-Fix-qmake-build-with-glibc-2.28.patch create mode 100644 recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch delete mode 100644 recipes-qt/qt5/qtbase/0015-Bootstrap-without-linkat-feature.patch create mode 100644 recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 8c3adae1..5ad6a650 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -24,7 +24,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.6 +# 5.11.meta-qt5-shared.7 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -39,13 +39,14 @@ SRC_URI += "\ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ + file://0014-Fix-qmake-build-with-glibc-2.28.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.6 +# 5.11.meta-qt5-native.7 SRC_URI += " \ - file://0014-Always-build-uic-and-qvkgen.patch \ + file://0015-Always-build-uic-and-qvkgen.patch \ " # CMake's toolchain configuration of nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 819f4473..bffebdd1 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -19,7 +19,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.6 +# 5.11.meta-qt5-shared.7 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -34,18 +34,19 @@ SRC_URI += "\ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ + file://0014-Fix-qmake-build-with-glibc-2.28.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native -# 5.11.meta-qt5-native.6 +# 5.11.meta-qt5-native.7 SRC_URI += " \ - file://0014-Always-build-uic-and-qvkgen.patch \ + file://0015-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0015-Bootstrap-without-linkat-feature.patch \ + file://0016-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index f4dfe0b7..8f7afb6d 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -22,11 +22,10 @@ Signed-off-by: Martin Jansa --- configure | 2 +- mkspecs/features/configure.prf | 4 +-- - mkspecs/features/qt.prf | 6 ++-- mkspecs/features/qt_functions.prf | 2 +- mkspecs/linux-oe-g++/qmake.conf | 42 ++++++++++++++++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 1 + - 6 files changed, 50 insertions(+), 7 deletions(-) + 5 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h @@ -64,30 +63,6 @@ index 934a18a924..0f5b1b6333 100644 log("yes$$escape_expand(\\n)") msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) -diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index b57afcf72d..afa1c39b3e 100644 ---- a/mkspecs/features/qt.prf -+++ b/mkspecs/features/qt.prf -@@ -147,7 +147,7 @@ import_plugins:qtConfig(static) { - !isEmpty(plug_type) { - plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) - isEmpty(plug_path): \ -- plug_path = $$[QT_INSTALL_PLUGINS/get] -+ plug_path = $$[QT_INSTALL_PLUGINS] - LIBS += -L$$plug_path/$$plug_type - } - LIBS += -l$${plug}$$qtPlatformTargetSuffix() -@@ -298,8 +298,8 @@ for(ever) { - # static builds: link qml import plugins into the target. - contains(all_qt_module_deps, qml): \ - qtConfig(static):import_plugins:!host_build:!no_import_scan { -- exists($$[QT_INSTALL_QML/get]): \ -- QMLPATHS *= $$[QT_INSTALL_QML/get] -+ exists($$[QT_INSTALL_QML]): \ -+ QMLPATHS *= $$[QT_INSTALL_QML] - - # run qmlimportscanner - qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 1903e509c8..c093dd4592 100644 --- a/mkspecs/features/qt_functions.prf diff --git a/recipes-qt/qt5/qtbase/0014-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0014-Always-build-uic-and-qvkgen.patch deleted file mode 100644 index 060e8fbf..00000000 --- a/recipes-qt/qt5/qtbase/0014-Always-build-uic-and-qvkgen.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7b0de75cc3d85b44f96f1c6869c65399351a1398 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH] Always build uic and qvkgen - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index 1f7c5d99c1..6b39379dd0 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -222,7 +222,7 @@ qtConfig(gui) { - } - } - } --SUBDIRS += src_plugins -+SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen - - nacl: SUBDIRS -= src_network src_testlib - diff --git a/recipes-qt/qt5/qtbase/0014-Fix-qmake-build-with-glibc-2.28.patch b/recipes-qt/qt5/qtbase/0014-Fix-qmake-build-with-glibc-2.28.patch new file mode 100644 index 00000000..0cfd5428 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0014-Fix-qmake-build-with-glibc-2.28.patch @@ -0,0 +1,69 @@ +From 721d05fbe9e70518ed2288c089ff5d4036ea7ac7 Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Tue, 7 Aug 2018 09:38:42 -0700 +Subject: [PATCH] Fix qmake build with glibc 2.28 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We haven't yet run the configure checks to see if statx and renameat2 +are present in glibc, so this fails when we redefine the structures and +functions. + +linux/stat.h:56:8: error: redefinition of 'struct statx_timestamp' +bits/statx.h:25:8: note: previous definition of 'struct statx_timestamp' +qfilesystemengine_unix.cpp:110:12: error: 'int renameat2(int, const char*, int, const char*, unsigned int)' was declared 'extern' and later 'static' [-fpermissive] + +Change-Id: Ia741b559c24d46c78fb2fffd1548a792d22e3368 +Reviewed-by: Oswald Buddenhagen +Reviewed-by: Jüri Valdmann +--- + src/corelib/global/qconfig-bootstrapped.h | 12 ++++++++++-- + src/corelib/io/qfilesystemengine_unix.cpp | 2 +- + 2 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index 3469ebe5e6..c5585ea32a 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -98,10 +98,18 @@ + #define QT_NO_QOBJECT + #define QT_FEATURE_process -1 + #define QT_FEATURE_regularexpression -1 +-#define QT_FEATURE_renameat2 -1 ++#ifdef __GLIBC_PREREQ ++# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++#else ++# define QT_FEATURE_renameat2 -1 ++#endif + #define QT_FEATURE_sharedmemory -1 + #define QT_FEATURE_slog2 -1 +-#define QT_FEATURE_statx -1 ++#ifdef __GLIBC_PREREQ ++# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++#else ++# define QT_FEATURE_statx -1 ++#endif + #define QT_FEATURE_syslog -1 + #define QT_NO_SYSTEMLOCALE + #define QT_FEATURE_systemsemaphore -1 +diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp +index be6ce48d0c..3e4f33a3ba 100644 +--- a/src/corelib/io/qfilesystemengine_unix.cpp ++++ b/src/corelib/io/qfilesystemengine_unix.cpp +@@ -91,7 +91,6 @@ extern "C" NSString *NSTemporaryDirectory(); + # include + # include + # include +-# include + + // in case linux/fs.h is too old and doesn't define it: + #ifndef FICLONE +@@ -112,6 +111,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp + # endif + + # if !QT_CONFIG(statx) && defined(SYS_statx) ++# include + static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf) + { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); } + # elif !QT_CONFIG(statx) && !defined(SYS_statx) diff --git a/recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch new file mode 100644 index 00000000..0a32e881 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch @@ -0,0 +1,28 @@ +From 7ad41f69af974ec924eb27c86fb15d5da9384d6c Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 16 Nov 2013 00:32:30 +0100 +Subject: [PATCH] Always build uic and qvkgen + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 1f7c5d99c1..6b39379dd0 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -222,7 +222,7 @@ qtConfig(gui) { + } + } + } +-SUBDIRS += src_plugins ++SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen + + nacl: SUBDIRS -= src_network src_testlib + diff --git a/recipes-qt/qt5/qtbase/0015-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0015-Bootstrap-without-linkat-feature.patch deleted file mode 100644 index 8863ddd8..00000000 --- a/recipes-qt/qt5/qtbase/0015-Bootstrap-without-linkat-feature.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6ff049f08cbe80b00b34859acdc5ccf7b9c9ae18 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 24 Nov 2017 15:16:31 +0200 -Subject: [PATCH] Bootstrap without linkat feature - -qmake does not work together with pseudo when unnamed temporary files -are used with linkat. - -Upstream-Status: Inappropriate [OE specific] -[YOCTO #11996] ---- - src/corelib/global/qconfig-bootstrapped.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index 3469ebe5e6..cb889f27c2 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -90,7 +90,7 @@ - #define QT_FEATURE_itemmodel -1 - #define QT_FEATURE_library -1 - #ifdef __linux__ --# define QT_FEATURE_linkat 1 -+# define QT_FEATURE_linkat -1 - #else - # define QT_FEATURE_linkat -1 - #endif diff --git a/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..4f5fdc95 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch @@ -0,0 +1,27 @@ +From 05bbd2dce8c7f4a40d86841671763b9d8b51c886 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 24 Nov 2017 15:16:31 +0200 +Subject: [PATCH] Bootstrap without linkat feature + +qmake does not work together with pseudo when unnamed temporary files +are used with linkat. + +Upstream-Status: Inappropriate [OE specific] +[YOCTO #11996] +--- + src/corelib/global/qconfig-bootstrapped.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index c5585ea32a..de895e7bf4 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -90,7 +90,7 @@ + #define QT_FEATURE_itemmodel -1 + #define QT_FEATURE_library -1 + #ifdef __linux__ +-# define QT_FEATURE_linkat 1 ++# define QT_FEATURE_linkat -1 + #else + # define QT_FEATURE_linkat -1 + #endif diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 627b2f23..4c85a216 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.6 +# 5.11.meta-qt5-shared.7 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -30,6 +30,7 @@ SRC_URI += "\ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ + file://0014-Fix-qmake-build-with-glibc-2.28.patch \ " # for syncqt -- cgit v1.2.3-54-g00ecf From 75e2d3a2e3888c06c1da74f3f6ab82882f450064 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 12 Aug 2018 10:20:04 +0000 Subject: qtbase: update the dependency for gbm PACKAGECONFIG * mesa* conditionally provides virtual/libgbm when gbm is enabled there so it's better than depending on just virtual/mesa Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4c85a216..0008597e 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -143,7 +143,7 @@ PACKAGECONFIG[gtk] = "-gtk,-no-gtk,gtk+3" PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" -PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/mesa" +PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/libgbm" PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" -- cgit v1.2.3-54-g00ecf From bb38f64f439241393703e84a408148c93f271cfd Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 21 Jun 2018 13:20:05 +0300 Subject: qt3d-runtime: add recipe for Qt 3D Studio runtime library The Qt 3D Studio Runtime provides C++ and QML APIs for integrating Qt 3D Studio scenes into Qt applications, as well as the viewer application that is used in combination with the Qt 3D Studio application during the design phase Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qt3d-runtime_git.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 recipes-qt/qt5/qt3d-runtime_git.bb (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qt3d-runtime_git.bb b/recipes-qt/qt5/qt3d-runtime_git.bb new file mode 100644 index 00000000..75d1c67b --- /dev/null +++ b/recipes-qt/qt5/qt3d-runtime_git.bb @@ -0,0 +1,16 @@ +require qt5.inc +require qt5-git.inc + +LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial" +LIC_FILES_CHKSUM = " \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ +" + +DEPENDS += "qtbase qtdeclarative qt3d" + +QT_MODULE_BRANCH = "2.0" +QT_GIT_PROJECT = "qt3dstudio" +PV = "2.0+git${SRCPV}" + +SRCREV = "f3396eb52e1333dc06e1fc0aef1e7cb60f243270" -- cgit v1.2.3-54-g00ecf From 70b090a50468edd0dd20788d8c7828e792e0f8dc Mon Sep 17 00:00:00 2001 From: Alban Bedel Date: Mon, 13 Aug 2018 17:12:33 +0200 Subject: qtwebengine: add a package config to enable proprietary codecs Add a package config that allow to enable proprietary codecs for h264 support. Signed-off-by: Alban Bedel --- recipes-qt/qt5/qtwebengine_git.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 32ad875c..4a75d9b1 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -58,6 +58,7 @@ PACKAGECONFIG[protobuf] = "-feature-webengine-system-protobuf,-no-feature-webeng 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" +PACKAGECONFIG[proprietary-codecs] = "-feature-webengine-proprietary-codecs,-no-feature-webengine-proprietary-codecs" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -- cgit v1.2.3-54-g00ecf From cb7dfcc53adc3e7136f1a8d23bb6252a71027ed8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 15 Aug 2018 16:03:28 +0000 Subject: qtwebengine: Add PACKAGECONFIG for pepper-plugins printing-and-pdf spellchecker * also add libpci runtime dependency for x86 targets (imported from meta-luneui) Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebengine_git.bb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 4a75d9b1..5b6e50e3 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -59,6 +59,9 @@ PACKAGECONFIG[jasoncpp] = "-feature-webengine-system-jsoncpp,-no-feature-webengi PACKAGECONFIG[libxml2] = "-feature-webengine-system-libxml2,-no-feature-webengine-system-libxml2,libxml2" PACKAGECONFIG[minizip] = "-feature-webengine-system-minizip,-no-feature-webengine-system-minizip,minizip" PACKAGECONFIG[proprietary-codecs] = "-feature-webengine-proprietary-codecs,-no-feature-webengine-proprietary-codecs" +PACKAGECONFIG[pepper-plugins] = "-feature-webengine-pepper-plugins,-no-feature-webengine-pepper-plugins" +PACKAGECONFIG[printing-and-pdf] = "-feature-webengine-printing-and-pdf,-no-feature-webengine-printing-and-pdf" +PACKAGECONFIG[spellchecker] = "-feature-webengine-spellchecker,-no-feature-webengine-spellchecker" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" @@ -120,6 +123,9 @@ PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" # for /usr/share/qt5/qtwebengine_resources.pak FILES_${PN} += "${OE_QMAKE_PATH_QT_TRANSLATIONS} ${OE_QMAKE_PATH_QT_DATA}" +# Chromium uses libpci to determine which optimizations/workarounds to apply +RDEPENDS_${PN}_append_x86 = " libpci" + RDEPENDS_${PN}-examples += " \ ${PN}-qmlplugins \ qtquickcontrols-qmlplugins \ -- cgit v1.2.3-54-g00ecf From 1fb8affa94fc120753d2837d50e5a87e48737b09 Mon Sep 17 00:00:00 2001 From: Manjukumar Matha Date: Fri, 17 Aug 2018 11:51:05 -0700 Subject: qtwebkit_git.bb: Fix configure failure on bison Fix the following error during do_configure | CMake Error at | Could NOT find BISON (missing: BISON_EXECUTABLE) (Required is at least | version "2.1") | Call Stack (most recent call first): Add dependency to bison-native to fix the above error Signed-off-by: Manjukumar Matha --- recipes-qt/qt5/qtwebkit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 9e4617a0..a7dad987 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee \ " -DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native" +DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native bison-native" inherit cmake_qt5 perlnative pythonnative -- cgit v1.2.3-54-g00ecf From e4abbdef8195af91d3fc0183a56dce6b4b7c4dfb Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Wed, 22 Aug 2018 15:36:29 +0200 Subject: qtwebengine: Fix optonal glib-2.0 dependency The corresponding recipe in poky is named "glib-2.0_XXX.bb", not "glib_XXX.bb" which causes parser errors when enabling 'glib' in PACKAGECONFIG. Signed-off-by: Jens Rehsack --- recipes-qt/qt5/qtwebengine_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 5b6e50e3..a10db075 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -52,7 +52,7 @@ PACKAGECONFIG[libvpx] = "-feature-webengine-system-libvpx,-no-feature-webengine- 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[glib] = "-feature-webengine-system-glib,-no-feature-webengine-system-glib,glib-2.0" 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" -- cgit v1.2.3-54-g00ecf From 2d1d8078156d050994a6cf46298d836b357df15c Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 20 Aug 2018 23:50:45 +0200 Subject: qtbase: fix build with glibc-2.28 - for non-readers like me MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 539e4f09f749f024d6e157a49559e5ad7f51470a fixed bootstrapped build. At least cross builds are not done bootstrapped. Fix them too by copying statx/renameat2 macros - non-bootsrapped conditional - to qfilesystemengine_unix.cpp - it is fortunately the only source using QT_FEATURE_renameat2 / QT_FEATURE_statx (or QT_CONFIG(renameat2) / QT_CONFIG(statx)). Signed-off-by: Andreas Müller --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 3 +- recipes-qt/qt5/qtbase-native_git.bb | 5 +-- .../qtbase/0015-Always-build-uic-and-qvkgen.patch | 28 --------------- ...-version-for-renameat2-statx-on-non-boots.patch | 41 ++++++++++++++++++++++ .../qtbase/0016-Always-build-uic-and-qvkgen.patch | 28 +++++++++++++++ .../0016-Bootstrap-without-linkat-feature.patch | 27 -------------- .../0017-Bootstrap-without-linkat-feature.patch | 27 ++++++++++++++ recipes-qt/qt5/qtbase_git.bb | 2 ++ 8 files changed, 103 insertions(+), 58 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch create mode 100644 recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch create mode 100644 recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch delete mode 100644 recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch create mode 100644 recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 5ad6a650..db26afbb 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -40,13 +40,14 @@ SRC_URI += "\ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ file://0014-Fix-qmake-build-with-glibc-2.28.patch \ + file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native # 5.11.meta-qt5-native.7 SRC_URI += " \ - file://0015-Always-build-uic-and-qvkgen.patch \ + file://0016-Always-build-uic-and-qvkgen.patch \ " # CMake's toolchain configuration of nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index bffebdd1..03e7af2a 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -35,18 +35,19 @@ SRC_URI += "\ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ file://0014-Fix-qmake-build-with-glibc-2.28.patch \ + file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native # 5.11.meta-qt5-native.7 SRC_URI += " \ - file://0015-Always-build-uic-and-qvkgen.patch \ + file://0016-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0016-Bootstrap-without-linkat-feature.patch \ + file://0017-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" diff --git a/recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch deleted file mode 100644 index 0a32e881..00000000 --- a/recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7ad41f69af974ec924eb27c86fb15d5da9384d6c Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH] Always build uic and qvkgen - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index 1f7c5d99c1..6b39379dd0 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -222,7 +222,7 @@ qtConfig(gui) { - } - } - } --SUBDIRS += src_plugins -+SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen - - nacl: SUBDIRS -= src_network src_testlib - diff --git a/recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch new file mode 100644 index 00000000..e1e1087c --- /dev/null +++ b/recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch @@ -0,0 +1,41 @@ +From 7e287f4793f75a7291386a904d3361460748b15b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 21 Aug 2018 00:29:06 +0200 +Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped + build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + src/corelib/io/qfilesystemengine_unix.cpp | 11 ++++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp +index be6ce48d0cb..1bf1bebc7f1 100644 +--- a/src/corelib/io/qfilesystemengine_unix.cpp ++++ b/src/corelib/io/qfilesystemengine_unix.cpp +@@ -98,6 +98,17 @@ extern "C" NSString *NSTemporaryDirectory(); + # define FICLONE _IOW(0x94, 9, int) + #endif + ++// renameat2/statx features for non bootstrapped build ++#ifndef QT_BOOTSTRAPPED ++#ifdef __GLIBC_PREREQ ++# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++#else ++# define QT_FEATURE_renameat2 -1 ++# define QT_FEATURE_statx -1 ++#endif ++#endif ++ + # if defined(Q_OS_ANDROID) + // renameat2() and statx() are disabled on Android because quite a few systems + // come with sandboxes that kill applications that make system calls outside a +-- +2.14.4 + diff --git a/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch new file mode 100644 index 00000000..0a32e881 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch @@ -0,0 +1,28 @@ +From 7ad41f69af974ec924eb27c86fb15d5da9384d6c Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 16 Nov 2013 00:32:30 +0100 +Subject: [PATCH] Always build uic and qvkgen + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 1f7c5d99c1..6b39379dd0 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -222,7 +222,7 @@ qtConfig(gui) { + } + } + } +-SUBDIRS += src_plugins ++SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen + + nacl: SUBDIRS -= src_network src_testlib + diff --git a/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch deleted file mode 100644 index 4f5fdc95..00000000 --- a/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 05bbd2dce8c7f4a40d86841671763b9d8b51c886 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 24 Nov 2017 15:16:31 +0200 -Subject: [PATCH] Bootstrap without linkat feature - -qmake does not work together with pseudo when unnamed temporary files -are used with linkat. - -Upstream-Status: Inappropriate [OE specific] -[YOCTO #11996] ---- - src/corelib/global/qconfig-bootstrapped.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index c5585ea32a..de895e7bf4 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -90,7 +90,7 @@ - #define QT_FEATURE_itemmodel -1 - #define QT_FEATURE_library -1 - #ifdef __linux__ --# define QT_FEATURE_linkat 1 -+# define QT_FEATURE_linkat -1 - #else - # define QT_FEATURE_linkat -1 - #endif diff --git a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..4f5fdc95 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch @@ -0,0 +1,27 @@ +From 05bbd2dce8c7f4a40d86841671763b9d8b51c886 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 24 Nov 2017 15:16:31 +0200 +Subject: [PATCH] Bootstrap without linkat feature + +qmake does not work together with pseudo when unnamed temporary files +are used with linkat. + +Upstream-Status: Inappropriate [OE specific] +[YOCTO #11996] +--- + src/corelib/global/qconfig-bootstrapped.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index c5585ea32a..de895e7bf4 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -90,7 +90,7 @@ + #define QT_FEATURE_itemmodel -1 + #define QT_FEATURE_library -1 + #ifdef __linux__ +-# define QT_FEATURE_linkat 1 ++# define QT_FEATURE_linkat -1 + #else + # define QT_FEATURE_linkat -1 + #endif diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 0008597e..1ad93fd4 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -31,8 +31,10 @@ SRC_URI += "\ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ file://0014-Fix-qmake-build-with-glibc-2.28.patch \ + file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ " + # for syncqt RDEPENDS_${PN}-tools += "perl" -- cgit v1.2.3-54-g00ecf From 95d64ea67e804a43dc829ffd3ebdac427312ffd7 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 21 Aug 2018 01:28:24 +0200 Subject: qtbase: remove renameat2 PACKAGECONFIG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * since glibc 2.28 it is not necessary that Qt implements it * reduce PACKAGECONFIG mania a bit Signed-off-by: Andreas Müller --- recipes-qt/qt5/qtbase_git.bb | 2 -- 1 file changed, 2 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 1ad93fd4..98664b09 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -153,8 +153,6 @@ PACKAGECONFIG[widgets] = "-widgets,-no-widgets" PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" PACKAGECONFIG[journald] = "-journald,-no-journald,systemd" -# needs kernel 3.16+ -PACKAGECONFIG[renameat2] = "-feature-renameat2,-no-feature-renameat2," # needs kernel 3.17+ PACKAGECONFIG[getentropy] = "-feature-getentropy,-no-feature-getentropy," -- cgit v1.2.3-54-g00ecf From 9ffdd55c7c03d9e608409a95ed4c51ae0fb3d511 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 30 Aug 2018 16:55:01 -0700 Subject: qtscript: Update the custom patch from mainline Update the custom qtscript patch to use a backported patch instead. Signed-off-by: Alistair Francis --- ...rdparty-javascriptcore-Add-RISC-V-support.patch | 50 +++++++++++++++++++ .../0001-javascriptcore-Use-64-bit-ints.patch | 58 ---------------------- recipes-qt/qt5/qtscript_git.bb | 2 +- 3 files changed, 51 insertions(+), 59 deletions(-) create mode 100644 recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch delete mode 100644 recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch b/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch new file mode 100644 index 00000000..878a8ab9 --- /dev/null +++ b/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch @@ -0,0 +1,50 @@ +From 21781f11a71d4e6449d89372aa9cc5b95ce8a67c Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Jul 2018 14:26:21 -0700 +Subject: [PATCH] 3rdparty/javascriptcore: Add RISC-V support + +Signed-off-by: Alistair Francis +Change-Id: I81f15084ef6b5b8d855c1f568cacca176af51b57 +Reviewed-by: Simon Hausmann + +Upstream-Status: Backport +--- + .../javascriptcore/JavaScriptCore/wtf/Platform.h | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +index 00caa6d..96942c7 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -397,6 +397,16 @@ + #endif + #endif /* __mips__ */ + ++/* CPU(RISCV64) - RISC-V 64-bit */ ++#if defined(__riscv) && __riscv_xlen == 64 ++#define WTF_CPU_RISCV64 1 ++#endif ++ ++/* CPU(RISCV32) - RISC-V 32-bit */ ++#if defined(__riscv) && __riscv_xlen == 32 ++#define WTF_CPU_RISCV32 1 ++#endif ++ + /* ==== OS() - underlying operating system; only to be used for mandated low-level services like + virtual memory, not to choose a GUI toolkit ==== */ + +@@ -948,9 +958,9 @@ + #endif + + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) +-#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) ++#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(RISCV64) + #define WTF_USE_JSVALUE64 1 +-#elif CPU(ARM) || CPU(PPC64) ++#elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32) + #define WTF_USE_JSVALUE32 1 + #elif OS(WINDOWS) && COMPILER(MINGW) + /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg +-- +2.17.1 + diff --git a/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch b/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch deleted file mode 100644 index a083decf..00000000 --- a/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 8fd53951d53ef8c5b62fe985665dad0545bb3161 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Mon, 4 Jun 2018 14:24:59 -0700 -Subject: [PATCH] javascriptcore: Use 64-bit ints - -Where required use 64-bit integers for casts. - -Signed-off-by: Alistair Francis -Upstream-Status: Pending ---- - .../JavaScriptCore/assembler/X86Assembler.h | 2 +- - .../javascriptcore/JavaScriptCore/runtime/JSValue.h | 8 ++++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h -index ab3d05f..ed5965f 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h -@@ -2033,7 +2033,7 @@ private: - } - } - --#if !CPU(X86_64) -+#if CPU(X86) - void memoryModRM(int reg, void* address) - { - // noBase + ModRmMemoryNoDisp means noBase + ModRmMemoryDisp32! -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h -index 7584c52..958ac89 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h -@@ -490,7 +490,11 @@ namespace JSC { - u.asBits.tag = CellTag; - else - u.asBits.tag = EmptyValueTag; -+#if CPU(X86) - u.asBits.payload = reinterpret_cast(ptr); -+#else -+ u.asBits.payload = reinterpret_cast(ptr); -+#endif - #if ENABLE(JSC_ZOMBIES) - ASSERT(!isZombie()); - #endif -@@ -502,7 +506,11 @@ namespace JSC { - u.asBits.tag = CellTag; - else - u.asBits.tag = EmptyValueTag; -+#if CPU(X86) - u.asBits.payload = reinterpret_cast(const_cast(ptr)); -+#else -+ u.asBits.payload = reinterpret_cast(const_cast(ptr)); -+#endif - #if ENABLE(JSC_ZOMBIES) - ASSERT(!isZombie()); - #endif --- -2.17.1 - diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 5c1e2e10..4f18ffd0 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -SRC_URI += "file://0001-javascriptcore-Use-64-bit-ints.patch" +SRC_URI += "file://0001-3rdparty-javascriptcore-Add-RISC-V-support.patch" # qemuarm build fails with: # /OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtscript/5.4.1+gitAUTOINC+822df36f25-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/assembler/AssemblerBuffer.h: In member function 'void QTJSC::AssemblerBuffer::putInt64Unchecked(int64_t)': -- cgit v1.2.3-54-g00ecf