From: Denys Dmytriyenko <[email protected]> Due to breakage with OpenCV 4.1
Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../packagegroup-arago-tisdk-multimedia-sdk-host.bb | 13 +++++++------ .../packagegroup-arago-tisdk-multimedia-sdk-target.bb | 9 +++++---- .../recipes-core/packagegroups/ti-analytics.bb | 13 +++++++------ .../matrix/matrix-gui-machinevision-demos_2.0.bb | 7 ++++--- .../matrix/matrix-gui-video-analytics-demos_2.0.bb | 2 +- 5 files changed, 24 insertions(+), 20 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 5cc4fa0..081cc92 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,9 +6,10 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -BARCODE_PKG = " \ - ${@['','barcode-roi-src'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ -" +BARCODE_PKG = "" +#BARCODE_PKG = " \ +# ${@['','barcode-roi-src'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ +#" MULTIMEDIA = "" @@ -28,9 +29,9 @@ MULTIMEDIA_append_omap-a15 = " \ MULTIMEDIA_append_am65xx = " ${BARCODE_PKG}" -MULTIMEDIA_append_dra7xx = " \ - ${@['','qt-opencv-opencl-opengl-multithreaded-src'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \ -" +#MULTIMEDIA_append_dra7xx = " \ +# ${@['','qt-opencv-opencl-opengl-multithreaded-src'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \ +#" MULTIMEDIA_append_keystone = " ${BARCODE_PKG}" 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 1119d16..abc916f 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,16 +6,17 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup -BARCODE_PKG = " \ - ${@['','barcode-roi-dev'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ -" +BARCODE_PKG = "" +#BARCODE_PKG = " \ +# ${@['','barcode-roi-dev'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ +#" MULTIMEDIA = "" +# ${@['','qt-opencv-opencl-opengl-multithreaded-dev'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} MULTIMEDIA_append_dra7xx = " \ hevc-arm-decoder-dev \ hevc-arm-decoder-staticdev \ - ${@['','qt-opencv-opencl-opengl-multithreaded-dev'][oe.utils.all_distro_features(d, 'opencv opencl opengl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu dsp', True, False, d)]} \ " MULTIMEDIA_append_ti33x = " ${BARCODE_PKG}" diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb index 7b227fb..b2d7d3c 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb @@ -16,12 +16,13 @@ TENSORFLOW_DEMO = "" # ${@['','tensorflow-lite-demo'][oe.utils.all_distro_features(d, 'opencl opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ #" -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 = "" +#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 = "" ANALYTICS_omapl138 = "" 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 25b1158..193da65 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,9 +11,10 @@ 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 = " \ - ${@['','barcode-roi'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \ -" +BARCODE_RDEPENDS = "" +#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}/*" 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 79aabd5..4c90050 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 @@ -17,9 +17,9 @@ VIDEO_ANALYTICS_DEMO_RDEPENDS += " \ PACKAGES = "matrix-video-analytics-opencv-opencl-opengl-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)]} RDEPENDS_matrix-video-analytics-opencv-opencl-opengl-demo = " \ ${VIDEO_ANALYTICS_DEMO_RDEPENDS} \ - ${@['','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
