From: Denys Dmytriyenko <[email protected]> Qt4 has been long since deprecated, so there's no need for this abstraction. Update corresponding recipes that used these classes and variables.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-arago-distro/conf/distro/arago.conf | 3 -- .../conf/distro/include/branding-amsdk.inc | 2 - .../packagegroups/packagegroup-arago-qte.bb | 26 +----------- .../packagegroup-arago-tisdk-connectivity.bb | 12 ------ .../packagegroup-arago-tisdk-qte-sdk-host.bb | 11 +---- .../packagegroup-arago-tisdk-qte.bb | 18 +-------- .../ti-tisdk-makefile_1.0.bb | 8 ---- meta-arago-extras/classes/qt-provider.bbclass | 13 ------ meta-arago-extras/classes/qt-vars.bbclass | 17 -------- .../recipes-apps/evse-hmi/evse-hmi_git.bb | 2 +- .../image-gallery/image-gallery_git.bb | 2 +- .../mmwavegesture-hmi_git.bb | 2 +- .../pdm-anomaly-detection_git.bb | 2 +- .../protection-relays-hmi_git.bb | 2 +- .../thermostat-demo/qt-tstat_2.0.bb | 11 ++--- ...-opencv-opencl-opengl-multithreaded_git.bb | 2 +- .../matrix/matrix-gui-browser_2.0.bb | 16 ++------ .../recipes-core/matrix/matrix-gui_2.0.bb | 12 +++--- .../recipes-core/matrix/refresh-screen_2.0.bb | 5 +-- .../meta/meta-toolchain-arago-qte.bb | 8 +--- ...k-packagegroup-arago-qte-toolchain-host.bb | 5 ++- ...packagegroup-arago-qte-toolchain-target.bb | 40 +------------------ ...ackagegroup-arago-standalone-sdk-target.bb | 1 - .../dual-camera-demo/dual-camera-demo_1.0.bb | 6 +-- .../recipes-qt/examples/qtwebbrowser_1.0.bb | 2 +- 25 files changed, 34 insertions(+), 194 deletions(-) delete mode 100644 meta-arago-extras/classes/qt-provider.bbclass delete mode 100644 meta-arago-extras/classes/qt-vars.bbclass mode change 100755 => 100644 meta-arago-extras/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index bf96c54e..ed067a38 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -109,9 +109,6 @@ VIRTUAL-RUNTIME_login_manager = "busybox shadow" DISTRO_FEATURES_append = "${@[""," systemd"][bool(d.getVar("ARAGO_SYSVINIT"))]}" -# Set preferred Qt version -QT_PROVIDER ?= "qt5" - # Distro-specific package configuration PACKAGECONFIG_append_pn-systemd = " coredump" diff --git a/meta-arago-distro/conf/distro/include/branding-amsdk.inc b/meta-arago-distro/conf/distro/include/branding-amsdk.inc index 3f3c5e44..6a4dd47b 100644 --- a/meta-arago-distro/conf/distro/include/branding-amsdk.inc +++ b/meta-arago-distro/conf/distro/include/branding-amsdk.inc @@ -1,7 +1,5 @@ ARAGO_TISDK_IMAGE = "arago-amsdk-image" -QT_PROVIDER := "${@bb.utils.contains('SOC_FAMILY','omap-a15:dra7xx','qt5','qt4e',d)}" - PREFERRED_PROVIDER_virtual/kernel_am335x-evm = "sitara-linux-ti-staging" PREFERRED_PROVIDER_virtual/kernel_am437x-evm = "sitara-linux-ti-staging" PREFERRED_VERSION_sitara-linux-ti-staging = "3.14%" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb index bf8124da..3d69ba81 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb @@ -6,27 +6,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -QT4_SGX_SUPPORT = "\ - qt4-embedded-plugin-gfxdriver-gfxpvregl \ - libqt-embeddedopengl4 \ - libqt-embeddedpvrqwswsegl4 \ -" - -QT4_ESSENTIALS = "\ - qt4-embedded \ - qt4-embedded-plugin-mousedriver-tslib \ - qt4-embedded-plugin-gfxdriver-gfxtransformed \ - qt4-embedded-plugin-phonon-backend-gstreamer \ - qt4-embedded-plugin-imageformat-gif \ - qt4-embedded-plugin-imageformat-jpeg \ - qt4-embedded-qml-plugins \ - libqt-embeddedmultimedia4 \ - libqt-embeddeddeclarative4 \ - libqt-embeddedxmlpatterns4 \ - ${@oe.utils.conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', '${QT4_SGX_SUPPORT}', '', d)} \ -" - -QT5_ESSENTIALS = "\ +RDEPENDS_${PN} = "\ qtbase-plugins \ qtdeclarative-qmlplugins \ qtlocation-plugins \ @@ -45,7 +25,3 @@ QT5_ESSENTIALS = "\ qtconnectivity \ qtconnectivity-qmlplugins \ " - -RDEPENDS_${PN} = "\ - ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_ESSENTIALS}", "${QT4_ESSENTIALS}", d)} \ -" diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb index 707c1bac..50c4ea25 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb @@ -51,10 +51,6 @@ BT_TI = "\ bt-fw \ " -DEMO_APPS = "\ - ${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', 'wpa-gui-e', d)} \ -" - # net-snmp # net-snmp-server-snmpd CONNECTIVITY_RDEPENDS = " \ @@ -69,14 +65,6 @@ CONNECTIVITY_RDEPENDS = " \ ${BT_TI} \ " -CONNECTIVITY_RDEPENDS_append_ti33x = "\ - ${DEMO_APPS} \ -" - -CONNECTIVITY_RDEPENDS_append_ti43x = "\ - ${DEMO_APPS} \ -" - RDEPENDS_${PN} = "\ ${CONNECTIVITY_RDEPENDS} \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb index bcfa202f..d3b55e85 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte-sdk-host.bb @@ -6,15 +6,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -QT4_DEMOS = "\ - ${@oe.utils.conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground-source', '', d)} \ -" - -QT_DEMOS = "\ - qt-tstat-source \ -" - RDEPENDS_${PN} = "\ - ${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', "${QT4_DEMOS}", d)} \ - ${QT_DEMOS} \ + qt-tstat-source \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb index 7498dd2e..d1a9ae3c 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb @@ -8,14 +8,9 @@ inherit packagegroup features_check REQUIRED_MACHINE_FEATURES = "gpu" -QT4_DEMOS = "\ - qt4-embedded-examples \ - qt4-embedded-demos \ - ${@oe.utils.conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles', 'quick-playground', '', d)} \ -" - # qtdeclarative-examples -QT5_DEMOS = "\ +RDEPENDS_${PN} = "\ + packagegroup-arago-qte \ qtbase-examples \ qtdeclarative-tools \ qtlocation-examples \ @@ -25,14 +20,5 @@ QT5_DEMOS = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \ qtserialport-examples \ qtcharts-examples \ -" - -QT_DEMOS = "\ qt-tstat \ " - -RDEPENDS_${PN} = "\ - packagegroup-arago-qte \ - ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_DEMOS}", "${QT4_DEMOS}", d)} \ - ${QT_DEMOS} \ -" diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb index 4474b861..30e51386 100644 --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb +++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb @@ -27,7 +27,6 @@ SRC_URI = "\ file://Makefile_pru \ file://Makefile_ti-ocf-crypto-module \ file://Makefile_qt-tstat \ - file://Makefile_quick-playground \ file://Makefile_omapconf \ file://Makefile_oprofile-example \ file://Makefile_dual-camera-demo \ @@ -76,13 +75,9 @@ MAKEFILES_COMMON = "linux \ " MAKEFILES = "" -# This example application should not be used when using non-SGX -QUICK_PLAYGROUND = "${@oe.utils.conditional('ARAGO_QT_PROVIDER','qt4-embedded-gles','quick-playground','', d)}" - # Add device specific make targets MAKEFILES_append_omap3 = " u-boot-spl \ - ${QUICK_PLAYGROUND} \ " MAKEFILES_append_am37x-evm = " av-examples \ ti-ocf-crypto-module \ @@ -91,7 +86,6 @@ MAKEFILES_append_am3517-evm = " av-examples \ ti-ocf-crypto-module \ " MAKEFILES_append_ti33x = " u-boot-spl \ - ${QUICK_PLAYGROUND} \ ti-crypto-examples \ linux-dtbs \ cryptodev \ @@ -102,7 +96,6 @@ MAKEFILES_append_ti33x = " u-boot-spl \ pdm-anomaly-detection \ " MAKEFILES_append_ti43x = " u-boot-spl \ - ${QUICK_PLAYGROUND} \ ti-crypto-examples \ linux-dtbs \ cryptodev \ @@ -127,7 +120,6 @@ MAKEFILES_append_dra7xx = " cryptodev \ " MAKEFILES_append_omap-a15 = " u-boot-spl \ - ${QUICK_PLAYGROUND} \ omapconf \ linux-dtbs \ ti-sgx-ddk-km \ diff --git a/meta-arago-extras/classes/qt-provider.bbclass b/meta-arago-extras/classes/qt-provider.bbclass deleted file mode 100644 index 40ec7a07..00000000 --- a/meta-arago-extras/classes/qt-provider.bbclass +++ /dev/null @@ -1,13 +0,0 @@ -# Class to handle switching between Qt4 and Qt5 -# Usage: -# 1. Set QT_PROVIDER in distro config to either "qt4e" or "qt5" -# It defaults to "qt4e" when not set -# Hasn't been tested with "qt4x11" but should theoretically work -# 2. Update recipes to inherit qt-provider instead of qt4e directly -# 3. May need to use below QT_DEPENDS_* and QT_RDEPENDS_* variables -# instead of the actual Qt-version specific values - -QT_PROVIDER ?= "qt5" - -inherit ${QT_PROVIDER} -inherit qt-vars diff --git a/meta-arago-extras/classes/qt-vars.bbclass b/meta-arago-extras/classes/qt-vars.bbclass deleted file mode 100644 index 5a8cc798..00000000 --- a/meta-arago-extras/classes/qt-vars.bbclass +++ /dev/null @@ -1,17 +0,0 @@ -# Class to define many useful variables that differ between Qt4 and Qt5 - -QT_PROVIDER ?= "qt5" - -# Build-time dependencies - those are now separate modules in Qt5 and -# require separate dependencies, unlike Qt4 that provides everything -# in a single qt4-embedded/qt4-x11 recipe -QT_DEPENDS_BASE = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'qtbase', 'qt4-embedded', d)}" -QT_DEPENDS_WEBKIT = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'qtwebkit', '', d)}" -QT_DEPENDS_SVG = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'qtsvg', '', d)}" -QT_DEPENDS_SCRIPT = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'qtscript', '', d)}" -QT_DEPENDS_WEBENGINE = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'qtwebengine', '', d)}" - -# Run-time dependencies -QT_RDEPENDS_FONTS = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', 'qt4-embedded-fonts', d)}" -QT_RDEPENDS_NATIVESDK_TOOLS = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'nativesdk-qtbase nativesdk-qttools', 'nativesdk-qt4-tools', d)}" -QT_RDEPENDS_MKSPECS = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'qtbase-mkspecs', 'qt4-embedded-mkspecs', d)}" diff --git a/meta-arago-extras/recipes-apps/evse-hmi/evse-hmi_git.bb b/meta-arago-extras/recipes-apps/evse-hmi/evse-hmi_git.bb index e2d7b882..a5083999 100644 --- a/meta-arago-extras/recipes-apps/evse-hmi/evse-hmi_git.bb +++ b/meta-arago-extras/recipes-apps/evse-hmi/evse-hmi_git.bb @@ -2,7 +2,7 @@ SUMMARY = "HMI demo for electronic vehicle charging station (EVSE) using QT QWid LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=33;md5=a9cde3921a8be42ed79ab74661799104" -inherit qt-provider +inherit qt5 PV = "1.0" PR = "r1" diff --git a/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb b/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb index 26a567bc..2a9750da 100644 --- a/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb +++ b/meta-arago-extras/recipes-apps/image-gallery/image-gallery_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9c57cc1cdee589f97cbba69e95a89a15" require recipes-core/matrix/matrix-gui-paths.inc -inherit qt-provider +inherit qt5 PR = "r5" diff --git a/meta-arago-extras/recipes-apps/mmwavegesture-hmi/mmwavegesture-hmi_git.bb b/meta-arago-extras/recipes-apps/mmwavegesture-hmi/mmwavegesture-hmi_git.bb index ff6b02a8..d5f9e43c 100644 --- a/meta-arago-extras/recipes-apps/mmwavegesture-hmi/mmwavegesture-hmi_git.bb +++ b/meta-arago-extras/recipes-apps/mmwavegesture-hmi/mmwavegesture-hmi_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Gesture baed HMI demo using mmWave IWR1642 chip and Sitara AM device" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=33;md5=e7e749ff1989b18db836e5d9910a37e9" -inherit qt-provider +inherit qt5 PV = "1.0" PR = "r0" diff --git a/meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb b/meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb index 266cabd9..e4f43f1d 100644 --- a/meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb +++ b/meta-arago-extras/recipes-apps/pdm-anomaly-detection/pdm-anomaly-detection_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Predictive maintenance demo for anomaly detection using Recurrent Neu LICENSE = "BSD-3-Clause & MIT & GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=e88016d2cbc82d0d2efbb0865891e9d6" -inherit qt-provider +inherit qt5 PV = "1.0" PR = "r2" diff --git a/meta-arago-extras/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb b/meta-arago-extras/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb old mode 100755 new mode 100644 index a0c7321f..018859e0 --- a/meta-arago-extras/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb +++ b/meta-arago-extras/recipes-apps/protection-relays-hmi/protection-relays-hmi_git.bb @@ -2,7 +2,7 @@ SUMMARY = "HMI demo for Protection Relays using QT tools" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://main.cpp;beginline=1;endline=33;md5=a9cde3921a8be42ed79ab74661799104" -inherit qt-provider +inherit qt5 PV = "1.0" PR = "r0" diff --git a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb index ba96fa60..a0f2c937 100644 --- a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb +++ b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb @@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=93a105adb99011afa5baee932b560714 \ require recipes-core/matrix/matrix-gui-paths.inc -inherit qt-provider +inherit qt5 PR = "r10" -DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}" +DEPENDS += "qtsvg qtscript" BRANCH ?= "master" SRCREV = "665bff9a7bc0dbf82f9d6a58ff2778c03fe04fd1" @@ -23,19 +23,16 @@ SRC_URI = "git://git.ti.com/apps/thermostat-demo.git;protocol=git;branch=${BRANC S = "${WORKDIR}/git" -DESKTOP_FILE = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'thermostat_demo_qt5.desktop', 'thermostat_demo.desktop', d)}" - - do_install() { install -d ${D}/usr/bin install -m 0755 ${B}/ThermostatDemo ${D}/usr/bin/ThermostatDemo install -d ${D}${MATRIX_APP_DIR}/qt_tstat install ${S}/matrix-files/desc_thermostat_demo.html ${D}${MATRIX_APP_DIR}/qt_tstat - install ${S}/matrix-files/${DESKTOP_FILE} ${D}${MATRIX_APP_DIR}/qt_tstat/thermostat_demo.desktop + install ${S}/matrix-files/thermostat_demo_qt5.desktop ${D}${MATRIX_APP_DIR}/qt_tstat/thermostat_demo.desktop } PACKAGES += "matrix-gui-thermostat-demo" -RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images ${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'matrix-gui-submenus-qt5', 'matrix-gui-submenus-qt4', d)}" +RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images matrix-gui-submenus-qt5" FILES_matrix-gui-thermostat-demo += "${MATRIX_APP_DIR}/*" diff --git a/meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb b/meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb index 7d2fb51c..9a25e911 100644 --- a/meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb +++ b/meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb @@ -23,7 +23,7 @@ SRCREV = "80051ec8befd921e40cfb74a49234ed045576bbc" S = "${WORKDIR}/git" -inherit qt-provider +inherit qt5 export TARGET_ROOTDIR = "${STAGING_DIR_HOST}" export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb index 44f66d0d..c9440628 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb @@ -3,24 +3,14 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://main.cpp;beginline=9;endline=37;md5=75a9adc782a6df0d3a5419743e9a9f18" SECTION = "multimedia" -inherit qt-provider +inherit qt5 -# Make sure that QT font libraries have been installed -RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}" - -DEPENDS += "${QT_DEPENDS_WEBKIT}" -#DEPENDS_k3 += "${QT_DEPENDS_WEBKIT}" -#DEPENDS_remove_k3 = "${QT_DEPENDS_WEBENGINE}" +DEPENDS += "qtwebkit" PR = "r17" -QT4_SRCREV = "83019b46fb3dec1a12667d251d35ba8682953a79" -QT5_SRCREV = "78ad5db716d1abc4c05abfe435f066b6b88454d5" -#QT5_SRCREV = "d3ecf8d0dff3e4f901d588ea0dfe485733dfc9dc" -#QT5_SRCREV_k3 = "78ad5db716d1abc4c05abfe435f066b6b88454d5" - +SRCREV = "78ad5db716d1abc4c05abfe435f066b6b88454d5" -SRCREV = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_SRCREV}", "${QT4_SRCREV}", d)}" BRANCH ?= "master" SRC_URI = "git://git.ti.com/matrix-gui-v2/matrix_browser.git;protocol=git;branch=${BRANCH}" diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb index b9c0637c..4c9c5386 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb @@ -16,22 +16,24 @@ inherit systemd BRANCH ?= "master" SRCREV = "9a2d12590102fefc5c29fc9e8d346ce6b0198468" -MATRIX_INITSCRIPT = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', bb.utils.contains('DISTRO_FEATURES', 'wayland', 'init', 'init.eglfs', d), 'init', d)}" +MATRIX_INITSCRIPT = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'init', 'init.eglfs', d)}" SRC_URI = "git://git.ti.com/matrix-gui-v2/matrix-gui-v2.git;protocol=git;branch=${BRANCH} \ file://${MATRIX_INITSCRIPT} \ file://php.ini \ file://matrix-gui-2.0.service \ - ${@oe.utils.conditional('QT_PROVIDER', 'qt5', bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'file://0001-execute_command-Stop-matrix-when-running-a-GUI-demo.patch', d), '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-execute_command-workaround-for-GUI-apps-with-weston.patch', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \ + 'file://0001-execute_command-workaround-for-GUI-apps-with-weston.patch', \ + 'file://0001-execute_command-Stop-matrix-when-running-a-GUI-demo.patch', d)} \ " require matrix-gui-paths.inc S = "${WORKDIR}/git" -MATRIX_FLAGS = "${@oe.utils.conditional('QT_PROVIDER','qt5','','-qws',d)}" -SWITCH_FOREGROUND_VT = "${@oe.utils.conditional('QT_PROVIDER','qt5','','chvt 4',d)}" +MATRIX_FLAGS = "" +SWITCH_FOREGROUND_VT = "" + do_install(){ install -d ${D}${MATRIX_BASE_DIR} install -d ${D}${MATRIX_WEB_DIR} diff --git a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb index 9e214f42..10dfada9 100644 --- a/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/refresh-screen_2.0.bb @@ -3,10 +3,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://main.cpp;beginline=9;endline=37;md5=75a9adc782a6df0d3a5419743e9a9f18" SECTION = "multimedia" -inherit qt-provider - -# Make sure that QT font libraries have been installed -RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}" +inherit qt5 PR = "r9" diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb index d3139398..f0cefb0d 100644 --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb @@ -7,12 +7,8 @@ require meta-toolchain-arago.bb PR = "r20" -# There could be qt5, qt4e and qt4x11 providers, but we don't support qt4x11 for now -QT_DIR_NAME = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', 'qtopia', d)}" -QT_BIN_PREFIX = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', '', d)}" -QT_BIN_SUFFIX = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', '4', d)}" -QT_MKSPECS_LOCATION = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${libdir}", "${datadir}", d)}" -QT_MKSPECS_DIR = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', "linux-oe-g++", "linux-gnueabi-oe-g++", d)}" +QT_MKSPECS_LOCATION = "${libdir}" +QT_MKSPECS_DIR = "linux-oe-g++" toolchain_create_sdk_env_script_append() { echo 'export PATH=$SDK_PATH_NATIVE${bindir_nativesdk}/${QT_DIR_NAME}:$PATH' >> $script diff --git a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-qte-toolchain-host.bb b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-qte-toolchain-host.bb index dbf9038d..1498f70d 100644 --- a/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-qte-toolchain-host.bb +++ b/meta-arago-extras/recipes-core/packagegroups/nativesdk-packagegroup-arago-qte-toolchain-host.bb @@ -2,9 +2,10 @@ DESCRIPTION = "Host packages for Qt Embedded SDK" PR = "r10" LICENSE = "MIT" -inherit packagegroup qt-vars nativesdk +inherit packagegroup nativesdk RDEPENDS_${PN} = "\ nativesdk-packagegroup-arago-tisdk-host \ - ${QT_RDEPENDS_NATIVESDK_TOOLS} \ + nativesdk-qtbase \ + nativesdk-qttools \ " diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb index c40b4532..f14877e0 100644 --- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb +++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb @@ -7,41 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -QT4_SGX_SUPPORT = "\ - libqt-embeddedopengl4-dev \ - libqt-embeddedpvrqwswsegl4-dev \ -" - -QT4_DEV = " \ - packagegroup-arago-standalone-sdk-target \ - qt4-embedded-mkspecs \ - libqt-embeddedmultimedia4-dev \ - libqt-embeddedphonon4-dev \ - libqt-embedded3support4-dev \ - libqt-embeddedclucene4-dev \ - libqt-embeddedcore4-dev \ - libqt-embeddeddbus4-dev \ - libqt-embeddeddesignercomponents4-dev \ - libqt-embeddeddesigner4-dev \ - libqt-embeddeduitools4-dev \ - libqt-embeddedgui4-dev \ - libqt-embeddedhelp4-dev \ - libqt-embeddednetwork4-dev \ - libqt-embeddedscript4-dev \ - libqt-embeddedscripttools4-dev \ - libqt-embeddedsql4-dev \ - libqt-embeddedsvg4-dev \ - libqt-embeddedtest4-dev \ - libqt-embeddedwebkit4-dev \ - libqt-embeddedxml4-dev \ - libsqlite3-dev \ - libqt-embeddedxmlpatterns4-dev \ - libqt-embeddedmultimedia4-dev \ - libqt-embeddeddeclarative4-dev \ - ${@oe.utils.conditional('ARAGO_QT_PROVIDER', 'qt4-embedded-gles','${QT4_SGX_SUPPORT}', '', d)} \ -" - -QT5_DEV = " \ +RDEPENDS_${PN} += " \ packagegroup-arago-standalone-sdk-target \ libsqlite3-dev \ qtbase-mkspecs \ @@ -69,7 +35,3 @@ QT5_DEV = " \ qtcharts-mkspecs \ qtcharts-dev \ " - -RDEPENDS_${PN} += " \ - ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_DEV}", "${QT4_DEV}", d)} \ -" diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb index 2a1d29b6..936ed17c 100644 --- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb +++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-standalone-sdk-target.bb @@ -26,7 +26,6 @@ RDEPENDS_${PN} = "\ opkg-dev \ libpng-dev \ readline-dev \ - ${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', 'tslib-dev', d)} \ libusb-compat-dev \ libusb1-dev \ zlib-dev \ diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb index 66746793..eaa52a7b 100644 --- a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb +++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb @@ -21,9 +21,7 @@ SRC_URI = "git://git.ti.com/sitara-linux/dual-camera-demo.git;protocol=git;branc S = "${WORKDIR}/git" -DEMO_SCRIPT = "${@oe.utils.conditional('QT_PROVIDER', 'qt5', 'dual_camera_qt5.sh', 'dual_camera_qt4.sh', d)}" - -inherit qt-provider +inherit qt5 export SDK_PATH_TARGET='${STAGING_DIR_HOST}' @@ -32,7 +30,7 @@ do_install() { install -d ${D}/usr/bin install -d ${D}${MATRIX_APP_DIR}/dual-camera install dual_camera ${D}/usr/bin/dual_camera - install ${WORKDIR}/${DEMO_SCRIPT} ${D}/usr/bin/dual_camera.sh + install ${WORKDIR}/dual_camera_qt5.sh ${D}/usr/bin/dual_camera.sh install ${WORKDIR}/desc_dual-camera.html ${D}/${MATRIX_APP_DIR}/dual-camera install ${WORKDIR}/dual-camera.desktop ${D}/${MATRIX_APP_DIR}/dual-camera } diff --git a/meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb b/meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb index c32ec22c..59372b05 100644 --- a/meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb +++ b/meta-arago-extras/recipes-qt/examples/qtwebbrowser_1.0.bb @@ -20,7 +20,7 @@ SRC_URI = "git://code.qt.io/qt-apps/qtwebbrowser.git;protocol=git;branch=${BRANC S = "${WORKDIR}/git" -inherit qt-provider +inherit qt5 # Install qtwebbrowser under /usr/bin do_install() { -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13543): https://lists.yoctoproject.org/g/meta-arago/message/13543 Mute This Topic: https://lists.yoctoproject.org/mt/89310925/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
