Signed-off-by: Denys Dmytriyenko <[email protected]>
---
.../packagegroup-arago-tisdk-multimedia-sdk-host.bb | 12 +++++++-----
.../packagegroup-arago-tisdk-multimedia-sdk-target.bb | 12 +++++++-----
.../recipes-apps/barcode-demo/barcode-roi_git.bb | 4 ++++
.../matrix/matrix-gui-machinevision-demos_2.0.bb | 6 ++++--
4 files changed, 22 insertions(+), 12 deletions(-)
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
index 2ab9dc7..45a0d23 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
@@ -6,29 +6,31 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
+BARCODE_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp',
'barcode-roi-src', '', d)}"
+
MULTIMEDIA = ""
MULTIMEDIA_append_ti43x = " \
dual-camera-demo-src \
image-gallery-src \
- barcode-roi-src \
+ ${BARCODE_PKG} \
"
-MULTIMEDIA_append_ti33x = " barcode-roi-src"
+MULTIMEDIA_append_ti33x = " ${BARCODE_PKG}"
-MULTIMEDIA_append_am65xx = " barcode-roi-src"
+MULTIMEDIA_append_am65xx = " ${BARCODE_PKG}"
MULTIMEDIA_append_omap-a15 = " \
dual-camera-demo-src \
image-gallery-src \
- barcode-roi-src \
+ ${BARCODE_PKG} \
"
MULTIMEDIA_append_dra7xx = " \
${@bb.utils.contains('MACHINE_FEATURES', 'dsp',
'qt-opencv-opencl-opengl-multithreaded-src', '', d)} \
"
-MULTIMEDIA_append_keystone = " barcode-roi-src"
+MULTIMEDIA_append_keystone = " ${BARCODE_PKG}"
#Demo doesn't work on 3.14
# ${@oe.utils.conditional('QT_PROVIDER', 'qt5', '', 'dual-camera-demo-src
image-gallery-src', d)}
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb
index 50842ba..72d7740 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-target.bb
@@ -6,6 +6,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
+BARCODE_PKG = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp',
'barcode-roi-dev', '', d)}"
+
MULTIMEDIA = ""
MULTIMEDIA_append_dra7xx = " \
@@ -14,15 +16,15 @@ MULTIMEDIA_append_dra7xx = " \
${@bb.utils.contains('MACHINE_FEATURES', 'dsp',
'qt-opencv-opencl-opengl-multithreaded-dev', '', d)} \
"
-MULTIMEDIA_append_ti33x = " barcode-roi-dev"
-MULTIMEDIA_append_ti43x = " barcode-roi-dev"
-MULTIMEDIA_append_omap-a15 = " barcode-roi-dev"
-MULTIMEDIA_append_am65xx = " barcode-roi-dev"
+MULTIMEDIA_append_ti33x = " ${BARCODE_PKG}"
+MULTIMEDIA_append_ti43x = " ${BARCODE_PKG}"
+MULTIMEDIA_append_omap-a15 = " ${BARCODE_PKG}"
+MULTIMEDIA_append_am65xx = " ${BARCODE_PKG}"
MULTIMEDIA_append_keystone = " \
hevc-arm-decoder-dev \
hevc-arm-decoder-staticdev \
- barcode-roi-dev \
+ ${BARCODE_PKG} \
"
RDEPENDS_${PN} = "\
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 d828ef7..051b83d 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
@@ -2,6 +2,10 @@ DESCRIPTION = "Barcode demo to detect region of interest"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://detect_barcode.cpp;beginline=1;endline=25;md5=babab64d39715b3671dd16bcb4f4917b"
+inherit machine_features_check
+
+REQUIRED_MACHINE_FEATURES = "dsp"
+
DEPENDS += "opencv"
PV = "01.00.00"
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 cadfefa..091f8ee 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
@@ -12,6 +12,8 @@ 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)}"
+
FILES_${PN} += "${MATRIX_BASE_DIR}/*"
PACKAGES = "matrix-machinevision-demo-dlp3dscanner \
@@ -30,12 +32,12 @@
RDEPENDS_matrix-machinevision-demo-dlp3dscanner_append_dra7xx = " \
RDEPENDS_matrix-machinevision-demo-barcoderoi = " \
${MACHINEVISION_RDEPENDS} \
- barcode-roi \
+ ${BARCODE_RDEPENDS} \
"
RDEPENDS_matrix-machinevision-demo-barcoderoi-f2f = " \
${MACHINEVISION_RDEPENDS} \
- barcode-roi \
+ ${BARCODE_RDEPENDS} \
"
RDEPENDS_matrix-machinevision-demo-simplepeopletracking = " \
--
2.7.4
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
