From 24fec7be70c7a62203d5441912fe887779b1e796 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 3 Feb 2025 13:21:35 +0100 Subject: [PATCH] qt5: NXP: remove outdated recipes Both gstreamer1.0-plugins-good-qt and imx-qtapplications haven't been officially supported by NXP ever since they migrated to qt6 on i.MX platforms, and both of them apply only to imxgpu3d platforms. In our case, we only use qt5 in the ccimx6ul, so we don't need these packages at all. Signed-off-by: Gabriel Valcazar --- ...gstreamer1.0-plugins-good-qt_1.18.5.imx.bb | 42 -------------- .../imx-qtapplications/qtimxcamera.desktop | 9 --- .../imx-qtapplications/qtimxplayer.desktop | 9 --- .../qt5/imx-qtapplications_1.2.2-aarch32.bb | 58 ------------------- .../qt5/imx-qtapplications_1.2.2-aarch64.bb | 30 ---------- .../packagegroups/packagegroup-qt5-dey.bb | 8 +-- 6 files changed, 1 insertion(+), 155 deletions(-) delete mode 100644 meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.18.5.imx.bb delete mode 100644 meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications/qtimxcamera.desktop delete mode 100644 meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications/qtimxplayer.desktop delete mode 100644 meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch32.bb delete mode 100644 meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch64.bb diff --git a/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.18.5.imx.bb b/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.18.5.imx.bb deleted file mode 100644 index 25995a00b..000000000 --- a/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.18.5.imx.bb +++ /dev/null @@ -1,42 +0,0 @@ -require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc - -GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" -SRCBRANCH = "MM_04.06.03_2110_L5.10.y" - -SRC_URI = " \ - ${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \ -" -SRCREV = "7113baa4dd681cf028b04ef4ebe70b06db4b0f08" - -DEFAULT_PREFERENCE = "-1" - -S = "${WORKDIR}/git" - -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" - -DEPENDS += "gstreamer1.0-plugins-base virtual/kernel libcap zlib bzip2 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ -" - -# Make sure kernel sources are available -do_configure[depends] += "virtual/kernel:do_shared_workdir" - -PACKAGECONFIG += "qt5" -PACKAGECONFIG[qt5] = '-Dqt5=enabled \ - ,-Dqt5=disabled,qtbase qtdeclarative qtbase-native qtx11extras' - -# remove the duplicate libs except qtsink -do_install:append() { - rm -rf ${D}/usr - if [ -e ${WORKDIR}/build/ext/qt/libgstqmlgl.so ]; then - mkdir -p ${D}${libdir}/gstreamer-1.0/ - install -m 0755 ${WORKDIR}/build/ext/qt/libgstqmlgl.so ${D}${libdir}/gstreamer-1.0/ - fi -} - - -FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" - -COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications/qtimxcamera.desktop b/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications/qtimxcamera.desktop deleted file mode 100644 index f1cd635e5..000000000 --- a/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications/qtimxcamera.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=iMX Camera -Exec=/usr/share/qt5/examples/multimedia/imxcamera/imxcamera -Icon=imxcamera -Terminal=false -Type=Application -X-MB-SingleInstance=true -Comment=i.MX Camera App -StartupNotify=false diff --git a/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications/qtimxplayer.desktop b/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications/qtimxplayer.desktop deleted file mode 100644 index 182365805..000000000 --- a/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications/qtimxplayer.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=iMX Player -Exec=/usr/share/qt5/examples/multimedia/imxplayer/imxplayer -Icon=imxplayer -Terminal=false -Type=Application -X-MB-SingleInstance=true -Comment=i.MX Player -StartupNotify=false diff --git a/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch32.bb b/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch32.bb deleted file mode 100644 index bbc62db4b..000000000 --- a/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch32.bb +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (C) 2014-2016 Freescale Semiconductor -# Copyright 2017-2019 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "Freescale QT Multimedia applications" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=5ab1a30d0cd181e3408077727ea5a2db" - -inherit fsl-eula-unpack pkgconfig - -# base on QtMultimedia v5.2.1 -DEPENDS += "qtmultimedia gstreamer1.0 gstreamer1.0-plugins-base imx-gst1.0-plugin qtquickcontrols" - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true \ - file://qtimxplayer.desktop \ - file://qtimxcamera.desktop \ -" -SRC_URI[md5sum] = "b81dd59f4f3e3bd46550ffb615d0d0b3" -SRC_URI[sha256sum] = "fa44c036766f8c4e1c277edd76960c58130a3b46a4dc0d87edb849360efcdd36" - -USE_X11 = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" -PLATFORM_HAS_VPU = " " -PLATFORM_HAS_VPU:imxvpu = "yes" - -# imx-qtapplications will be enabled on board with GPU 3D -# For now, imxcamera & imxplayer can only be supported on x11 backend for SoC with VPU only (including i.MX6Q & i.MX6DL) -# And test_qmlglsrc & test_qmlglsink can be supported on all backends -do_install () { - if [ "${USE_X11}" = "yes" ]; then - if [ "${PLATFORM_HAS_VPU}" = "yes" ]; then - install -d ${D}${datadir}/applications - install -m 0644 ${WORKDIR}/qt*.desktop ${D}${datadir}/applications - install -d ${D}${datadir}/qt5 - cp -r ${S}/usr/share/qt5/examples ${D}${datadir}/qt5 - install -d ${D}${datadir}/pixmaps - cp -r ${S}/usr/share/pixmaps/* ${D}${datadir}/pixmaps - else - install -d ${D}${datadir}/qt5/examples/multimedia/ - cp -r ${S}/usr/share/qt5/examples/multimedia/qmlgltest/ ${D}${datadir}/qt5/examples/multimedia/ - fi - else - install -d ${D}${datadir}/qt5/examples/multimedia/ - cp -r ${S}/usr/share/qt5/examples/multimedia/qmlgltest/ ${D}${datadir}/qt5/examples/multimedia/ - fi -} - - -FILES:${PN} = " \ - ${datadir}/qt5/examples/*/* \ - ${datadir}/applications/* \ - ${datadir}/pixmaps/* \ -" - -INSANE_SKIP:${PN} += "debug-files" - -COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7ulp-nxp-bsp)" - - diff --git a/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch64.bb b/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch64.bb deleted file mode 100644 index 18ec4dead..000000000 --- a/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/imx-qtapplications_1.2.2-aarch64.bb +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2014-2016 Freescale Semiconductor -# Copyright 2017-2018 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "Freescale QT Multimedia applications" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=5ab1a30d0cd181e3408077727ea5a2db" - -inherit fsl-eula-unpack pkgconfig - -# base on QtMultimedia v5.2.1 -DEPENDS += "qtmultimedia gstreamer1.0 gstreamer1.0-plugins-base imx-gst1.0-plugin qtquickcontrols" - -SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true" -SRC_URI[md5sum] = "3f17dca2b5668b97dda46eff8719e53f" -SRC_URI[sha256sum] = "a9c5511668b7f37d3d8a610da99952d78e044147fad9fc1b4e88aaa80ebc01b9" - -do_install () { - install -d ${D}${datadir}/qt5/examples/multimedia/ - cp -r ${S}/usr/share/qt5/examples/multimedia/qmlgltest/ ${D}${datadir}/qt5/examples/multimedia/ -} - -FILES:${PN} = " \ - ${datadir}/qt5/examples/*/* \ -" - -INSANE_SKIP:${PN} += "debug-files" - -COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" - diff --git a/meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt5-dey.bb b/meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt5-dey.bb index 0dcc1e794..eb30758d6 100644 --- a/meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt5-dey.bb +++ b/meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt5-dey.bb @@ -1,15 +1,11 @@ # -# Copyright (C) 2013-2024, Digi International Inc. +# Copyright (C) 2013-2025, Digi International Inc. # SUMMARY = "QT packagegroup for DEY image" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -# Install Freescale QT demo applications -QT5_APPS = "" -QT5_APPS:imxgpu3d = "${@bb.utils.contains("MACHINE_GSTREAMER_1_0_PLUGIN", "imx-gst1.0-plugin", "imx-qtapplications", "", d)}" - # Install fonts QT5_FONTS = "ttf-dejavu-common ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-serif " @@ -19,7 +15,6 @@ QT5_RDEPENDS = "" QT5_RDEPENDS_common = " \ packagegroup-qt5-demos \ ${QT5_FONTS} \ - ${QT5_APPS} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxkbcommon', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland qtwayland-plugins', '', d)}\ " @@ -32,7 +27,6 @@ QT5_RDEPENDS:imxpxp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11','${QT5_RDEP QT5_RDEPENDS:imxgpu3d = " \ ${QT5_RDEPENDS_common} \ - gstreamer1.0-plugins-good-qt \ " QT5_RDEPENDS_eglfs = " \