From 1d95221ccdc667f806fbbb0e316775c7cf944a8a Mon Sep 17 00:00:00 2001 From: Codrin Ciubotariu Date: Wed, 15 Apr 2020 17:03:15 +0300 Subject: [PATCH] QT: Remove all QT applications QT applications are no loner supported. They are replaced with EGT ones. Signed-off-by: Codrin Ciubotariu Acked-by: Nicolas Ferre --- .../apps/applicationlauncher_1.4.bb | 40 ------ .../recipes-qt4/apps/homeautomation_1.5.bb | 41 ------ .../recipes-qt4/apps/minehunt_1.2.bb | 43 ------- .../recipes-qt4/apps/qmlbrowser_1.2.bb | 36 ------ .../recipes-qt4/apps/samegame_1.1.bb | 39 ------ .../recipes-qt4/apps/smartrefrigerator_1.2.bb | 47 ------- .../images/atmel-qt4e-demo-image.bb | 119 ------------------ .../meta/meta-toolchain-qte.bbappend | 4 - .../qt4/nativesdk-qt4-tools_%.bbappend | 2 - ...bedded-linux-4.8.4-phonon-colors-fix.patch | 26 ---- .../qt4/qt4-embedded_4.8.7.bbappend | 2 - .../pyqt5/python3-pyqt5_%.bbappend | 5 - .../recipes-qt/apps/applicationlauncher.inc | 33 ----- .../apps/applicationlauncher_git.bb | 16 --- ...oard.pro-Add-qt-to-CONFIG-in-project.patch | 23 ---- ...st.pro-Add-builddir-to-install-files.patch | 28 ----- .../applicationlauncher_videoplayer.patch | 23 ---- .../apps/files/fs-overlay/etc/mchp_qtdemo | 60 --------- .../apps/files/fs-overlay/etc/qtprofile.sh | 4 - .../opt/ApplicationLauncher/demo.config | 2 - .../recipes-qt/apps/files/header.patch | 22 ---- .../recipes-qt/apps/homeautomation_1.10.bb | 42 ------- .../recipes-qt/apps/homeautomation_git.bb | 38 ------ .../recipes-qt/apps/iocontrol_1.2.bb | 33 ----- .../recipes-qt/apps/mchp-qt-demo-init_1.0.bb | 27 ---- .../qt5-layer/recipes-qt/apps/minehunt_1.7.bb | 42 ------- .../qt5-layer/recipes-qt/apps/ptpdemo_1.5.bb | 44 ------- .../recipes-qt/apps/qmlbrowser_1.7.bb | 46 ------- .../recipes-qt/apps/qtviewplanes_1.0.bb | 32 ----- .../qt5-layer/recipes-qt/apps/samegame_1.6.bb | 38 ------ .../recipes-qt/apps/smartrefrigerator_1.6.bb | 55 -------- .../recipes-qt/apps/spacetouch_1.0.bb | 32 ----- .../recipes-qt/apps/videoplayer_git.bb | 42 ------- .../recipes-qt/apps/whiteboard_1.0.bb | 38 ------ .../qt5-layer/recipes-qt/apps/wildwest_1.0.bb | 34 ----- ...packagegroup-qt5-toolchain-target.bbappend | 4 - ...01-make-QGraphicsItem-update-virtual.patch | 22 ---- ...s-to-linuxfb-dri-fd-through-platform.patch | 103 --------------- ...RM-KMS-planes-in-linuxfb-DRM-backend.patch | 71 ----------- .../qt5/files/atmel-color-format-force.patch | 11 -- .../recipes-qt/qt5/qtbase_%.bbappend | 39 ------ ...-issue-when-no-opengl-in-QVideoSurfa.patch | 39 ------ .../recipes-qt/qt5/qtmultimedia_%.bbappend | 4 - 43 files changed, 1451 deletions(-) delete mode 100644 dynamic-layers/qt4-layer/recipes-qt4/apps/applicationlauncher_1.4.bb delete mode 100644 dynamic-layers/qt4-layer/recipes-qt4/apps/homeautomation_1.5.bb delete mode 100644 dynamic-layers/qt4-layer/recipes-qt4/apps/minehunt_1.2.bb delete mode 100644 dynamic-layers/qt4-layer/recipes-qt4/apps/qmlbrowser_1.2.bb delete mode 100644 dynamic-layers/qt4-layer/recipes-qt4/apps/samegame_1.1.bb delete mode 100644 dynamic-layers/qt4-layer/recipes-qt4/apps/smartrefrigerator_1.2.bb delete mode 100644 dynamic-layers/qt4-layer/recipes-qt4/images/atmel-qt4e-demo-image.bb delete mode 100644 dynamic-layers/qt4-layer/recipes-qt4/meta/meta-toolchain-qte.bbappend delete mode 100644 dynamic-layers/qt4-layer/recipes-qt4/qt4/nativesdk-qt4-tools_%.bbappend delete mode 100644 dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-embedded-4.8.7/qt-embedded-linux-4.8.4-phonon-colors-fix.patch delete mode 100644 dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-embedded_4.8.7.bbappend delete mode 100644 dynamic-layers/qt5-layer/recipes-python/pyqt5/python3-pyqt5_%.bbappend delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/applicationlauncher.inc delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/applicationlauncher_git.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/files/0001-whiteboard.pro-Add-qt-to-CONFIG-in-project.patch delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/files/0001-wildwest.pro-Add-builddir-to-install-files.patch delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/files/applicationlauncher_videoplayer.patch delete mode 100755 dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/etc/mchp_qtdemo delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/etc/qtprofile.sh delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/opt/ApplicationLauncher/demo.config delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/files/header.patch delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/homeautomation_1.10.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/homeautomation_git.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/iocontrol_1.2.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/mchp-qt-demo-init_1.0.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/minehunt_1.7.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/ptpdemo_1.5.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/qmlbrowser_1.7.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/qtviewplanes_1.0.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/samegame_1.6.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/smartrefrigerator_1.6.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/spacetouch_1.0.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/videoplayer_git.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/whiteboard_1.0.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/apps/wildwest_1.0.bb delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/files/0001-make-QGraphicsItem-update-virtual.patch delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/files/0004-Provide-access-to-linuxfb-dri-fd-through-platform.patch delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/files/0005-Support-DRM-KMS-planes-in-linuxfb-DRM-backend.patch delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/files/atmel-color-format-force.patch delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia/0001-fix-qt5.12.4-compile-issue-when-no-opengl-in-QVideoSurfa.patch delete mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend diff --git a/dynamic-layers/qt4-layer/recipes-qt4/apps/applicationlauncher_1.4.bb b/dynamic-layers/qt4-layer/recipes-qt4/apps/applicationlauncher_1.4.bb deleted file mode 100644 index 720666a8..00000000 --- a/dynamic-layers/qt4-layer/recipes-qt4/apps/applicationlauncher_1.4.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "Atmel QT home automation demo" -LICENSE = "ATMEL_LLA" -LIC_FILES_CHKSUM = "file://main.cpp;endline=144;md5=f329c5ddb6ba9266deb58683468d316d" - -PR = "r1" - -DEPENDS = "qt4-embedded" - -SRC_URI = "ftp://ftp.linux4sam.org/pub/demo/qtdemo/application-launcher-${PV}.tar.gz" - -SRC_URI[md5sum] = "ed5b80aa1d148f41cf0aea2e3118a786" -SRC_URI[sha256sum] = "8e6fc658d367ab6ff38489f7fe88ca4eca316963653b7e3eb627c698562e80d0" - -S = "${WORKDIR}/application-launcher-${PV}" - -inherit qt4e pkgconfig - -PACKAGES = "${PN}-dbg ${PN}" -FILES_${PN}-dbg = " \ - /opt/ApplicationLauncher/bin/.debug \ - /opt/ApplicationLauncher/bin/.debug/ApplicationLauncher \ - /usr/src/debug/* \ - /opt/ApplicationLauncher/applications/resources/same-game.png \ - /opt/ApplicationLauncher/applications/resources/about-atmel.png \ - /opt/ApplicationLauncher/applications/resources/web-browser.png \ - /opt/ApplicationLauncher/applications/resources/picture-viewer.png \ - /opt/ApplicationLauncher/applications/resources/home-automation.png \ - /opt/ApplicationLauncher/applications/resources/minehunter-game.png \ - /opt/ApplicationLauncher/applications/resources/medical-app.png \ - /opt/ApplicationLauncher/applications/resources/about-timesys.png \ -" - -FILES_${PN} = " \ - /opt \ - /opt/ApplicationLauncher \ -" - -do_install() { - make INSTALL_ROOT=${D} install -} diff --git a/dynamic-layers/qt4-layer/recipes-qt4/apps/homeautomation_1.5.bb b/dynamic-layers/qt4-layer/recipes-qt4/apps/homeautomation_1.5.bb deleted file mode 100644 index ccdb9a50..00000000 --- a/dynamic-layers/qt4-layer/recipes-qt4/apps/homeautomation_1.5.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "Atmel QT home automation demo" -LICENSE = "ATMEL_LLA" -LIC_FILES_CHKSUM = "file://main.cpp;endline=146;md5=1fcdee2511227a06256bca182ee2ad2c" - -PR = "r1" - -PACKAGES = "${PN}-dbg ${PN}" - -DEPENDS = "qt4-embedded libv4l" - -SRC_URI = "ftp://ftp.linux4sam.org/pub/demo/qtdemo/home-automation-${PV}.tar.gz" - -SRC_URI[md5sum] = "90f74e04beeb0e80ba75905ede188714" -SRC_URI[sha256sum] = "7efe67de3ccd2fb1441016f00112f75ddff7dae531d26889a0da1935f964fde4" - -S = "${WORKDIR}/home-automation-${PV}" - -inherit qt4e pkgconfig - -FILES_${PN}-dbg = " \ - /opt/HomeAutomation/HomeAutomation/.debug \ - /opt/HomeAutomation/.debug/HomeAutomation \ - /usr/* \ - " - -FILES_${PN} = " \ - /opt/HomeAutomation/HomeAutomation \ - /opt/HomeAutomation/HomeAutomation.sh \ - /opt/HomeAutomation/atmel-stylesheet.qss \ - /opt/HomeAutomation/resources/* \ - /opt/HomeAutomation/stations/* \ - /opt/HomeAutomation/CustomWidgets/* \ - /opt/HomeAutomation/media/* \ - /opt/HomeAutomation/images/* \ - /opt/ApplicationL* \ - " - -do_install() { - make INSTALL_ROOT=${D} install - -} diff --git a/dynamic-layers/qt4-layer/recipes-qt4/apps/minehunt_1.2.bb b/dynamic-layers/qt4-layer/recipes-qt4/apps/minehunt_1.2.bb deleted file mode 100644 index cbf07935..00000000 --- a/dynamic-layers/qt4-layer/recipes-qt4/apps/minehunt_1.2.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "Atmel QT home automation demo" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://main.cpp;endline=40;md5=ade79b42cecba4adb92be7b0e83bad33" - -PACKAGES = "${PN}-dbg ${PN}" - -PR = "r2" - -DEPENDS = "qt4-embedded" - -SRC_URI = "ftp://ftp.linux4sam.org/pub/demo/qtdemo/minehunt-${PV}.tar.gz" - -SRC_URI[md5sum] = "a55072e4ac03e38560705a1f3e773da0" -SRC_URI[sha256sum] = "7a3ce058bf3db14f7bb8e9eb2a13221428cf0b16840a4ed428ca20fa3456fea2" - -S = "${WORKDIR}/minehunt-${PV}" - -inherit qt4e pkgconfig - -FILES_${PN}-dbg = " \ - /opt/minehunt/.debug \ - /opt/minehunt/.debug/* \ - /usr/* \ - /opt/minehunt/minehunt.h \ - /opt/minehunt/minehunt.qmlproject \ - /opt/minehunt/minehunt.cpp \ - /opt/minehunt/main.cpp \ - /opt/minehunt/minehunt.pro \ - /opt/minehunt/qrc_minehunt.cpp \ - /opt/minehunt/moc_minehunt.cpp \ - /opt/minehunt/moc_qmlapplicationviewer.cpp \ -" - -FILES_${PN} = " \ - /opt/minehunt/minehunt \ - /opt/minehunt/resources/minehunt.sh \ - /opt/minehunt/qml/* \ - /opt/ApplicationL* \ -" - -do_install() { - make INSTALL_ROOT=${D} install -} diff --git a/dynamic-layers/qt4-layer/recipes-qt4/apps/qmlbrowser_1.2.bb b/dynamic-layers/qt4-layer/recipes-qt4/apps/qmlbrowser_1.2.bb deleted file mode 100644 index cc8f958e..00000000 --- a/dynamic-layers/qt4-layer/recipes-qt4/apps/qmlbrowser_1.2.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "Atmel QT home automation demo" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://qml/webbrowser/webbrowser.qml;endline=40;md5=a78c797054f097540ddb57fc9212183d" - -PACKAGES = "${PN}-dbg ${PN}" - -PR = "r1" - -DEPENDS = "qt4-embedded" - -SRC_URI = "ftp://ftp.linux4sam.org/pub/demo/qtdemo/qml-browser-${PV}.tar.gz" - -SRC_URI[md5sum] = "2b64c3586fbf97706383983dbefd0c28" -SRC_URI[sha256sum] = "d0859372b46b51f7ee304a5589ecd91604aca1f3033b10f1884d27b3f9756d4d" - -S = "${WORKDIR}/qml-browser-${PV}" - -inherit qt4e pkgconfig - -FILES_${PN}-dbg = " \ - /opt/browser/bin/.debug \ - /opt/browser/bin/.debug/browser \ - /usr/* \ -" - -FILES_${PN} = " \ - /opt/browser/bin/browser \ - /opt/browser/resources/* \ - /opt/browser/qml/* \ - /opt/ApplicationL* \ -" - -do_install() { - make INSTALL_ROOT=${D} install - -} diff --git a/dynamic-layers/qt4-layer/recipes-qt4/apps/samegame_1.1.bb b/dynamic-layers/qt4-layer/recipes-qt4/apps/samegame_1.1.bb deleted file mode 100644 index 81cc1718..00000000 --- a/dynamic-layers/qt4-layer/recipes-qt4/apps/samegame_1.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Atmel QT home automation demo" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://main.cpp;endline=39;md5=8f2a7549bdcd8bed89187e21d29be11f" - -PACKAGES = "${PN}-dbg ${PN}" - -PR = "r2" - -DEPENDS = "qt4-embedded" - -SRC_URI = "ftp://ftp.linux4sam.org/pub/demo/qtdemo/samegame-${PV}.tar.gz" - -SRC_URI[md5sum] = "09ba69e5876cff7757f8487c61d2fbf8" -SRC_URI[sha256sum] = "43939d24a1f8b0fcbc8251c2e3dce6fffa9562fe3dc6e16a8c0fe750108f6d04" - -S = "${WORKDIR}/samegame-${PV}" - -inherit qt4e pkgconfig - -FILES_${PN}-dbg = " \ - /opt/samegame/.debug \ - /opt/samegame/.debug/samegame \ - /usr/* \ - /opt/samegame/samegame.pro \ - /opt/samegame/samegame.qmlproject \ - /opt/samegame/main.cpp \ - /opt/samegame/moc_qmlapplicationviewer.cpp \ -" - -FILES_${PN} = " \ - /opt/samegame/samegame \ - /opt/samegame/resources/samegame.sh \ - /opt/samegame/qml/* \ - /opt/ApplicationL* \ -" - -do_install() { - make INSTALL_ROOT=${D} install -} diff --git a/dynamic-layers/qt4-layer/recipes-qt4/apps/smartrefrigerator_1.2.bb b/dynamic-layers/qt4-layer/recipes-qt4/apps/smartrefrigerator_1.2.bb deleted file mode 100644 index 89d38d40..00000000 --- a/dynamic-layers/qt4-layer/recipes-qt4/apps/smartrefrigerator_1.2.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "Atmel QT smart refrigerator demo" -LICENSE = "ATMEL_LLA" -LIC_FILES_CHKSUM = "file://main.cpp;endline=146;md5=e461c6aa7c87631950f0a71c1552f706" - -PR = "r2" - -PACKAGES = "${PN}-dbg ${PN}" - -DEPENDS = "qt4-embedded libv4l" - -SRC_URI = "ftp://ftp.linux4sam.org/pub/demo/qtdemo/smart-refrigerator-${PV}.tar.gz" - -SRC_URI[md5sum] = "6933e667240b287b0b85b6c7a826f87a" -SRC_URI[sha256sum] = "a96d09a8e650889ec35c89cfea12261082c351889a4b48252e3ba9f3cfe2398f" - -S = "${WORKDIR}/smart-refrigerator-${PV}" - -inherit qt4e pkgconfig - -FILES_${PN}-dbg = " \ - /opt/SmartRefrigerator/bin \ - /opt/SmartRefrigerator/bin/.debug \ - /opt/SmartRefrigerator/bin/.debug/SmartRefrigerator \ - /opt/SmartRefrigerator/.debug \ - /opt/SmartRefrigerator/.debug/SmartRefrigerator \ - /opt/SmartRefrigerator/CustomWidgets/Fridge-Whiteboard/Canvas/.debug/libcanvasplugin.so \ - /opt/SmartRefrigerator/output/* \ - /usr/* \ - " - -FILES_${PN} = " \ - /etc/* \ - /op* \ - " - -do_install() { - make INSTALL_ROOT=${D} install - cp -ar ${S}/output/SmartRefr* ${D}/opt - mkdir ${D}/etc - cp ${S}/output/nhttpd.conf ${D}/etc/nhttpd.conf - cp -ar ${S}/output/ApplicationL* ${D}/opt - -} - -pkg_postinst_PACKAGENAME() { - echo "ma conf a moi" > ${D}/etc/nhttpd.conf -} diff --git a/dynamic-layers/qt4-layer/recipes-qt4/images/atmel-qt4e-demo-image.bb b/dynamic-layers/qt4-layer/recipes-qt4/images/atmel-qt4e-demo-image.bb deleted file mode 100644 index 40892fec..00000000 --- a/dynamic-layers/qt4-layer/recipes-qt4/images/atmel-qt4e-demo-image.bb +++ /dev/null @@ -1,119 +0,0 @@ -DESCRIPTION = "An image that will launch into the demo application for the embedded (not based on X11) version of Qt." -LICENSE = "MIT" -PR = "r3" - -IMAGE_FEATURES += "ssh-server-openssh package-management" - -IMAGE_INSTALL += "\ - packagegroup-core-boot \ - packagegroup-core-full-cmdline \ - packagegroup-base-wifi \ - packagegroup-base-bluetooth \ - packagegroup-base-usbgadget \ - openssh-sftp \ - openssh-sftp-server \ - kernel-modules \ - lrzsz \ - setserial \ - opkg \ - iperf \ - \ - nbench-byte \ - lmbench \ - \ - linux-firmware-ralink \ - linux-firmware-ath6k \ - mchp-wireless-firmware \ - \ - alsa-utils \ - i2c-tools \ - dosfstools \ - libdrm-tests \ - mtd-utils \ - iproute2 \ - iptables \ - bridge-utils \ - canutils \ - gdb \ - usbutils \ - wget \ - ${CORE_IMAGE_BASE_INSTALL} \ - \ - qt4-embedded \ - libqt-embedded3support4 \ - libqt-embeddedclucene4 \ - libqt-embeddedcore4 \ - libqt-embeddeddbus4 \ - libqt-embeddedgui4 \ - libqt-embeddedhelp4 \ - libqt-embeddedmultimedia4 \ - libqt-embeddednetwork4 \ - libqt-embeddedscript4 \ - libqt-embeddedscripttools4 \ - libqt-embeddedsql4 \ - libqt-embeddedsvg4 \ - libqt-embeddedtest4 \ - libqt-embeddedwebkit4 \ - libqt-embeddedxml4 \ - libqt-embeddedxmlpatterns4 \ - qt4-embedded-fonts-ttf-dejavu \ - qt4-embedded-fonts-ttf-vera \ - qt4-embedded-plugin-iconengine-svgicon \ - qt4-embedded-plugin-imageformat-gif \ - qt4-embedded-plugin-imageformat-ico \ - qt4-embedded-plugin-imageformat-jpeg \ - qt4-embedded-plugin-imageformat-mng \ - qt4-embedded-plugin-imageformat-svg \ - qt4-embedded-plugin-imageformat-tiff \ - qt4-embedded-plugin-phonon-backend-gstreamer \ - qt4-embedded-plugin-script-dbus \ - qt4-embedded-plugin-sqldriver-sqlite \ - \ - libicui18n \ - gstreamer1.0 \ - gstreamer1.0-plugins-bad-meta \ - gstreamer1.0-plugins-base-meta \ - gstreamer1.0-plugins-good-meta \ - homeautomation \ - smartrefrigerator \ - applicationlauncher \ - qmlbrowser \ - samegame \ - minehunt \ - atmel-qt-demo-init \ - hostapd \ -" - -IMAGE_INSTALL_append_at91sam9m10g45 = "\ - tslib tslib-calibrate tslib-tests \ - qt4-embedded-plugin-mousedriver-tslib \" - -IMAGE_INSTALL_append_at91sam9rl = "\ - tslib tslib-calibrate tslib-tests \ - qt4-embedded-plugin-mousedriver-tslib \" - -IMAGE_INSTALL_append_at91sam9x5 = "\ - tslib tslib-calibrate tslib-tests \ - qt4-embedded-plugin-mousedriver-tslib \" - -IMAGE_INSTALL_append_sam9x60 = " \ - hostapd \ - bonnie++ \ - libm2d " - -inherit core-image - -atmel_qte_rootfs_postprocess() { - curdir=$PWD - - cd ${IMAGE_ROOTFS} - # remove qtopia extra files - rm -rf usr/bin/qtopia/demos - rm -rf usr/bin/qtopia/examples - rm -rf usr/share/doc - rm -rf usr/share/qtopia/mkspecs - - cd $curdir -} - -ROOTFS_POSTPROCESS_COMMAND += "atmel_qte_rootfs_postprocess;" diff --git a/dynamic-layers/qt4-layer/recipes-qt4/meta/meta-toolchain-qte.bbappend b/dynamic-layers/qt4-layer/recipes-qt4/meta/meta-toolchain-qte.bbappend deleted file mode 100644 index 8dedc862..00000000 --- a/dynamic-layers/qt4-layer/recipes-qt4/meta/meta-toolchain-qte.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -TOOLCHAIN_TARGET_TASK += "\ - libv4l libv4l-dev \ - qt-mobility-embedded qt-mobility-embedded-dev \ - " diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/nativesdk-qt4-tools_%.bbappend b/dynamic-layers/qt4-layer/recipes-qt4/qt4/nativesdk-qt4-tools_%.bbappend deleted file mode 100644 index 29cc58de..00000000 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/nativesdk-qt4-tools_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -DEPENDS_NOX11 := "${@oe.utils.str_filter_out('nativesdk-libx11', '${DEPENDS}', d)}" -DEPENDS := "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${DEPENDS}', '${DEPENDS_NOX11}', d)}" diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-embedded-4.8.7/qt-embedded-linux-4.8.4-phonon-colors-fix.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-embedded-4.8.7/qt-embedded-linux-4.8.4-phonon-colors-fix.patch deleted file mode 100644 index 0624eef9..00000000 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-embedded-4.8.7/qt-embedded-linux-4.8.4-phonon-colors-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp -index 89d5a9d..8508001 100644 ---- a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp -+++ b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.cpp -@@ -18,6 +18,7 @@ - #include - #include "videowidget.h" - #include "qwidgetvideosink.h" -+#include - - QT_BEGIN_NAMESPACE - -@@ -106,11 +107,7 @@ static GstStaticPadTemplate template_factory_rgb = - GST_STATIC_PAD_TEMPLATE("sink", - GST_PAD_SINK, - GST_PAD_ALWAYS, -- GST_STATIC_CAPS("video/x-raw-rgb, " -- "framerate = (fraction) [ 0, MAX ], " -- "width = (int) [ 1, MAX ], " -- "height = (int) [ 1, MAX ]," -- "bpp = (int) 32")); -+ GST_STATIC_CAPS(GST_VIDEO_CAPS_xRGB_HOST_ENDIAN)); - - template - struct template_factory; - diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-embedded_4.8.7.bbappend b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-embedded_4.8.7.bbappend deleted file mode 100644 index bbb4d26c..00000000 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-embedded_4.8.7.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" -SRC_URI += "file://qt-embedded-linux-4.8.4-phonon-colors-fix.patch" diff --git a/dynamic-layers/qt5-layer/recipes-python/pyqt5/python3-pyqt5_%.bbappend b/dynamic-layers/qt5-layer/recipes-python/pyqt5/python3-pyqt5_%.bbappend deleted file mode 100644 index 6804b304..00000000 --- a/dynamic-layers/qt5-layer/recipes-python/pyqt5/python3-pyqt5_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ - -REQUIRED_DISTRO_FEATURES_remove = "x11" - -DISABLED_FEATURES_append += "PyQt_OpenGL" -PYQT_MODULES_remove += "QtQuick QtQuickWidgets" diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/applicationlauncher.inc b/dynamic-layers/qt5-layer/recipes-qt/apps/applicationlauncher.inc deleted file mode 100644 index c0ba7ea1..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/applicationlauncher.inc +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "Microchip QT5 Application Launcher demo" -LICENSE = "ATMEL_LLA" -LIC_FILES_CHKSUM = "file://COPYING;md5=78a72a436c89c3863a5650347f34a3b3" - -PACKAGES = "${PN}-dbg ${PN}" - -DEPENDS = "qtbase qtdeclarative qtxmlpatterns" -inherit qmake5 - -inherit pkgconfig - -PACKAGES = "${PN}-dbg ${PN}" -FILES_${PN}-dbg = " \ - /opt/ApplicationLauncher/bin/.debug \ - /opt/ApplicationLauncher/bin/.debug/ApplicationLauncher \ - /usr/src/debug/* \ - /opt/ApplicationLauncher/applications/resources/same-game.png \ - /opt/ApplicationLauncher/applications/resources/about-atmel.png \ - /opt/ApplicationLauncher/applications/resources/picture-viewer.png \ - /opt/ApplicationLauncher/applications/resources/home-automation.png \ - /opt/ApplicationLauncher/applications/resources/medical-app.png \ - /opt/ApplicationLauncher/applications/resources/about-timesys.png \ -" - -FILES_${PN} = " \ - /opt \ - /opt/ApplicationLauncher \ - /opt/ApplicationLauncher/applications_list.xml \ -" -do_install() { - make INSTALL_ROOT=${D} install - cp ${S}/applications_list.xml ${D}/opt/ApplicationLauncher/ -} diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/applicationlauncher_git.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/applicationlauncher_git.bb deleted file mode 100644 index 3ecb8428..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/applicationlauncher_git.bb +++ /dev/null @@ -1,16 +0,0 @@ -require applicationlauncher.inc - -SRC_URI ="git://github.com/linux4sam/application-launcher.git;protocol=https;branch=fixes-qt5.12" -SRCREV = "96f47a1c4eb6f3bffbb4bb31a04d6c0236e300b7" -PV = "1.11+git${SRCPV}" - -SRC_URI += " file://fs-overlay/opt/ApplicationLauncher/demo.config \ - " -S = "${WORKDIR}/git" - -SRC_URI_append_sama5d4 += " file://applicationlauncher_videoplayer.patch" - -do_install_append() { - install -Dm 0664 ${WORKDIR}/fs-overlay/opt/ApplicationLauncher/demo.config \ - ${D}/opt/ApplicationLauncher/demo.config -} diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/files/0001-whiteboard.pro-Add-qt-to-CONFIG-in-project.patch b/dynamic-layers/qt5-layer/recipes-qt/apps/files/0001-whiteboard.pro-Add-qt-to-CONFIG-in-project.patch deleted file mode 100644 index 4428a5a4..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/files/0001-whiteboard.pro-Add-qt-to-CONFIG-in-project.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 47955d533df515b6ef3907b687cc6ad22c1430bf Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 16 Jan 2020 09:51:33 -0800 -Subject: [PATCH] whiteboard.pro: Add qt to CONFIG in project - -Fixes install errors when S != B - -Signed-off-by: Khem Raj ---- - whiteboard.pro | 1 + - 1 file changed, 1 insertion(+) - ---- a/whiteboard.pro -+++ b/whiteboard.pro -@@ -31,7 +31,7 @@ HEADERS += mainwindow.h \ - whiteboard.h - - target.path = /opt/whiteboard --target.files = whiteboard -+target.files = $$top_builddir/whiteboard - extra.path = /opt/whiteboard - extra.files = resources/whiteboard.sh - configfile.path = /opt/ApplicationLauncher/applications/xml diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/files/0001-wildwest.pro-Add-builddir-to-install-files.patch b/dynamic-layers/qt5-layer/recipes-qt/apps/files/0001-wildwest.pro-Add-builddir-to-install-files.patch deleted file mode 100644 index 390f6b5e..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/files/0001-wildwest.pro-Add-builddir-to-install-files.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3f1b172258de05afb374b50df705f66c42ba1182 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 16 Jan 2020 10:13:50 -0800 -Subject: [PATCH] wildwest.pro: Add builddir to install files - -Fixes install errors when Srcdir != Builddir - -Signed-off-by: Khem Raj ---- - wildwest.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wildwest.pro b/wildwest.pro -index e7f4fee..4cbff61 100644 ---- a/wildwest.pro -+++ b/wildwest.pro -@@ -43,7 +43,7 @@ DISTFILES += \ - wildwest.screen - - target.path = /opt/wildwest --target.files = wildwest -+target.files = $$top_builddir/wildwest - extra.path = /opt/wildwest - extra.files = resources/wildwest.sh wildwest.screen - configfile.path = /opt/ApplicationLauncher/applications/xml --- -2.25.0 - diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/files/applicationlauncher_videoplayer.patch b/dynamic-layers/qt5-layer/recipes-qt/apps/files/applicationlauncher_videoplayer.patch deleted file mode 100644 index e38e37ef..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/files/applicationlauncher_videoplayer.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/applications_list.xml b/applications_list.xml -index 5f97dd0..ed48892 100644 ---- a/applications_list.xml -+++ b/applications_list.xml -@@ -58,6 +58,18 @@ - Test Description - - -+ -+Video Player -+ -+ tag:atmel.com,2005:/app/8144940683 -+ 2012-11-01T15:45:05Z -+ 2012-11-01T15:45:05Z -+ Unknown -+ -+ /opt/VideoPlayer/Video-Player.sh -+ Test Description -+ -+ - - - About Microchip diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/etc/mchp_qtdemo b/dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/etc/mchp_qtdemo deleted file mode 100755 index e5fa6087..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/etc/mchp_qtdemo +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -start() -{ - res=$(cat /sys/class/drm/card0/*/modes | tr -d '\n') - echo $res - - if [ -x /usr/bin/ts_calibrate ]; then - - if [ -e /sys/class/graphics/fb0/modes ]; then - head -1 /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode - fi - - rm -f /etc/pointercal - if [ ! -f /etc/pointercal-${res} ]; then - TSLIB_TSDEVICE=/dev/input/touchscreen0 /usr/bin/ts_calibrate - mv /etc/pointercal /etc/pointercal-${res} - fi - ln -sf /etc/pointercal-${res} /etc/pointercal - export QT_QPA_GENERIC_PLUGINS=tslib:/dev/input/touchscreen0 - else - export QT_QPA_GENERIC_PLUGINS=evdevkeyboard:/dev/input/keyboard0 - fi - - echo "Starting Demo..." - - . /etc/profile - - LAUNCHER_ARGS="-multifile" - - cd /opt/ApplicationLauncher/ - - case "$res" in - *"480x272"*) - (bin/ApplicationLauncher -- -WQVGA $LAUNCHER_ARGS;) & - ;; - *) - (bin/ApplicationLauncher -- $LAUNCHER_ARGS;) & - ;; - - esac - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() -{ - echo "Killing Application Launcher..." - pkill -f "ApplicationLauncher" -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - *) - ;; -esac diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/etc/qtprofile.sh b/dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/etc/qtprofile.sh deleted file mode 100644 index 16be4c98..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/etc/qtprofile.sh +++ /dev/null @@ -1,4 +0,0 @@ -export QMLSCENE_DEVICE=softwarecontext -export QT_QPA_PLATFORM=linuxfb -export QT_QPA_FB_DRM=1 -export QT_QPA_FB_DRM_FORMAT=6 diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/opt/ApplicationLauncher/demo.config b/dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/opt/ApplicationLauncher/demo.config deleted file mode 100644 index 86f8d794..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/files/fs-overlay/opt/ApplicationLauncher/demo.config +++ /dev/null @@ -1,2 +0,0 @@ -export DEMO_LEAVE="/etc/init.d/qtdemo stop" -export DEMO_ENTER="/etc/init.d/qtdemo start" diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/files/header.patch b/dynamic-layers/qt5-layer/recipes-qt/apps/files/header.patch deleted file mode 100644 index 55ac8dd5..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/files/header.patch +++ /dev/null @@ -1,22 +0,0 @@ -Do not include linux/if_ether.h header it is not needed -moreover it causes build failures with musl - -netinet/if_ether.h:111:8: error: redefinition of 'ethhdr' -struct ethhdr { - ^ -TOPDIR/build/tmp/work/cortexa5t2hf-neon-vfpv4-yoe-linux-musleabi/ptpdemo/1.5-r1/recipe-sysroot/usr/include/linux/if_ether.h:167:8: note: previous definition is here -struct ethhdr { - ^ - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- a/linuxptp-1.3/raw.c -+++ b/linuxptp-1.3/raw.c -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/homeautomation_1.10.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/homeautomation_1.10.bb deleted file mode 100644 index f37ff2fd..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/homeautomation_1.10.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Microchip QT home automation demo" -LICENSE = "ATMEL_LLA" -LIC_FILES_CHKSUM = "file://main.cpp;endline=146;md5=fa39b3d717088cee47df5eeb61b548b3" - -PR = "r2" - -PACKAGES = "${PN}-dbg ${PN}" - -DEPENDS = "qtbase qtwebkit libv4l" -inherit qmake5 - -SRC_URI = "https://github.com/linux4sam/home-automation/archive/v${PV}.tar.gz;downloadfilename=home-automation-${PV}.tar.gz" - -SRC_URI[md5sum] = "4f2ea34a05e74557697eb9d3e49679fe" -SRC_URI[sha256sum] = "ac7ea4ab4ee474c453d1339199fa71a8a3c20c007dfaac3fef68285384d994e0" - -S = "${WORKDIR}/home-automation-${PV}" - -inherit pkgconfig - -FILES_${PN}-dbg = " \ - /opt/HomeAutomation/HomeAutomation/.debug \ - /opt/HomeAutomation/.debug/HomeAutomation \ - /usr/* \ - " - -FILES_${PN} = " \ - /opt/HomeAutomation/HomeAutomation \ - /opt/HomeAutomation/HomeAutomation.sh \ - /opt/HomeAutomation/microchip-stylesheet.qss \ - /opt/HomeAutomation/resources/* \ - /opt/HomeAutomation/stations/* \ - /opt/HomeAutomation/CustomWidgets/* \ - /opt/HomeAutomation/media/* \ - /opt/HomeAutomation/images/* \ - /opt/ApplicationL* \ - " - -do_install() { - make INSTALL_ROOT=${D} install - install -m 0755 ${B}/HomeAutomation ${D}/opt/HomeAutomation/ -} diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/homeautomation_git.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/homeautomation_git.bb deleted file mode 100644 index 534ab003..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/homeautomation_git.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "Microchip QT home automation demo" -LICENSE = "ATMEL_LLA" -LIC_FILES_CHKSUM = "file://main.cpp;endline=146;md5=fa39b3d717088cee47df5eeb61b548b3" - -PACKAGES = "${PN}-dbg ${PN}" - -DEPENDS = "qtbase qtmultimedia qtsvg libv4l" - -SRC_URI = "git://github.com/linux4sam/home-automation.git;protocol=https;branch=ha-simple" -PV = "2.0+git${SRCPV}" -SRCREV = "7e3f384de01fb2ad3a7b8b6a05acb0d8d68e9508" - -S = "${WORKDIR}/git" - -inherit qmake5 pkgconfig - -FILES_${PN}-dbg = " \ - /opt/HomeAutomation/HomeAutomation/.debug \ - /opt/HomeAutomation/.debug/HomeAutomation \ - /usr/* \ - " - -FILES_${PN} = " \ - /opt/HomeAutomation/HomeAutomation \ - /opt/HomeAutomation/HomeAutomation.sh \ - /opt/HomeAutomation/microchip-stylesheet.qss \ - /opt/HomeAutomation/resources/* \ - /opt/HomeAutomation/stations/* \ - /opt/HomeAutomation/CustomWidgets/* \ - /opt/HomeAutomation/media/* \ - /opt/HomeAutomation/images/* \ - /opt/ApplicationL* \ - " - -do_install() { - make INSTALL_ROOT=${D} install - install -m 0755 ${B}/HomeAutomation ${D}/opt/HomeAutomation/ -} diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/iocontrol_1.2.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/iocontrol_1.2.bb deleted file mode 100644 index 53e36de7..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/iocontrol_1.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "Microchip I/O Control Application" -LICENSE = "(GPLv3 & MIT)" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464 \ - file://LICENSE.MIT;md5=bc47140df2dfc4ee5df97fde106921f7" - -PACKAGES = "${PN}-dbg ${PN}" - -DEPENDS = "mpio qtbase" - -RDEPENDS_${PN} = "python3" - -SRC_URI = "git://github.com/linux4sam/iocontrol.git;protocol=https" -PV = "1.2+git${SRCPV}" -SRCREV = "8a0018a838296d4cbf8fd71952de28a5b35bf977" - -S = "${WORKDIR}/git" - -inherit setuptools3 - -FILES_${PN} += " \ - /opt/ApplicationL* \ - /opt/iocontrol/iocontrol.sh \ - /opt/iocontrol \ - " - -do_install_append() { - install -Dm 0644 ${S}/res/iocontrol.png \ - ${D}/opt/ApplicationLauncher/applications/resources/iocontrol.png - install -Dm 0644 ${S}/res/08-iocontrol.xml \ - ${D}/opt/ApplicationLauncher/applications/xml/08-iocontrol.xml - install -Dm 0755 ${S}/res/iocontrol.sh \ - ${D}/opt/iocontrol/iocontrol.sh -} diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/mchp-qt-demo-init_1.0.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/mchp-qt-demo-init_1.0.bb deleted file mode 100644 index bd23e48d..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/mchp-qt-demo-init_1.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Init script for qtdemo" -LICENSE = "MIT" -SRC_URI = "file://fs-overlay/etc/mchp_qtdemo \ - file://fs-overlay/etc/qtprofile.sh" - -RDEPENDS_${PN} = "udev-rules-at91" - -PR = "r2" - -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -do_install_append() { - install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/fs-overlay/etc/qtprofile.sh ${D}${sysconfdir}/profile.d/ -} - -do_install() { - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/fs-overlay/etc/mchp_qtdemo ${D}${sysconfdir}/init.d/qtdemo -} - -inherit update-rc.d allarch - -INITSCRIPT_NAME = "qtdemo" -INITSCRIPT_PARAMS = "start 99 5 2 . stop 19 0 1 6 ." - diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/minehunt_1.7.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/minehunt_1.7.bb deleted file mode 100644 index 7a28c440..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/minehunt_1.7.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Microchip Minehunt Qt demo" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://main.cpp;endline=40;md5=ade79b42cecba4adb92be7b0e83bad33" - -PACKAGES = "${PN}-dbg ${PN}" - -DEPENDS = "qtbase" -inherit qmake5 - -SRC_URI = "https://github.com/linux4sam/minehunt/archive/v${PV}.tar.gz;downloadfilename=${PN}-${PV}.tar.gz" - -SRC_URI[md5sum] = "c7bff519050bdd1daddc8f3a8eb92f5d" -SRC_URI[sha256sum] = "17d7f0141bfb038819ee5b0e3706422865dad146776bbb641633c7fc8c937954" - -S = "${WORKDIR}/${PN}-${PV}" - -inherit pkgconfig - -FILES_${PN}-dbg = " \ - /opt/minehunt/.debug \ - /opt/minehunt/.debug/* \ - /usr/* \ - /opt/minehunt/minehunt.h \ - /opt/minehunt/minehunt.qmlproject \ - /opt/minehunt/minehunt.cpp \ - /opt/minehunt/main.cpp \ - /opt/minehunt/minehunt.pro \ - /opt/minehunt/qrc_minehunt.cpp \ - /opt/minehunt/moc_minehunt.cpp \ - /opt/minehunt/moc_qmlapplicationviewer.cpp \ -" - -FILES_${PN} = " \ - /opt/minehunt/minehunt \ - /opt/minehunt/resources/minehunt.sh \ - /opt/minehunt/qml/* \ - /opt/ApplicationL* \ -" - -do_install() { - make INSTALL_ROOT=${D} install -} diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/ptpdemo_1.5.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/ptpdemo_1.5.bb deleted file mode 100644 index bc84b874..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/ptpdemo_1.5.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "Atmel QT5 PTP demo" -LICENSE = "ATMEL_LLA" -LIC_FILES_CHKSUM = "file://main.cpp;endline=144;md5=3fd6e13d87198f728613ada223563354" - -PR = "r1" - -SRC_URI = "ftp://ftp.linux4sam.org/pub/demo/qtdemo/PTPDemo-${PV}.tar.gz \ - file://header.patch \ - " - -SRC_URI[md5sum] = "86f6af07b6e36734f60be8865906b545" -SRC_URI[sha256sum] = "4219d29279a9ac980a2429e525858173f6acdb3a0501fda0df8fc40f8f9de298" -S = "${WORKDIR}/PTPDemo-${PV}" - -DEPENDS = "qtbase" -inherit qmake5 - -inherit pkgconfig - -PACKAGES = "${PN}-dbg ${PN}" -FILES_${PN}-dbg = " \ - /opt/ptp/.debug \ - /opt/ptp/.debug/phc2sys \ - /opt/ptp/.debug/ptp4l \ - /usr/src/debug/* \ - /usr/src/debug \ -" - -FILES_${PN} = " \ - /opt/ptp/* \ - /opt/ApplicationL* \ -" -do_compile_extra() { - cd ${WORKDIR}/PTPDemo-${PV}/linuxptp-1.3 - make -} -addtask compile_extra after do_compile before do_install - -do_install() { - make INSTALL_ROOT=${D} install - cp ${B}/PTPDemo ${D}/opt/ptp/ -} - -COMPATIBLE_MACHINE = "(at91sam9|sama5)" diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/qmlbrowser_1.7.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/qmlbrowser_1.7.bb deleted file mode 100644 index e0bbaed4..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/qmlbrowser_1.7.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "Atmel QT home automation demo" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://qml/webbrowser/webbrowser.qml;endline=40;md5=a78c797054f097540ddb57fc9212183d" - -PACKAGES = "${PN}-dbg ${PN}" - -PR = "r1" - -inherit qmake5 - -SRC_URI = "https://github.com/linux4sam/qml-browser/archive/v${PV}.tar.gz;downloadfilename=qml-browser-${PV}.tar.gz" - -SRC_URI[md5sum] = "283afa2e34160373c4ae333c5f8b5c6d" -SRC_URI[sha256sum] = "12e5896ec52428e1283adf2775e354684f7309c3f558e110732dca961912f814" - -S = "${WORKDIR}/qml-browser-${PV}" - -inherit pkgconfig - -FILES_${PN}-dbg = " \ - /opt/browser/bin/.debug \ - /opt/browser/bin/.debug/browser \ - /usr/* \ -" - -FILES_${PN} = " \ - /opt/browser/bin/browser \ - /opt/browser/resources/* \ - /opt/browser/qml/* \ - /opt/browser/opt/* \ - /opt/ApplicationL* \ -" - -do_install() { - make INSTALL_ROOT=${D} install - cd ${B}/opt/ - for file in $(find browser ApplicationLauncher -type f); do - if [ -x ${file} ]; then - PERM="755" - else - PERM="644" - fi - echo install -m ${PERM} -D ${file} ${D}/opt/${file} - install -m ${PERM} -D ${file} ${D}/opt/${file} - done -} diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/qtviewplanes_1.0.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/qtviewplanes_1.0.bb deleted file mode 100644 index 144be870..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/qtviewplanes_1.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Microchip Qt View Planes Demo Application" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" - -PACKAGES = "${PN}-dbg ${PN}" - -DEPENDS = "qtbase libplanes" -RDEPENDS_${PN} = "libplanes" - -SRC_URI = "git://github.com/linux4sam/qtviewplanes.git;protocol=https" -PV = "1.0+git${SRCPV}" -SRCREV = "9c2bdb62018f38f1e5a0d12018c89a2634ae4e3a" - -S = "${WORKDIR}/git" - -inherit qmake5 pkgconfig - -FILES_${PN}-dbg = " \ - /opt/qtviewplanes/.debug \ - /usr/* \ -" - -FILES_${PN} += " \ - /opt/ApplicationL* \ - /opt/qtviewplanes/qtviewplanes \ - /opt/qtviewplanes/qtviewplanes.screen \ - /opt/qtviewplanes/qtviewplanes.sh \ -" - -do_install_append() { - install ${B}/qtviewplanes ${D}/opt/qtviewplanes/ -} diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/samegame_1.6.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/samegame_1.6.bb deleted file mode 100644 index 183b1942..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/samegame_1.6.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "Microchip samegame QT demo" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://main.cpp;endline=39;md5=8f2a7549bdcd8bed89187e21d29be11f" - -PACKAGES = "${PN}-dbg ${PN}" - -DEPENDS = "qtbase qtdeclarative" -inherit qmake5 - -SRC_URI = "https://github.com/linux4sam/samegame/archive/v${PV}.tar.gz;downloadfilename=${PN}-${PV}.tar.gz" - -SRC_URI[md5sum] = "39709b52871275bf575cad21ffaf134a" -SRC_URI[sha256sum] = "1488fd156f2c69e6ef4b6d5c0ef3f16526a91769ca7bbbf433f4975c64ea8ba8" - -S = "${WORKDIR}/${PN}-${PV}" - -inherit pkgconfig - -FILES_${PN}-dbg = " \ - /opt/samegame/.debug \ - /opt/samegame/.debug/samegame \ - /usr/* \ - /opt/samegame/samegame.pro \ - /opt/samegame/samegame.qmlproject \ - /opt/samegame/main.cpp \ - /opt/samegame/moc_qmlapplicationviewer.cpp \ -" - -FILES_${PN} = " \ - /opt/samegame/samegame \ - /opt/samegame/resources/samegame.sh \ - /opt/samegame/qml/* \ - /opt/ApplicationL* \ -" - -do_install() { - make INSTALL_ROOT=${D} install -} diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/smartrefrigerator_1.6.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/smartrefrigerator_1.6.bb deleted file mode 100644 index ce05c2fa..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/smartrefrigerator_1.6.bb +++ /dev/null @@ -1,55 +0,0 @@ -DESCRIPTION = "Microchip QT smart refrigerator demo" -LICENSE = "ATMEL_LLA" -LIC_FILES_CHKSUM = "file://main.cpp;endline=146;md5=e461c6aa7c87631950f0a71c1552f706" - -PR = "r2" - -PACKAGES = "${PN}-dbg ${PN}" - -DEPENDS = "qtbase qtwebkit libv4l" -inherit qmake5 - -SRC_URI = "https://github.com/linux4sam/smart-refrigerator/archive/v${PV}.tar.gz;downloadfilename=smart-refrigerator-${PV}.tar.gz" - -SRC_URI[md5sum] = "8ab327de0d10c725d593fbf53929f124" -SRC_URI[sha256sum] = "413b95c9d31c2625e7184bc5833820780dfa64886c5dba73edb3cfe75959a4a4" - -S = "${WORKDIR}/smart-refrigerator-${PV}" - -inherit pkgconfig - -FILES_${PN}-dbg = " \ - /opt/SmartRefrigerator/bin \ - /opt/SmartRefrigerator/bin/.debug \ - /opt/SmartRefrigerator/bin/.debug/SmartRefrigerator \ - /opt/SmartRefrigerator/.debug \ - /opt/SmartRefrigerator/.debug/SmartRefrigerator \ - /opt/SmartRefrigerator/CustomWidgets/Fridge-Whiteboard/Canvas/.debug/libcanvasplugin.so \ - /opt/SmartRefrigerator/output/* \ - /usr/* \ - " - -FILES_${PN} = " \ - /etc/* \ - /op* \ - " - -do_install() { - make INSTALL_ROOT=${D} install - cd ${B}/output/ - for file in $(find SmartRefrigerator ApplicationLauncher -type f); do - if [ -x ${file} ]; then - PERM="755" - else - PERM="644" - fi - echo install -m ${PERM} -D ${file} ${D}/opt/${file} - install -m ${PERM} -D ${file} ${D}/opt/${file} - done - install -d ${D}/etc - install -m 644 nhttpd.conf ${D}/etc/nhttpd.conf -} - -pkg_postinst_PACKAGENAME() { - echo "ma conf a moi" > ${D}/etc/nhttpd.conf -} diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/spacetouch_1.0.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/spacetouch_1.0.bb deleted file mode 100644 index d7ead495..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/spacetouch_1.0.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Microchip Spacetouch Qt Parallax App" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" - -PACKAGES = "${PN}-dbg ${PN}" - -DEPENDS = "qtbase libplanes" -RDEPENDS_${PN} = "libplanes" - -SRC_URI = "git://github.com/linux4sam/spacetouch.git;protocol=https" -PV = "1.0+git${SRCPV}" -SRCREV = "545a7644a06d86ac1d19ebb70db0fb079e6b8524" - -S = "${WORKDIR}/git" - -inherit qmake5 pkgconfig - -FILES_${PN}-dbg = " \ - /opt/spacetouch/.debug \ - /usr/* \ -" - -FILES_${PN} += " \ - /opt/ApplicationL* \ - /opt/spacetouch/spacetouch \ - /opt/spacetouch/spacetouch.sh \ - /opt/spacetouch/spacetouch.screen \ -" - -do_install_append() { - install ${B}/spacetouch ${D}/opt/spacetouch/ -} diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/videoplayer_git.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/videoplayer_git.bb deleted file mode 100644 index 8b3bc2aa..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/videoplayer_git.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Microchip QT video player demo" -LICENSE = "ATMEL_LLA" -LIC_FILES_CHKSUM = "file://COPYING;md5=78a72a436c89c3863a5650347f34a3b3" - -PACKAGES = "${PN} ${PN}-dbg" - -DEPENDS = "qtbase gstreamer1.0 gstreamer1.0-plugins-hantro g1-decoder libplanes" - -RDEPENDS_${PN} = "libplanes" - -SRC_URI = "git://github.com/linux4sam/atmel-video-player.git;protcol=https;branch=fixes-qt5.12" -PV = "1.9+git${SRCPV}" -SRCREV = "b3f08f60e57479b290f3de599857ace9012163aa" - -S = "${WORKDIR}/git" - -inherit qmake5 pkgconfig - -FILES_${PN}-dbg = " \ - /opt/VideoPlayer/.debug \ - /usr/* \ -" - -#/usr/lib/libplanes.so.0 -FILES_${PN} = " \ - /opt/VideoPlayer/player \ - /opt/VideoPlayer/Player.sh \ - /opt/VideoPlayer/screen.config \ - /opt/VideoPlayer/media/* \ - /opt/ApplicationL* \ - /usr/* \ -" - -do_install() { - make INSTALL_ROOT=${D} install - cp ${B}/player ${D}/opt/VideoPlayer/ - cp -rf ${S}/med* ${D}/opt/VideoPlayer/ - cp ${S}/Player.sh ${D}/opt/VideoPlayer/ -} - -COMPATIBLE_MACHINE = "sama5d4" - diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/whiteboard_1.0.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/whiteboard_1.0.bb deleted file mode 100644 index b6073221..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/whiteboard_1.0.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "Microchip Whiteboard Demo Application" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" - -PACKAGES = "${PN}-dbg ${PN}" - -DEPENDS = "qtbase" -inherit qmake5 - -SRC_URI = "git://github.com/linux4sam/whiteboard.git;protocol=https \ - file://0001-whiteboard.pro-Add-qt-to-CONFIG-in-project.patch \ - " -PV = "1.0+git${SRCPV}" -SRCREV = "3d910b2373df365391e3c496270db8c696617abd" - -S = "${WORKDIR}/git" - -inherit pkgconfig - -FILES_${PN}-dbg = " \ - /opt/whiteboard/.debug \ - /opt/whiteboard/.debug/whiteboard \ - /usr/* \ - /opt/whiteboard/whiteboard.pro \ - /opt/whiteboard/whiteboard.qmlproject \ - /opt/whiteboard/main.cpp \ - /opt/whiteboard/moc_qmlapplicationviewer.cpp \ -" - -FILES_${PN} += " \ - /opt/ApplicationL* \ - /opt/whiteboard/whiteboard \ - /opt/whiteboard/whiteboard.sh \ -" - -do_install_append() { - install ${B}/whiteboard ${D}/opt/whiteboard/ -} diff --git a/dynamic-layers/qt5-layer/recipes-qt/apps/wildwest_1.0.bb b/dynamic-layers/qt5-layer/recipes-qt/apps/wildwest_1.0.bb deleted file mode 100644 index 33fe8897..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/apps/wildwest_1.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Microchip Wildwest Qt Parallax App" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" - -PACKAGES = "${PN}-dbg ${PN}" - -DEPENDS = "qtbase libplanes" -RDEPENDS_${PN} = "libplanes" - -SRC_URI = "git://github.com/linux4sam/wildwest.git;protocol=https \ - file://0001-wildwest.pro-Add-builddir-to-install-files.patch \ - " -PV = "1.0+git${SRCPV}" -SRCREV = "0b1b22e3eb5c819983f3d14696214ebaabf28223" - -S = "${WORKDIR}/git" - -inherit qmake5 pkgconfig - -FILES_${PN}-dbg = " \ - /opt/wildwest/.debug \ - /usr/* \ -" - -FILES_${PN} += " \ - /opt/ApplicationL* \ - /opt/wildwest/wildwest \ - /opt/wildwest/wildwest.sh \ - /opt/wildwest/wildwest.screen \ -" - -do_install_append() { - install ${B}/wildwest ${D}/opt/wildwest/ -} diff --git a/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend b/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend deleted file mode 100644 index 35aca03b..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -RDEPENDS_${PN} += " \ - libv4l \ - libv4l-dev \ -" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/files/0001-make-QGraphicsItem-update-virtual.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/files/0001-make-QGraphicsItem-update-virtual.patch deleted file mode 100644 index 70811f94..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/files/0001-make-QGraphicsItem-update-virtual.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 487f558bb2867fd62e92762cf8d6b58dba7cbd08 Mon Sep 17 00:00:00 2001 -From: Joshua Henderson -Date: Tue, 23 Jan 2018 15:39:31 -0700 -Subject: [PATCH] make QGraphicsItem::update virtual - -This is used to prevent update() calls from happening on some QGraphicsItem -objects. ---- - src/widgets/graphicsview/qgraphicsitem.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/widgets/graphicsview/qgraphicsitem.h -+++ b/src/widgets/graphicsview/qgraphicsitem.h -@@ -342,7 +342,7 @@ public: - - // Drawing - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) = 0; -- void update(const QRectF &rect = QRectF()); -+ virtual void update(const QRectF &rect = QRectF()); - inline void update(qreal x, qreal y, qreal width, qreal height); - void scroll(qreal dx, qreal dy, const QRectF &rect = QRectF()); - diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/files/0004-Provide-access-to-linuxfb-dri-fd-through-platform.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/files/0004-Provide-access-to-linuxfb-dri-fd-through-platform.patch deleted file mode 100644 index d97217b9..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/files/0004-Provide-access-to-linuxfb-dri-fd-through-platform.patch +++ /dev/null @@ -1,103 +0,0 @@ -From df007a9d0dcfa9ec3621c2814fc84d7797e8fc07 Mon Sep 17 00:00:00 2001 -From: Joshua Henderson -Date: Fri, 17 May 2019 11:34:25 +0300 -Subject: [PATCH] Provide access to linuxfb dri fd through platform - -Signed-off-by: Joshua Henderson -[eugen.hristev@microchip.com]: Ported on 5.12.2 -Signed-off-by: Eugen Hristev ---- - .../fbconvenience/qfbscreen_p.h | 1 + - .../platforms/linuxfb/qlinuxfbdrmscreen.cpp | 4 ++++ - .../platforms/linuxfb/qlinuxfbdrmscreen.h | 1 + - .../platforms/linuxfb/qlinuxfbintegration.cpp | 21 ++++++++++++++++++- - .../platforms/linuxfb/qlinuxfbscreen.h | 2 ++ - 5 files changed, 28 insertions(+), 1 deletion(-) - -diff --git a/src/platformsupport/fbconvenience/qfbscreen_p.h b/src/platformsupport/fbconvenience/qfbscreen_p.h -index eed615de36..b209034c79 100644 ---- a/src/platformsupport/fbconvenience/qfbscreen_p.h -+++ b/src/platformsupport/fbconvenience/qfbscreen_p.h -@@ -76,6 +76,7 @@ public: - QFbScreen(); - ~QFbScreen(); - -+ virtual int fd() const { return -1; } - virtual bool initialize(); - - QRect geometry() const override { return mGeometry; } -diff --git a/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp -index dcc1ef2790..7f1cd2820a 100644 ---- a/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp -+++ b/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp -@@ -465,4 +465,8 @@ QPixmap QLinuxFbDrmScreen::grabWindow(WId wid, int x, int y, int width, int heig - return QPixmap(); - } - -+int QLinuxFbDrmScreen::fd() const -+{ -+ return m_device->fd(); -+} - QT_END_NAMESPACE -diff --git a/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.h b/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.h -index 50a9576798..dc26c8f941 100644 ---- a/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.h -+++ b/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.h -@@ -57,6 +57,7 @@ public: - bool initialize() override; - QRegion doRedraw() override; - QPixmap grabWindow(WId wid, int x, int y, int width, int height) const override; -+ int fd() const; - - private: - QKmsScreenConfig *m_screenConfig; -diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp -index 9e38900bcd..1584f18392 100644 ---- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp -+++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp -@@ -173,9 +173,28 @@ void QLinuxFbIntegration::createInputHandlers() - #endif - } - -+ -+class FbPlatformInterface : public QPlatformNativeInterface -+{ -+public: -+ FbPlatformInterface(QFbScreen *primaryScreen) -+ : m_primaryScreen(primaryScreen) -+ {} -+ -+ void *nativeResourceForIntegration(const QByteArray &resource) -+ { -+ if (resource == QByteArrayLiteral("dri_fd")) -+ return (void *) (qintptr)m_primaryScreen->fd(); -+ return nullptr; -+ } -+ -+ QFbScreen *m_primaryScreen; -+}; -+ -+ - QPlatformNativeInterface *QLinuxFbIntegration::nativeInterface() const - { -- return const_cast(this); -+ return new FbPlatformInterface(m_primaryScreen); - } - - QFunctionPointer QLinuxFbIntegration::platformFunction(const QByteArray &function) const -diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.h b/src/plugins/platforms/linuxfb/qlinuxfbscreen.h -index c7ce455e6a..afa53d52d4 100644 ---- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.h -+++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.h -@@ -60,6 +60,8 @@ public: - - QRegion doRedraw() override; - -+ int fd() const { return mFbFd; } -+ - private: - QStringList mArgs; - int mFbFd; --- -2.21.0 - diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/files/0005-Support-DRM-KMS-planes-in-linuxfb-DRM-backend.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/files/0005-Support-DRM-KMS-planes-in-linuxfb-DRM-backend.patch deleted file mode 100644 index 7a6939d9..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/files/0005-Support-DRM-KMS-planes-in-linuxfb-DRM-backend.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 1135ae7b4cb8727c722a5ca45c7f89a4c1c6ec6d Mon Sep 17 00:00:00 2001 -From: Joshua Henderson -Date: Mon, 16 Oct 2017 08:31:39 -0700 -Subject: [PATCH] Support DRM/KMS planes in linuxfb DRM backend - -This has two distinct ramifications: -- QT_QPA_EGLFS_KMS_PLANE_INDEX and QT_QPA_EGLFS_KMS_CONNECTOR_INDEX will now - take effect when the linuxfb DRM backend is used and drmModeSetPlane() will - be called. -- This does not support double buffering so it is disabled. ---- - .../platforms/linuxfb/qlinuxfbdrmscreen.cpp | 27 ++++++++++++++++++++-- - 1 file changed, 25 insertions(+), 2 deletions(-) - ---- a/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp -+++ b/src/plugins/platforms/linuxfb/qlinuxfbdrmscreen.cpp -@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE - - Q_LOGGING_CATEGORY(qLcFbDrm, "qt.qpa.fb") - --static const int BUFFER_COUNT = 2; -+static const int BUFFER_COUNT = 1; - - class QLinuxFbDevice : public QKmsDevice - { -@@ -131,6 +131,11 @@ bool QLinuxFbDevice::open() - return false; - } - -+ if (drmSetClientCap(fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1) < 0) { -+ qErrnoWarning("Could not set universal planes cap"); -+ return false; -+ } -+ - uint64_t hasDumbBuf = 0; - if (drmGetCap(fd, DRM_CAP_DUMB_BUFFER, &hasDumbBuf) == -1 || !hasDumbBuf) { - qWarning("Dumb buffers not supported"); -@@ -271,6 +276,24 @@ bool QLinuxFbDevice::createFramebuffer(Q - return false; - } - -+ QKmsOutput &op(output->kmsOutput); -+ if (op.wants_forced_plane) { -+ if (!op.forced_plane_set) { -+ op.forced_plane_set = true; -+ qCDebug(qLcFbDrm, "forced_plane_set"); -+ if (op.wants_forced_plane) { -+ qCDebug(qLcFbDrm, "drmModeSetPlane"); -+ -+ int ret = drmModeSetPlane(fd(), op.forced_plane_id, op.crtc_id, -+ fb.fb, 0, -+ 0, 0, w, h, -+ 0 << 16, 0 << 16, w << 16, h << 16); -+ if (ret == -1) -+ qErrnoWarning(errno, "drmModeSetPlane failed"); -+ } -+ } -+ } -+ - drm_mode_map_dumb mreq = { - fb.handle, - 0, 0 -@@ -449,7 +472,7 @@ QRegion QLinuxFbDrmScreen::doRedraw() - - output->dirty[output->backFb] = QRegion(); - -- m_device->swapBuffers(output); -+ //m_device->swapBuffers(output); - - return dirty; - } diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/files/atmel-color-format-force.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/files/atmel-color-format-force.patch deleted file mode 100644 index f6256334..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/files/atmel-color-format-force.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qtbase.orig/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp 2014-08-30 18:51:54.497335792 -0400 -+++ qtbase/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp 2014-08-30 18:52:36.125336669 -0400 -@@ -181,6 +181,8 @@ - format = QImage::Format_RGB32; - // pixeltype = BGRPixel; - } -+ //Hack to force the format and alpha blending -+ format = QImage::Format_RGB32; - break; - } - case 24: { diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend deleted file mode 100644 index 3679dbac..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ /dev/null @@ -1,39 +0,0 @@ -FILESEXTRAPATHS_prepend_sama5 := "${THISDIR}/files:" -FILESEXTRAPATHS_prepend_at91sam9 := "${THISDIR}/files:" - -ATMEL_PATCHES = "file://atmel-color-format-force.patch \ - file://0001-make-QGraphicsItem-update-virtual.patch \ - file://0004-Provide-access-to-linuxfb-dri-fd-through-platform.patch \ - file://0005-Support-DRM-KMS-planes-in-linuxfb-DRM-backend.patch " - -SRC_URI_append_at91sam9 = " ${ATMEL_PATCHES}" -SRC_URI_append_sama5 = " ${ATMEL_PATCHES}" - -# No egl on SAM9 or SAMA5 -QT_CONFIG_FLAGS_append_at91sam9 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ - ' -no-eglfs', ' -no-opengl -linuxfb -no-eglfs', d)}" -QT_CONFIG_FLAGS_append_sama5 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ - ' -no-eglfs', ' -no-opengl -linuxfb -qpa linuxfb -no-eglfs', d)}" - -PACKAGECONFIG_append_at91sam9 = " kms" -PACKAGECONFIG_append_sama5 = " kms" - -# kms PACKAGECONFIG depends on virtual/egl, we don't want that -# https://github.com/linux4sam/meta-atmel/commit/e943ecf879f43b7117e50c2ac4c0c0c8d6f97986 -DEPENDS_remove_at91sam9 = "virtual/egl" -DEPENDS_remove_sama5 = "virtual/egl" - -PACKAGECONFIG_append_at91sam9 = " xkbcommon" -PACKAGECONFIG_append_sama5 = " xkbcommon" -PACKAGECONFIG_remove_at91sam9 = " tests" -PACKAGECONFIG_remove_sama5 = " tests" - -# qtwebkit will fail later in the build if icu is not enabled. As Poky does not -# enable it, do it here. This should be removed when the reverse dependency is -# added. -PACKAGECONFIG_append_at91sam9 = " icu" -PACKAGECONFIG_append_sam9x60 = " accessibility" -PACKAGECONFIG_append_sam9x60 = " libinput" -PACKAGECONFIG_append_sama5 = " icu" -PACKAGECONFIG_append_sama5 = " accessibility" -PACKAGECONFIG_append_sama5 = " libinput" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia/0001-fix-qt5.12.4-compile-issue-when-no-opengl-in-QVideoSurfa.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia/0001-fix-qt5.12.4-compile-issue-when-no-opengl-in-QVideoSurfa.patch deleted file mode 100644 index 6a7fb2fd..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia/0001-fix-qt5.12.4-compile-issue-when-no-opengl-in-QVideoSurfa.patch +++ /dev/null @@ -1,39 +0,0 @@ -From cc61850a28855ee7778b73e5ed70c23ac26dd823 Mon Sep 17 00:00:00 2001 -From: Nate Drude -Date: Thu, 25 Jul 2019 08:56:23 -0500 -Subject: [PATCH] A5-9: Fix compile issue when no opengl in - QVideoSurfacePainterFix qtmultimedia build issue with QT 5.12.4 when - -no-opengl is used - -See: https://gitweb.gentoo.org/proj/qt.git/tree/dev-qt/qtmultimedia/files/qtmultimedia-5.12.4-fix-no-opengl.patch?id=c0f69728fe2538b50a9daf12ea241a76c4b5d131 ---- - src/multimediawidgets/qpaintervideosurface.cpp | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp -index 440d5c8..3e43814 100644 ---- a/src/multimediawidgets/qpaintervideosurface.cpp -+++ b/src/multimediawidgets/qpaintervideosurface.cpp -@@ -57,10 +57,6 @@ - #ifndef GL_RGB8 - #define GL_RGB8 0x8051 - #endif --#endif -- --#include --QT_BEGIN_NAMESPACE - - static void makeCurrent(QGLContext *context) - { -@@ -71,6 +67,11 @@ static void makeCurrent(QGLContext *context) - handle->makeCurrent(handle->surface()); - } - -+#endif -+ -+#include -+QT_BEGIN_NAMESPACE -+ - QVideoSurfacePainter::~QVideoSurfacePainter() - { - } diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend deleted file mode 100644 index 45587973..00000000 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -#Patch for QT 5.12.4 only -SRC_URI += "${@bb.utils.contains('SRCREV', 'd73b59093ec6fed8138460adcdf3ea0a45519a3c', 'file://0001-fix-qt5.12.4-compile-issue-when-no-opengl-in-QVideoSurfa.patch', '', d)}"