aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt
Commit message (Collapse)AuthorAgeFilesLines
* Recipes: add explicit branch parameter and use https:// instead of git:// ↵upstream/warrior-nextupstream/warriorMartin Jansa2021-12-027-7/+7
| | | | | | | | | | | | | | | | | | | | | for github.com * github decided that nobody should use git:// https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git and starting today all the builds were failing to fetch the metadata layers from github like: 2021-11-01T18:53:26 INFO _main_ Updating [meta-ros] fatal: remote error: The unauthenticated git protocol on port 9418 is no longer supported. Please see https://github.blog/2021-09-01-improving-git-protocol-security-github/ for more information. this was just a "test" as they said: "November 2, 2021: We'll also run several short brownouts on this date." and it will be completely disabled on January 11 2022. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Update to Qt 5.12.12Dan Ackers2021-12-0240-42/+42
| | | | | Signed-off-by: Dan Ackers <dan.ackers@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: Add patch to fix build with bison 3.7Andreas Müller2021-10-032-0/+53
| | | | | | | | | | | | | Fixes: |... /build/DerivedSources/WebCore/XPathGrammar.cpp:120:10: fatal error: XPathGrammar.hpp: No such file or directory | 120 | #include "XPathGrammar.hpp" | | ^~~~~~~~~~~~~~~~~~ | ... | .../build/DerivedSources/WebCore/CSSGrammar.cpp:160:10: fatal error: CSSGrammar.hpp: No such file or directory | 160 | #include "CSSGrammar.hpp" | | ^~~~~~~~~~~~~~~~ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
* qtwebkit: Fix build with icu-65.1Martin Jansa2021-10-032-0/+54
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: fix build with icu >= 68Andreas Müller2021-10-032-0/+126
| | | | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
* qtwebengine: fix build with glibc-2.34Martin Jansa2021-10-032-0/+73
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: Fix build with ninja >= 1.10.0Andreas Müller2021-10-032-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * For now just skip version check. Looked into: ninja came from meta-oe to oe-core with: commit fc3aef67a95a90e9a485c6b0e93db8cdeab5d3ab Author: Khem Raj <raj.khem@gmail.com> Date: Thu Jul 27 21:52:12 2017 -0700 ninja: Add recipe llvm is using it, therefore move it from meta-oe Signed-off-by: Khem Raj <raj.khem@gmail.com> That was in rocko release cycle. So the assumption we have a ninja decent enough should be acceptable. * and since the upgrade to ninja-1.10.0 in: commit d1cd957cea29f3ab111ae752bc9ad75a1324c255 Author: Upgrade Helper <auh@auh.yoctoproject.org> Date: Fri Feb 21 14:45:35 2020 -0800 ninja: upgrade 1.9.0 -> 1.10.0 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> the do_configure task fails with: | ERROR: Feature 'webengine-system-ninja' was enabled, but the pre-condition 'tests.webengine-ninja' failed. * Looked into qtwebengine current dev branch: There is no solution yet. So as soon as upstream offers a better solution most likely this patch will not apply any more and has to be removed then. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtdeclarative: Ask for python3 explicitlyKhem Raj2021-10-032-1/+63
| | | | | | Python2 is going out in Jan 2020 Signed-off-by: Khem Raj <raj.khem@gmail.com>
* nativesdk-qtbase: inherit pkgconfigMartin Jansa2021-10-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | * some features enabled with PACKAGECONFIG need pkgconfig to be detected correctly * fixes: Checking for pkg-config... test config.qtbase.tests.pkg-config FAILED ... Trying source 0 (type pkgConfig) of library dbus ... pkg-config use disabled globally. ... ERROR: Feature 'pkg-config' was enabled, but the pre-condition 'tests.pkg-config' failed. ERROR: Feature 'glib' was enabled, but the pre-condition 'libs.glib' failed. ERROR: Feature 'kms' was enabled, but the pre-condition 'libs.drm' failed. ERROR: Feature 'gbm' was enabled, but the pre-condition 'libs.gbm' failed. ERROR: Feature 'mtdev' was enabled, but the pre-condition 'libs.mtdev' failed. Change-Id: I498c586031ccea4b43f3e4d185bac9ce45bee14c Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebkit: Inherit pkgconfigKhem Raj2021-10-021-0/+2
| | | | | | | Fixes Could NOT find LibXslt: Found unsuitable version "", but required is at Signed-off-by: Khem Raj <raj.khem@gmail.com>
* qtgamepad: inherit pkgconfigKhem Raj2021-10-021-0/+2
| | | | | | | Fixes ERROR: Feature 'sdl2' was enabled, but the pre-condition 'libs.sdl2' failed. Signed-off-by: Khem Raj <raj.khem@gmail.com>
* qtwayland: Inherit pkgconfigKhem Raj2021-10-021-0/+2
| | | | | | | Fixes ERROR: Feature 'xcomposite-egl' was enabled, but the pre-condition 'features.wayland-client && features.opengl && features.egl && features.xlib && libs.xcomposite && features.egl_x11' failed. Signed-off-by: Khem Raj <raj.khem@gmail.com>
* qtwebengine: inherit pkgconfigMartin Jansa2021-10-021-0/+2
| | | | | | | | | | | | | | * Newer oe-core doesn't pull many default dependencies anymore: https://lists.openembedded.org/g/openembedded-core/message/156185 add explicit dependency on pkgconfig through pkgconfig.bbclass as we're using it here. * fixes: | sed: can't read /OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_7aad021f2e-r0/image/usr/lib/pkgconfig/Qt5WebEngineCore.pc: No such file or directory because without pkgconfig detected this file isn't created during the build Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtmultimedia: inherit pkgconfigMartin Jansa2021-10-021-0/+2
| | | | | | | | | | | | | | | | * some features enabled with PACKAGECONFIG need pkgconfig to be detected correctly * fixes: | Checking for libresourceqt5... ERROR: Error calling /OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtmultimedia/5.15.2+gitAUTOINC+fd30913d46-r0/recipe-sysroot-native/usr/bin/qmake -makefile -o Makefile QT_BUILD_PARTS-=examples QT_BUILD_PARTS-=tests /OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtmultimedia/5.15.2+gitAUTOINC+fd30913d46-r0/git/qtmultimedia.pro -- -alsa -gstreamer 1.0 -no-feature-openal -pulseaudio | no | Done running configuration tests. ... | ERROR: Feature 'gstreamer_1_0' was enabled, but the pre-condition 'libs.gstreamer_1_0' failed. | | ERROR: Feature 'pulseaudio' was enabled, but the pre-condition 'libs.pulseaudio' failed. Change-Id: Iba231f52a1b4a2248c1799c77925c441b84d4b03
* maliit-framework-qt5: inherit pkgconfigMartin Jansa2021-10-021-1/+1
| | | | | | | | * fixes: | Reading /OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/maliit-framework-qt5/0.99.0+gitAUTOINC+62bd54bcde-r0/git/connection/connection.pro [/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/maliit-framework-qt5/0.99.0+gitAUTOINC+62bd54bcde-r0/build/connection] | sh: 1: pkg-config: not found | sh: 1: pkg-config: not found | WARNING: install_services.path is not defined: install target not created
* qtbase: inherit pkgconfigMartin Jansa2021-10-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | * some features enabled with PACKAGECONFIG need pkgconfig to be detected correctly * fixes: Checking for pkg-config... test config.qtbase.tests.pkg-config FAILED ... Trying source 0 (type pkgConfig) of library dbus ... pkg-config use disabled globally. ... ERROR: Feature 'pkg-config' was enabled, but the pre-condition 'tests.pkg-config' failed. ERROR: Feature 'glib' was enabled, but the pre-condition 'libs.glib' failed. ERROR: Feature 'kms' was enabled, but the pre-condition 'libs.drm' failed. ERROR: Feature 'gbm' was enabled, but the pre-condition 'libs.gbm' failed. ERROR: Feature 'mtdev' was enabled, but the pre-condition 'libs.mtdev' failed. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Update to Qt 5.12.11Dan Ackers2021-09-3040-43/+43
| | | | | Signed-off-by: Dan Ackers <dan.ackers@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* ogl-runtime: update v2.7.0 -> v2.8.0Mikko Gronoff2021-09-301-3/+3
| | | | | Signed-off-by: Dan Ackers <dan.ackers@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* ogl-runtime: update 2.6.0 -> 2.7.0Mikko Gronoff2021-09-301-3/+3
| | | | | Signed-off-by: Dan Ackers <dan.ackers@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtdeclarative: fix build with gcc-11Martin Jansa2021-05-022-0/+71
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix build with gcc-11Martin Jansa2021-05-0124-45/+106
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-native.inc, nativesdk-qt5.inc, ↵Martin Jansa2021-01-313-3/+3
| | | | | | | | | | | nativesdk-packagegroup-qt5-toolchain-host: reorder inherits to fix new QA check * fixes: WARNING: meta-qt5/recipes-qt/qt5/qtbase-native_git.bb: QA Issue: qtbase-native: native/nativesdk class is not inherited last, this can result in unexpected behaviour. [native-last] WARNING: meta-qt5/recipes-qt/qt5/nativesdk-qtbase_git.bb: QA Issue: nativesdk-qtbase: native/nativesdk class is not inherited last, this can result in unexpected behaviour. [native-last] WARNING: meta-qt5/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb: QA Issue: nativesdk-packagegroup-qt5-toolchain-host: native/nativesdk class is not inherited last, this can result in unexpected behaviour. [native-last] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.12.10Lassi Lehikoinen2021-01-2240-43/+42
| | | | | Signed-off-by: Lassi Lehikoinen <lassi.lehikoinen@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* cinematicexperience: don't use trailing slash in SMartin Jansa2020-11-051-1/+1
| | | | | | | | * see oe-core base.bbclass changes from: https://lists.openembedded.org/g/openembedded-core/message/143159 https://lists.openembedded.org/g/openembedded-core/message/143161 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase-native: disable vulkan supportSamuli Piippo2020-07-221-0/+1
| | | | | | | Vulkan may get enabled if the host has vulkan headers available, which will cause a build break. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
* qtbase: Add vulkan to PACKAGECONFIGsTom Hochstein2020-07-221-0/+1
| | | | | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> (cherry picked from commit 62bb2ca66bfc13f3216a207013a51c3b9a1b9f26)
* qt5: upgrade to 5.12.9Mikko Gronoff2020-07-0740-41/+41
| | | | Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qt5: upgrade to 5.12.8Mikko Gronoff2020-04-1740-41/+41
| | | | Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
* ogl-runtime: update to v2.6.0Samuli Piippo2020-04-133-106/+3
| | | | Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qt5: upgrade to Qt 5.12.7Mikko Gronoff2020-04-1340-44/+44
| | | | | | | * Update modules to Qt 5.12.7 * Update license agreement to v4.2.1 Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qt5: update to Qt 5.12.6Mikko Gronoff2019-11-2041-45/+45
| | | | Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qtconnectivity,qtsystems: Account for bluez4 from oe-coreKhem Raj2019-10-302-6/+2
| | | | | | | bluez4 has been deprecated for few years now it has been removed completely from oe-core Signed-off-by: Khem Raj <raj.khem@gmail.com>
* qtbase: refresh patches from github forksMartin Jansa2019-10-1023-51/+51
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: update to Qt 5.12.5Mikko Gronoff2019-10-0843-107/+78
| | | | Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qt3d-runtime: update to ogl-runtime v2.4Mikko Gronoff2019-09-235-16/+191
| | | | | | | | | | Qt 3D Studio Runtime 2.x switches/upgrades to OpenGL Runtime with version update 2.3 -> 2.4. * Contains new 3rdparty submodule EASTL (Electronic Arts Standard Template Library), recipe adjusted accordingly. * format-security, examples & musl libc build issues fixed Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qtvirtualkeyboard: update supported layoutsSamuli Piippo2019-09-231-0/+22
| | | | | | | | | Update PACKAGECONFIGs with all the supported keyboard layouts. Change-Id: I943629b33f6132a68f49f83bcf02e6d822ddb34f Reviewed-by: Kwangsub Kim <kwangsub.kim@qt.io> Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
* qtserialbus: Fix build with 5.2+ kernel headersKhem Raj2019-09-062-0/+35
| | | | | | Backport relevant patch from upstream Signed-off-by: Khem Raj <raj.khem@gmail.com>
* qtwebengine: Fix compile failure with 5.2+ kernel headersKhem Raj2019-09-052-0/+32
| | | | | | | | Fixes error: 'SIOCGSTAMP' was not declared in this scope Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: fix build with gcc-9Martin Jansa2019-05-307-13/+387
| | | | | | | | | | | | | | | | | | * some components which use Werror started to fail with gcc-9, because of new warning: https://gcc.gnu.org/gcc-9/changes.html New warnings: -Wdeprecated-copy, implied by -Wextra, warns about the C++11 deprecation of implicitly declared copy constructor and assignment operator if one of them is user-provided. -Wdeprecated-copy-dtor also warns if the destructor is user-provided, as specified in C++11. * e.g. maliit-framework-qt5 was now failing with: maliit-framework-qt5/0.99.0+gitAUTOINC+62bd54bcde-r0/recipe-sysroot/usr/include/QtCore/qvariant.h:273:25: error: implicitly-declared 'constexpr QVariant::Private& QVariant::Private::operator=(const QVariant::Private&)' is deprecated [-Werror=deprecated-copy] 273 | { other.d = Private(); } | ^ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtlocation: add PACKAGECONFIGs for geoservicesGaurav Kalra2019-05-301-0/+5
| | | | | Signed-off-by: Gaurav Kalra <gvkalra@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt3d-runtime: update to v2.3Mikko Gronoff2019-05-191-3/+3
| | | | | Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURESMartin Jansa2019-05-141-1/+1
| | | | | | | | | | * otherwise building qtbase with default config will fail with: ERROR: The OpenGL functionality tests failed! You might need to modify the include and library search paths by editing QMAKE_INCDIR_OPENGL[_ES2], QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your platform. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULTMartin Jansa2019-05-141-2/+2
| | | | | | | | | | * the original goal was to keep the default PACKAGECONFIG as minimal as possible, but I think it's time to enable this * most builds probably have this enabled anyway because of other dependencies * new qtbase also shows a warning when it's disabled: WARNING: Accessibility disabled. This configuration of Qt is unsupported. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add libxext dependency for xcb PACKAGECONFIGMartin Jansa2019-05-141-1/+1
| | | | | | | | | | * with new Qt, qtbase fails to build with x11 DISTRO_FEATURES ERROR: Feature 'xcb-xlib' was enabled, but the pre-condition 'features.xlib && libs.xcb_xlib' failed. Trying source 0 (type makeSpec) of library xlib ... None of [libXext.so libXext.a] found in [] and global paths. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: arm: use OE specified -mcpu optionJohannes Pointner2019-05-062-0/+42
| | | | | | | OE-Core sets -mcpu option, which is equivalent to -march and -mtune combination. Therefore don't set -march and -mtune in chromium. Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
* qtbase-tools: Fix error during pkg_postinstKurt Kiefer2019-05-021-1/+1
| | | | | | | | | | When staging the sdk, the following error is seen: sed: can't read <path-to-work>/sdk/image/usr/local/oecore-x86_64/sysroots/aarch64-oe-linux/usr/bin/qt.conf: No such file or directory because the qt.conf file moved from /usr/bin/qt.conf to /usr/bin/qt5/qt.conf This change locates the qt.conf file during pkg_postinst using the OE_QMAKE_PATH_BINS variable, just as when the file is created.
* qtwebengine: restore the fix for build with clang/libc++ on aarch64/armMartin Jansa2019-05-024-11/+11
| | | | | | | | | | * it was fixed in: https://github.com/meta-qt5/meta-qt5/commit/5be2654885b3699520c4370579c929e2ce352e80 * but then when upgrading to 5.12.3 from meta-qt5/qtwebengine I've accidentally overwritten this one with the older version in: https://github.com/meta-qt5/meta-qt5/commit/e2707a016c3475c167a421c9c73d88f81cc61bd1 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branchMartin Jansa2019-04-266-18/+6
| | | | | | * v5.12.3 tags in qt3d, qtknx, qtmqtt, qtopcua, qttools, qtremoteobjects are fine now Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwayland: check also that the destination for private headers exists before ↵Martin Jansa2019-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | installing them * it looks like with 5.12 the QtCompositor headers are actually in QtWaylandCompositor directory and ${D}${includedir}/QtCompositor/${SHRT_VER}/QtCompositor/private/ doesn't exist causing do_install to fail $ ls /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwayland/5.12.3+gitAUTOINC+bcdc00bcdc-r0/image/usr/include/QtWaylandCompositor/5.12.3/QtWaylandCompositor/private/ qtwaylandcompositor-config_p.h qwaylandpointer_p.h qwayland-server-wayland.h qwaylandxdgdecorationv1_p.h qwldatadevice_p.h wayland-hardware-integration-server-protocol.h qtwaylandcompositorglobal_p.h qwaylandqtwindowmanager_p.h qwayland-server-xdg-decoration-unstable-v1.h qwaylandxdgshellintegration_p.h qwldataoffer_p.h wayland-ivi-application-server-protocol.h qwaylandcompositorextension_p.h qwaylandquickhardwarelayer_p.h qwayland-server-xdg-shell.h qwaylandxdgshell_p.h qwldatasource_p.h wayland-qt-key-unstable-v1-server-protocol.h qwaylandcompositor_p.h qwaylandquickitem_p.h qwayland-server-xdg-shell-unstable-v5_p.h qwaylandxdgshellv5integration_p.h qwlhardwarelayerintegrationfactory_p.h wayland-qt-windowmanager-server-protocol.h qwaylanddestroylistener_p.h qwaylandquickshellsurfaceitem_p.h qwayland-server-xdg-shell-unstable-v6.h qwaylandxdgshellv5_p.h qwlhardwarelayerintegration_p.h wayland-server-buffer-extension-server-protocol.h qwaylandinputmethodcontrol_p.h qwaylandseat_p.h qwaylandshell_p.h qwaylandxdgshellv6integration_p.h qwlhardwarelayerintegrationplugin_p.h wayland-text-input-unstable-v2-server-protocol.h qwaylandiviapplication_p.h qwayland-server-hardware-integration.h qwaylandsurface_p.h qwaylandxdgshellv6_p.h qwlhwintegration_p.h wayland-touch-extension-server-protocol.h qwaylandivisurfaceintegration_p.h qwayland-server-ivi-application.h qwaylandtextinputmanager_p.h qwlbuffermanager_p.h qwlqtkey_p.h wayland-wayland-server-protocol.h qwaylandivisurface_p.h qwayland-server-qt-key-unstable-v1.h qwaylandtextinput_p.h qwlclientbufferintegrationfactory_p.h qwlqttouch_p.h wayland-xdg-decoration-unstable-v1-server-protocol.h qwaylandkeyboard_p.h qwayland-server-qt-windowmanager.h qwaylandtouch_p.h qwlclientbufferintegration_p.h qwlregion_p.h wayland-xdg-shell-server-protocol.h qwaylandkeymap_p.h qwayland-server-server-buffer-extension.h qwaylandview_p.h qwlclientbufferintegrationplugin_p.h qwlserverbufferintegrationfactory_p.h wayland-xdg-shell-unstable-v5-server-protocol_p.h qwaylandoutputmode_p.h qwayland-server-text-input-unstable-v2.h qwaylandwlshellintegration_p.h qwlclientbuffer_p.h qwlserverbufferintegration_p.h wayland-xdg-shell-unstable-v6-server-protocol.h qwaylandoutput_p.h qwayland-server-touch-extension.h qwaylandwlshell_p.h qwldatadevicemanager_p.h qwlserverbufferintegrationplugin_p.h Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwayland: improve manual header installationMartin Jansa2019-04-221-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * allow to disable this completely with QTWAYLAND_INSTALL_PRIVATE_HEADERS_MANUALLY e.g. in case you already have your own bbappend resolving this differently * use SHRT_VER variable and allow to change it in .bbappend e.g. in webOS we have different version with different format without "+git" and 5.11.3-2 ended in upstream_pv which caused do_install to fail because ${D}${includedir}/QtWaylandClient/5.11.3-2 doesn't exist, split the PV by + as well - to cover both schemes and allow users to set SHRT_VER to something else if they have even weirder PV * install the QtCompositor headers in the same way as QtWaylandClient we have custom compositor and with 5.11 it was failing to build because of missing headers, so I had this in .bbappend already (I thought it was only our issue, because we were using 5.4 based QtWayland with 5.11, but the same happends with 5.6 based one and probably newer as well (I don't know what qtwayland version Andreas was using when first sending the previous qtwayland patch). * with 5.4 QtWayland and 5.11, I've updated sync.profile with %inject_headers and @private_headers built even with this sync.profile change the syncqt.pl in do_install doesn't install these 5.4 specific profile headers and qtwayland-webos and luna-surfacemanager fail to build. This is the diff between: recipe-sysroot-native/usr/bin/syncqt.pl -version 4.5.2 -showonly with Qt 5.6 and 5.11 @@ -1,6 +1,5 @@ -<srcbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git -<bldbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git -<outbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git +<srcbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git +<outbase> = BUILD/work/qemux86-webos-linux/qtwayland/5.4.2-119-r0/git pmtrace_qtwaylandclient_provider.h [QtWaylandClient] qtwaylandclienttracer.h [QtWaylandClient] qwaylandabstractdecoration_p.h [QtWaylandClient] @@ -34,34 +33,6 @@ qwaylandwlshellsurface_p.h [QtWaylandClient] qwaylandxdgshell_p.h [QtWaylandClient] qwaylandxdgsurface_p.h [QtWaylandClient] -qwayland-hardware-integration.h [QtWaylandClient] -qwayland-output-extension.h [QtWaylandClient] -qwayland-qt-windowmanager.h [QtWaylandClient] -qwayland-qtkey-extension.h [QtWaylandClient] -qwayland-server-buffer-extension.h [QtWaylandClient] -qwayland-sub-surface-extension.h [QtWaylandClient] -qwayland-surface-extension.h [QtWaylandClient] -qwayland-text.h [QtWaylandClient] -qwayland-text-input-unstable-v2.h [QtWaylandClient] -qwayland-touch-extension.h [QtWaylandClient] -qwayland-wayland.h [QtWaylandClient] -qwayland-windowmanager.h [QtWaylandClient] -qwayland-xdg-shell-unstable-v6.h [QtWaylandClient] -qwayland-xdg-shell.h [QtWaylandClient] -wayland-hardware-integration-client-protocol.h [QtWaylandClient] -wayland-output-extension-client-protocol.h [QtWaylandClient] -wayland-qt-windowmanager-client-protocol.h [QtWaylandClient] -wayland-qtkey-extension-client-protocol.h [QtWaylandClient] -wayland-server-buffer-extension-client-protocol.h [QtWaylandClient] -wayland-sub-surface-extension-client-protocol.h [QtWaylandClient] -wayland-surface-extension-client-protocol.h [QtWaylandClient] -wayland-text-client-protocol.h [QtWaylandClient] -wayland-text-input-unstable-v2-client-protocol.h [QtWaylandClient] -wayland-touch-extension-client-protocol.h [QtWaylandClient] -wayland-wayland-client-protocol.h [QtWaylandClient] -wayland-windowmanager-client-protocol.h [QtWaylandClient] -wayland-xdg-shell-client-protocol.h [QtWaylandClient] -wayland-xdg-shell-unstable-v6-client-protocol.h [QtWaylandClient] qwaylandclientbufferintegration_p.h [QtWaylandClient] qwaylandclientbufferintegrationfactory_p.h [QtWaylandClient] qwaylandclientbufferintegrationplugin_p.h [QtWaylandClient] @@ -84,38 +55,6 @@ SYMBOL: QWaylandEglWindow qwaylandglcontext.h [QtWaylandClient] SYMBOL: QWaylandGLContext -qwayland-server-wayland.h [QtCompositor] -qwayland-server-hardware-integration.h [QtCompositor] -qwayland-server-input-method.h [QtCompositor] -qwayland-server-ivi-application.h [QtCompositor] -qwayland-server-output-extension.h [QtCompositor] -qwayland-server-qt-windowmanager.h [QtCompositor] -qwayland-server-qtkey-extension.h [QtCompositor] -qwayland-server-server-buffer-extension.h [QtCompositor] -qwayland-server-sub-surface-extension.h [QtCompositor] -qwayland-server-surface-extension.h [QtCompositor] -qwayland-server-text.h [QtCompositor] -qwayland-server-text-input-unstable-v2.h [QtCompositor] -qwayland-server-touch-extension.h [QtCompositor] -qwayland-server-windowmanager.h [QtCompositor] -qwayland-server-xdg-shell-unstable-v6.h [QtCompositor] -qwayland-server-xdg-shell.h [QtCompositor] -wayland-hardware-integration-server-protocol.h [QtCompositor] -wayland-input-method-server-protocol.h [QtCompositor] -wayland-ivi-application-server-protocol.h [QtCompositor] -wayland-output-extension-server-protocol.h [QtCompositor] -wayland-qt-windowmanager-server-protocol.h [QtCompositor] -wayland-qtkey-extension-server-protocol.h [QtCompositor] -wayland-server-buffer-extension-server-protocol.h [QtCompositor] -wayland-sub-surface-extension-server-protocol.h [QtCompositor] -wayland-surface-extension-server-protocol.h [QtCompositor] -wayland-text-input-unstable-v2-server-protocol.h [QtCompositor] -wayland-text-server-protocol.h [QtCompositor] -wayland-touch-extension-server-protocol.h [QtCompositor] -wayland-wayland-server-protocol.h [QtCompositor] -wayland-windowmanager-server-protocol.h [QtCompositor] -wayland-xdg-shell-server-protocol.h [QtCompositor] -wayland-xdg-shell-unstable-v6-server-protocol.h [QtCompositor] pmtrace_qtwayland_provider.h [QtCompositor] qtwaylandtracer.h [QtCompositor] qwaylandbufferref.h [QtCompositor] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 14:22:25 +0000