diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh new file mode 100644 index 000000000..6ffe8f271 --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh @@ -0,0 +1,2 @@ +# Use EGLFS platform plugin for images without X11 +[ -f "/etc/init.d/xserver-nodm" ] || export QT_QPA_PLATFORM="eglfs" diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend index 4778ccea4..53dab262c 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend @@ -1,3 +1,12 @@ # Copyright (C) 2015 Digi International +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +SRC_URI_append = " file://qt5.sh" + PACKAGECONFIG_append = " accessibility examples icu sql-sqlite" + +do_install_append() { + install -d ${D}${sysconfdir}/profile.d + install -m 0755 ${WORKDIR}/qt5.sh ${D}${sysconfdir}/profile.d/ +} diff --git a/meta-digi-dey/recipes-qt/qt5/qtmultimedia/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtmultimedia/qt5.sh deleted file mode 100644 index 0acab7bce..000000000 --- a/meta-digi-dey/recipes-qt/qt5/qtmultimedia/qt5.sh +++ /dev/null @@ -1 +0,0 @@ -export QT_GSTREAMER_CAMERABIN_VIDEOSRC="imxv4l2src" diff --git a/meta-digi-dey/recipes-qt/qt5/qtmultimedia_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtmultimedia_%.bbappend index bad2682c6..9c2a7034e 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtmultimedia_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtmultimedia_%.bbappend @@ -1,14 +1,11 @@ # Copyright (C) 2015 Digi International -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -SRC_URI_append_ccimx6 = " file://qt5.sh" - PACKAGECONFIG_append = " gstreamer" -do_install_append_ccimx6() { - install -d ${D}${sysconfdir}/profile.d - install -m 0755 ${WORKDIR}/qt5.sh ${D}${sysconfdir}/profile.d/ +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 } PACKAGE_ARCH = "${MACHINE_ARCH}"