diff --git a/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend b/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend index 481ffc15d..658b4ba65 100644 --- a/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend +++ b/meta-digi-dey/recipes-qt/demo-extrafiles/qt5-demo-extrafiles.bbappend @@ -8,9 +8,6 @@ SRC_URI += " \ " do_install_append () { - # Fix path for OpenGLES example - sed -i -e '/Exec/{s,hellogl_es2,hellogl2,g}' ${D}${datadir}/applications/hellogl_es2.desktop - # Add qmlvideo shortcut install -m 0644 ${WORKDIR}/qmlvideo.desktop ${D}${datadir}/applications/ install -m 0644 ${WORKDIR}/qmlvideo.png ${D}${datadir}/pixmaps/ diff --git a/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.14.imx.bb b/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.14.imx.bb index e377d70c7..b7010e0ed 100644 --- a/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.14.imx.bb +++ b/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.14.imx.bb @@ -1,24 +1,24 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc -FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5/${PN}:" +FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/files:" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https" -SRCBRANCH = "MM_04.04.00_1805_L4.9.88_MX8QXP_BETA2" +SRCBRANCH = "MM_04.04.04_1811_L4.14.78_GA" SRC_URI = " \ ${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \ file://0001-configure.ac-Add-prefix-to-correct-the-QT_PATH.patch \ " -SRCREV = "037e2bf9a152de410623235974c68be21948985a" +SRCREV = "cec0ef39784a3acfd2b442d107f054c6ab10181e" -# gstgldisplay_viv_fb.h from gst-base is needed by qmlgl plugin -DEPENDS_append = " gstreamer1.0-plugins-base" -# Need libdrm_fourcc.h for DMA buf support in opengl plugins -DEPENDS_append_mx7ulp = " libdrm" -DEPENDS_append_mx8 = " libdrm" +DEPENDS += "gstreamer1.0-plugins-base virtual/kernel \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ +" +# Make sure kernel sources are available +do_configure[depends] += "virtual/kernel:do_shared_workdir" # Qt5 configuratin only support "--disable-qt" # And in default, it is disabled, need to remove the default setting to enable it. @@ -40,7 +40,7 @@ PACKAGECONFIG[qt5] = '--enable-qt \ --with-moc="${STAGING_DIR_NATIVE}/usr/bin/qt5/moc" \ --with-uic="${STAGING_DIR_NATIVE}/usr/bin/qt5/uic" \ --with-rcc="${STAGING_DIR_NATIVE}/usr/bin/qt5/rcc" \ - ,--disable-qt,qtbase qtdeclarative qtbase-native' + ,--disable-qt,qtbase qtdeclarative qtbase-native qtx11extras' # This remove "--exclude=autopoint" option from autoreconf argument to avoid # configure.ac:30: error: required file './ABOUT-NLS' not found diff --git a/meta-digi-dey/recipes-qt/qt5/imx-qtapplications_1.2.0-aarch32.bb b/meta-digi-dey/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch32.bb similarity index 89% rename from meta-digi-dey/recipes-qt/qt5/imx-qtapplications_1.2.0-aarch32.bb rename to meta-digi-dey/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch32.bb index 23b556d09..3228c4719 100644 --- a/meta-digi-dey/recipes-qt/qt5/imx-qtapplications_1.2.0-aarch32.bb +++ b/meta-digi-dey/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch32.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Freescale QT Multimedia applications" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=6b552f505eedab4a11ab538cf3db743a" +LIC_FILES_CHKSUM = "file://COPYING;md5=5ab1a30d0cd181e3408077727ea5a2db" inherit fsl-eula-unpack pkgconfig @@ -15,8 +15,8 @@ SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ file://qtimxplayer.desktop \ file://qtimxcamera.desktop \ " -SRC_URI[md5sum] = "e65c9a365a4ed76efd4e5de8c3b35293" -SRC_URI[sha256sum] = "4a43cc4ec58827dda287e2f3c4700bfa821c5075ffefa06056a33290ccaede9a" +SRC_URI[md5sum] = "b81dd59f4f3e3bd46550ffb615d0d0b3" +SRC_URI[sha256sum] = "fa44c036766f8c4e1c277edd76960c58130a3b46a4dc0d87edb849360efcdd36" USE_X11 = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" PLATFORM_HAS_VPU = " " diff --git a/meta-digi-dey/recipes-qt/qt5/imx-qtapplications_1.2.0-aarch64.bb b/meta-digi-dey/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch64.bb similarity index 77% rename from meta-digi-dey/recipes-qt/qt5/imx-qtapplications_1.2.0-aarch64.bb rename to meta-digi-dey/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch64.bb index d0daa91f0..1faa85c19 100644 --- a/meta-digi-dey/recipes-qt/qt5/imx-qtapplications_1.2.0-aarch64.bb +++ b/meta-digi-dey/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch64.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Freescale QT Multimedia applications" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=08fd295cce89b0a9c74b9b83ed74f671" +LIC_FILES_CHKSUM = "file://COPYING;md5=5ab1a30d0cd181e3408077727ea5a2db" inherit fsl-eula-unpack pkgconfig @@ -13,8 +13,8 @@ DEPENDS += "qtmultimedia gstreamer1.0 gstreamer1.0-plugins-base imx-gst1.0-plugi SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ " -SRC_URI[md5sum] = "a4df8c4b998d9de7fde469d20d3cd8b1" -SRC_URI[sha256sum] = "8f64a8d232dc1e3f03873b6702c281750bae9d720e89e414c0104f0ded3d2f84" +SRC_URI[md5sum] = "3f17dca2b5668b97dda46eff8719e53f" +SRC_URI[sha256sum] = "a9c5511668b7f37d3d8a610da99952d78e044147fad9fc1b4e88aaa80ebc01b9" do_install () { install -d ${D}${datadir}/qt5/examples/multimedia/ diff --git a/meta-digi-dey/recipes-qt/qt5/nativesdk-qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/nativesdk-qtbase_%.bbappend index 8fcfd62b4..8745c0655 100644 --- a/meta-digi-dey/recipes-qt/qt5/nativesdk-qtbase_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/nativesdk-qtbase_%.bbappend @@ -1,9 +1,5 @@ -# Copyright (C) 2018 Digi International - -do_install_append_class-nativesdk() { - mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d -} - +# Move the implementation to do_install +# fix environment-setup.d conflict between nativesdk-qtbase and nativesdk-cmake do_generate_qt_environment_file[noexec] = "1" do_install_append () { do_generate_qt_environment_file diff --git a/meta-digi-dey/recipes-qt/qt5/qt5-demo-extrafiles.bbappend b/meta-digi-dey/recipes-qt/qt5/qt5-demo-extrafiles.bbappend new file mode 100644 index 000000000..f9926e905 --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qt5-demo-extrafiles.bbappend @@ -0,0 +1,32 @@ +# Install hellowindow demo as a default QT APP on all platforms +do_install () { + install -d ${D}/${datadir}/pixmaps + install -d ${D}/${datadir}/applications + install -m 0644 ${WORKDIR}/hellowindow.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/hellowindow.desktop ${D}/${datadir}/applications +} + +# Install other qt5 demos on SoC with GPU +# Align with former release, do not install +# hellogl_es2.desktop & qt5basket.desktop & qt5nesting.desktop & qt5solarsystem.desktop +# as they are not supported + +do_install_append_imxgpu2d () { + install -m 0644 ${WORKDIR}/cinematicexperience.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/cinematicexperience.desktop ${D}/${datadir}/applications + install -m 0644 ${WORKDIR}/qt5everywheredemo.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/qt5everywheredemo.desktop ${D}/${datadir}/applications + install -m 0644 ${WORKDIR}/qt5nmapcarousedemo.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/qt5nmapcarousedemo.desktop ${D}/${datadir}/applications + install -m 0644 ${WORKDIR}/qt5nmapper.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/qt5nmapper.desktop ${D}/${datadir}/applications + install -m 0644 ${WORKDIR}/qtledbillboard.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/qtledbillboard.desktop ${D}/${datadir}/applications + install -m 0644 ${WORKDIR}/qtledcombo.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/qtledcombo.desktop ${D}/${datadir}/applications + install -m 0644 ${WORKDIR}/quitbattery.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/quitbattery.desktop ${D}/${datadir}/applications + install -m 0644 ${WORKDIR}/quitindicators.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/quitindicators.desktop ${D}/${datadir}/applications +} + diff --git a/meta-digi-dey/recipes-qt/qt5/qt5everywheredemo_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qt5everywheredemo_%.bbappend new file mode 100644 index 000000000..7bb9126df --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qt5everywheredemo_%.bbappend @@ -0,0 +1,4 @@ + +# Remove dependency on qtgraphicaleffects for sololite +DEPENDS_remove_mx6sl = "qtgraphicaleffects" +RDEPENDS_${PN}_remove_mx6sl = "qtgraphicaleffects-qmlplugins" \ No newline at end of file diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch b/meta-digi-dey/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch new file mode 100644 index 000000000..c99c04704 --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch @@ -0,0 +1,30 @@ +From 3f9703fecd670b36030e1093466f6d11b370c19f Mon Sep 17 00:00:00 2001 +From: Yuqing Zhu +Date: Mon, 27 Mar 2017 15:33:35 +0800 +Subject: [PATCH] egl.prf: Fix build error when egl headers need platform + definition + +Gain the value through pkg-config and pass it through QMAKE_CFLAGS_EGL. + +Signed-off-by: Yuqing Zhu +--- + mkspecs/features/egl.prf | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf +index 9fa0c9e..85d5852 100644 +--- a/mkspecs/features/egl.prf ++++ b/mkspecs/features/egl.prf +@@ -1,3 +1,9 @@ ++# egl headers need a definition ++PKG_CONFIG = $$pkgConfigExecutable() ++PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags egl) ++PKGCONFIG_CFLAGS = $$find(PKGCONFIG_CFLAGS, ^-D.*) ++QMAKE_CFLAGS_EGL = $$PKGCONFIG_CFLAGS ++ + INCLUDEPATH += $$QMAKE_INCDIR_EGL + LIBS_PRIVATE += $$QMAKE_LIBS_EGL + QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL +-- +1.9.1 + diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch b/meta-digi-dey/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch new file mode 100644 index 000000000..370a2fc8a --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qtbase/0014-Add-IMX-GPU-support.patch @@ -0,0 +1,22 @@ +From bd9d14bbb7cc121d97d7f9e3b49509d8491a9aaa Mon Sep 17 00:00:00 2001 +From: Tom Hochstein +Date: Tue, 2 May 2017 22:17:34 -0500 + +--- + mkspecs/linux-oe-g++/qmake.conf | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf +index 30d31ed..7a93f2b 100644 +--- a/mkspecs/linux-oe-g++/qmake.conf ++++ b/mkspecs/linux-oe-g++/qmake.conf +@@ -38,5 +38,9 @@ isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG) + + include(../oe-device-extra.pri) + ++QMAKE_LIBS_EGL += -lEGL ++QMAKE_LIBS_OPENGL_ES2 += -lEGL -lGLESv2 ++QMAKE_LIBS_OPENVG += -lEGL -lOpenVG ++ + load(device_config) + load(qt_config) diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch b/meta-digi-dey/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch new file mode 100644 index 000000000..794fa6222 --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch @@ -0,0 +1,13 @@ +Index: git/mkspecs/linux-oe-g++/qmake.conf +=================================================================== +--- git.orig/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 17:03:17.000000000 -0600 ++++ git/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 17:06:23.000000000 -0600 +@@ -39,6 +39,8 @@ + + include(../oe-device-extra.pri) + ++EGLFS_DEVICE_INTEGRATION = eglfs_viv ++ + QMAKE_LIBS_EGL += -lEGL + QMAKE_LIBS_OPENGL_ES2 += -lEGL -lGLESv2 + QMAKE_LIBS_OPENVG += -lEGL -lOpenVG diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/0016-Configure-eglfs-with-egl-pkg-config.patch b/meta-digi-dey/recipes-qt/qt5/qtbase/0016-Configure-eglfs-with-egl-pkg-config.patch new file mode 100644 index 000000000..a245d79aa --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qtbase/0016-Configure-eglfs-with-egl-pkg-config.patch @@ -0,0 +1,13 @@ +Index: git/src/plugins/platforms/eglfs/eglfs-plugin.pro +=================================================================== +--- git.orig/src/plugins/platforms/eglfs/eglfs-plugin.pro 2017-01-04 16:54:05.000000000 -0600 ++++ git/src/plugins/platforms/eglfs/eglfs-plugin.pro 2017-01-04 16:56:25.000000000 -0600 +@@ -2,6 +2,8 @@ + + QT += platformsupport-private eglfs_device_lib-private + ++CONFIG += egl ++ + SOURCES += $$PWD/qeglfsmain.cpp + + OTHER_FILES += $$PWD/eglfs.json diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh new file mode 100644 index 000000000..34fa033af --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh @@ -0,0 +1,2 @@ +#!/bin/sh +export QT_QPA_PLATFORM=eglfs diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh new file mode 100644 index 000000000..6779c9d12 --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh @@ -0,0 +1,2 @@ +#!/bin/sh +export QT_QPA_PLATFORM=wayland diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh new file mode 100644 index 000000000..8bbd73b94 --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh @@ -0,0 +1,2 @@ +#!/bin/sh +export QT_QPA_PLATFORM=xcb diff --git a/meta-digi-dey/recipes-qt/qt5/qtmultimedia_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtmultimedia_%.bbappend index 738b22a5d..13f91d6df 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtmultimedia_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtmultimedia_%.bbappend @@ -1,17 +1,6 @@ -# Copyright (C) 2015-2018 Digi International - -PACKAGECONFIG_append = " gstreamer" - -pkg_postinst_${PN}_ccimx6() { - mkdir -p $D${sysconfdir}/profile.d - echo '# Use FSL gstreamer plugin video source' >> $D${sysconfdir}/profile.d/qt5.sh - echo 'export QT_GSTREAMER_CAMERABIN_VIDEOSRC="imxv4l2src"' >> $D${sysconfdir}/profile.d/qt5.sh -} - do_install_append() { - if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then - sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc - fi +if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then + sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc +fi } -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-digi-dey/recipes-qt/qt5/qtsmarthome_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtsmarthome_%.bbappend new file mode 100644 index 000000000..7bb9126df --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qtsmarthome_%.bbappend @@ -0,0 +1,4 @@ + +# Remove dependency on qtgraphicaleffects for sololite +DEPENDS_remove_mx6sl = "qtgraphicaleffects" +RDEPENDS_${PN}_remove_mx6sl = "qtgraphicaleffects-qmlplugins" \ No newline at end of file diff --git a/meta-digi-dey/recipes-qt/qt5/qtwayland/0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch b/meta-digi-dey/recipes-qt/qt5/qtwayland/0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch new file mode 100644 index 000000000..b60ec0b0c --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qtwayland/0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch @@ -0,0 +1,41 @@ +From 39847456fd69ede802d88af5106f608d49038ab1 Mon Sep 17 00:00:00 2001 +From: Neena Busireddy +Date: Thu, 9 Aug 2018 19:01:45 +0000 +Subject: [PATCH] hardwareintegration: Do not include shm-emulation-server + +shm-emulation-server is failing on sololite because of its dependency on +opengl + +qtwayland/5.10.1+gitAUTOINC+db36bc0d9c-r0/git/src/hardwareintegration/client/shm-emulation-server/shmserverbufferintegration.cpp:81:10: + error: 'QOpenGLContext' has not been declared + if (!QOpenGLContext::currentContext()) + ^~~~~~~~~~~~~~ +Signed-off-by: Neena Busireddy +--- + src/plugins/hardwareintegration/client/client.pro | 2 +- + src/plugins/hardwareintegration/compositor/compositor.pro | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro +index f1c71f0..5bf9e12 100644 +--- a/src/plugins/hardwareintegration/client/client.pro ++++ b/src/plugins/hardwareintegration/client/client.pro +@@ -15,4 +15,4 @@ qtConfig(libhybris-egl-server): \ + SUBDIRS += libhybris-egl-server + + ### TODO: make shm-emulation configurable +-SUBDIRS += shm-emulation-server ++# SUBDIRS += shm-emulation-server +diff --git a/src/plugins/hardwareintegration/compositor/compositor.pro b/src/plugins/hardwareintegration/compositor/compositor.pro +index 0b2a429..f50561a 100644 +--- a/src/plugins/hardwareintegration/compositor/compositor.pro ++++ b/src/plugins/hardwareintegration/compositor/compositor.pro +@@ -15,4 +15,4 @@ qtConfig(libhybris-egl-server): \ + SUBDIRS += libhybris-egl-server + + ### TODO: make shm-emulation configurable +-SUBDIRS += shm-emulation-server ++# SUBDIRS += shm-emulation-server +-- +1.9.1 + diff --git a/meta-digi-dey/recipes-qt/qt5/qtwayland_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtwayland_%.bbappend index 90e7b66b4..bedbae95e 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtwayland_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtwayland_%.bbappend @@ -2,7 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append = " file://0001-Fix-crash-when-wl_surface-was-destroyed-before-eglDe.patch \ file://0001-tst_client.cpp-Fix-no-opengl-build.patch \ " - +SRC_URI_append_mx6sl = " file://0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch \ +" PACKAGECONFIG_remove_mx6 = "xcomposite-egl xcomposite-glx" PACKAGECONFIG_remove_mx6sl = "wayland-egl" PACKAGECONFIG_remove_mx7 = "xcomposite-egl xcomposite-glx" diff --git a/meta-digi-dey/recipes-qt/qt5/qtwebengine_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtwebengine_%.bbappend index 531b2a9c9..7f79977e9 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtwebengine_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtwebengine_%.bbappend @@ -1,20 +1,9 @@ -# Copyright (C) 2015-2018 Digi International - do_install_append() { - if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then - sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc - fi +if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then + sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc +fi } COMPATIBLE_MACHINE_aarch64 = "(.*)" -# Decrease memory used by the linker to avoid being killed due to -# out of memory. -LDFLAGS += "-Wl,--no-keep-memory" -# To avoid the OOM killer, decrease parallel make jobs for this specific recipe. -python __anonymous () { - makejobs = int(d.getVar('PARALLEL_MAKE', True).split()[1]) // 2 - d.setVar("PARALLEL_MAKE", "-j %d" % (makejobs, 1)[makejobs == 0]) -} -export NINJAFLAGS = "${PARALLEL_MAKE}"