From: Denys Dmytriyenko <[email protected]> Also require dsp machine feature.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb | 1 + meta-arago-distro/recipes-core/packagegroups/ti-world.bb | 1 - .../qt-opencv-opencl-opengl-multithreaded_git.bb | 5 +++++ .../recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb index 994179c..d011e24 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb @@ -18,6 +18,7 @@ TENSORFLOW_DEMO_dra7xx = " \ ANALYTICS = " \ ${ARMNN_PACKAGES} \ ${TENSORFLOW_DEMO} \ + ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \ " ANALYTICS_keystone = "" ANALYTICS_j7-evm = "" diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb index 84852f1..6c0ba5f 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb @@ -53,7 +53,6 @@ RDEPENDS_${PN} = "\ packagegroup-arago-tisdk-addons-extra \ ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "${PYTHON2APPS}", "", d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', 'qt-opencv-opencl-opengl-multithreaded-dev', '', d)} \ ${DEVTOOLS} \ ${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 'valgrind', '', d)} \ packagegroup-arago-misc \ 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 2f644f6..7d2fb51 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 @@ -4,6 +4,11 @@ SECTION = "multimedia" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=e28b998056a1a513e87be11c5045e85b" +inherit features_check + +REQUIRED_MACHINE_FEATURES = "dsp" +REQUIRED_DISTRO_FEATURES = "opencv opencl opengl" + DEPENDS += "opencv opencl virtual/egl ti-cgt6x-native clocl-native dsplib-c66x" COMPATIBLE_MACHINE = "dra7xx" diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb index b979168..79aabd5 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb @@ -19,7 +19,7 @@ PACKAGES = "matrix-video-analytics-opencv-opencl-opengl-demo \ RDEPENDS_matrix-video-analytics-opencv-opencl-opengl-demo = " \ ${VIDEO_ANALYTICS_DEMO_RDEPENDS} \ - qt-opencv-opencl-opengl-multithreaded \ + ${@['','qt-opencv-opencl-opengl-multithreaded'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \ " # Split the matrix files by demos -- 2.7.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
