From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb | 1 +
meta-arago-extras/recipes-apps/barcode-demo/barcode-roi_git.bb | 1 +
.../recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb | 4 +++-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
index d011e24..1e7ee19 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb
@@ -19,6 +19,7 @@ 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)]} \
+ ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True,
False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
"
ANALYTICS_keystone = ""
ANALYTICS_j7-evm = ""
diff --git a/meta-arago-extras/recipes-apps/barcode-demo/barcode-roi_git.bb
b/meta-arago-extras/recipes-apps/barcode-demo/barcode-roi_git.bb
index 69e06f3..0673c0a 100644
--- a/meta-arago-extras/recipes-apps/barcode-demo/barcode-roi_git.bb
+++ b/meta-arago-extras/recipes-apps/barcode-demo/barcode-roi_git.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM =
"file://detect_barcode.cpp;beginline=1;endline=25;md5=babab64
inherit features_check
REQUIRED_MACHINE_FEATURES = "dsp"
+REQUIRED_DISTRO_FEATURES = "opencv"
DEPENDS += "opencv"
diff --git
a/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
b/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
index 51810b4..d164c71 100644
---
a/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
+++
b/meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb
@@ -11,7 +11,9 @@ S = "${WORKDIR}/git/machinevision_apps"
# Make sure machinevision submenu and app images has been installed
MACHINEVISION_RDEPENDS += "matrix-gui-apps-images
matrix-gui-submenus-machinevision"
-BARCODE_RDEPENDS = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp',
'barcode-roi', '', d)}"
+BARCODE_RDEPENDS = " \
+ ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True,
False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
+"
FILES_${PN} += "${MATRIX_BASE_DIR}/*"
--
2.7.4
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
