Skip to contentSkip to conversation

voxelsdk: require dsp machine and opencv distro feature

PATCH New Denys Dmytriyenko 1 participant 24 messages Apr 8, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/24 voxelsdk: require dsp machine and opencv distro feature

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-distro/recipes-apps/voxelsdk/voxelsdk_%.bbappend | 3 ---
 meta-arago-extras/recipes-apps/voxelsdk/voxelsdk_git.bb     | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-apps/voxelsdk/voxelsdk_%.bbappend
meta-arago-distro/recipes-apps/voxelsdk/voxelsdk_%.bbappend deleted +0 -3
deleted file mode 100644
index 249ddb7..0000000
@@ -1,3 +0,0 @@
-inherit features_check
-
-REQUIRED_MACHINE_FEATURES = "dsp"
meta-arago-extras/recipes-apps/voxelsdk/voxelsdk_git.bb +5 -0
index 30c4fbf..c83b41e 100644
@@ -4,6 +4,11 @@ SECTION = "multimedia"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e69c599445026ffeae140a21181dfa88"
 
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dsp"
+REQUIRED_DISTRO_FEATURES = "opencv"
+
 PV = "0.6.8"
 PR = "r1"
 BRANCH = "plsdk-devel"
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/24 tensorflow-lite-demo: require dsp machine feature and opencl, opencv distro features

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb  | 11 +++++++++--
 .../tensorflow-lite/tensorflow-lite-demo_git.bb               |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)
meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb +9 -2
index ffed472..994179c 100644
@@ -8,9 +8,16 @@ inherit packagegroup
 ARMNN_PACKAGES = ""
 #ARMNN_PACKAGES = "${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'armnn', '', d)}"
 
-ANALYTICS = "\
+TENSORFLOW_DEMO = " \
+    ${@oe.utils.all_distro_features(d, 'opencv', 'tensorflow-lite-demo', '')} \
+"
+TENSORFLOW_DEMO_dra7xx = " \
+    ${@['','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-lite-demo \
+    ${TENSORFLOW_DEMO} \
 "
 ANALYTICS_keystone = ""
 ANALYTICS_j7-evm = ""
meta-arago-extras/recipes-support/tensorflow-lite/tensorflow-lite-demo_git.bb +5 -0
index c8417e1..c45acf4 100644
@@ -2,6 +2,11 @@ SUMMARY = "Tensorflow Lite Demo with input and display via OpenCV and TIDL accel
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d8927f3331d2b3e321b7dd1925166d25"
 
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES = "opencv"
+REQUIRED_DISTRO_FEATURES_append_dra7xx = " opencl"
+
 DEPENDS = "tensorflow-lite flatbuffers opencv"
 DEPENDS_append_dra7xx = " tidl-api"
 
Signature · 1 line
2.7.4
#2 lore raw

PATCH 3/24 qt-opencv-opencl-opengl-multithreaded: require opencv, opencl, opengl distro features

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

Also require dsp machine feature.

---
 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(-)
meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb +1 -0
index 994179c..d011e24 100644
@@ -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 = ""
meta-arago-distro/recipes-core/packagegroups/ti-world.bb +0 -1
index 84852f1..6c0ba5f 100644
@@ -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 \
meta-arago-extras/recipes-apps/video-analytics-demo/qt-opencv-opencl-opengl-multithreaded_git.bb +5 -0
index 2f644f6..7d2fb51 100644
@@ -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"
meta-arago-extras/recipes-core/matrix/matrix-gui-video-analytics-demos_2.0.bb +1 -1
index b979168..79aabd5 100644
@@ -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
Signature · 1 line
2.7.4
#3 lore raw

PATCH 4/24 barcode-roi: also require opencv distro feature

In reply to Denys Dmytriyenko

From: 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(-)
meta-arago-distro/recipes-core/packagegroups/ti-analytics.bb +1 -0
index d011e24..1e7ee19 100644
@@ -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 = ""
meta-arago-extras/recipes-apps/barcode-demo/barcode-roi_git.bb +1 -0
index 69e06f3..0673c0a 100644
@@ -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"
 
meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb +3 -1
index 51810b4..d164c71 100644
@@ -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}/*"
 
Signature · 1 line
2.7.4
#4 lore raw

PATCH 5/24 big-data-ipc-demo-linux: require dsp machine feature

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 .../recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb     | 3 +--
 .../recipes-apps/big-data-ipc-demo/big-data-ipc-demo-linux_git.bb     | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb +1 -2
index 50c24ae..bc2d121 100644
@@ -144,8 +144,7 @@ EXTRA_PACKAGES_append_omapl138 = " ti-ipc-examples-linux"
 EXTRA_PACKAGES_append_am65xx = " ti-ipc-examples-linux"
 
 EXTRA_PACKAGES_append_omap-a15 = " \
-    big-data-ipc-demo-linux \
-    big-data-ipc-demo-linux-firmware \
+    ${@bb.utils.contains('MACHINE_FEATURES','dsp','big-data-ipc-demo-linux big-data-ipc-demo-linux-firmware','',d)} \
 "
 
 # acontis-atemsys
meta-arago-extras/recipes-apps/big-data-ipc-demo/big-data-ipc-demo-linux_git.bb +4 -0
index 858dc2d..a75b4aa 100644
@@ -3,6 +3,10 @@ SUMMARY = "TI Big data IPC: Host linux examples"
 require recipes-ti/includes/ti-paths.inc
 require big-data-ipc-demo.inc
 
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dsp"
+
 DEPENDS = "ti-ipc \
            ti-xdctools-native \
            ti-sysbios \
Signature · 1 line
2.7.4
#5 lore raw

PATCH 6/24 point-cloud-viewer: require opencv distro feature

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 .../recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb         | 4 ++++
 .../recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
meta-arago-extras/recipes-apps/point-cloud-viewer/point-cloud-viewer_git.bb +4 -0
index baac49e..6e4394b 100644
@@ -3,6 +3,10 @@ HOMEPAGE = "https://git.ti.com/processor-sdk/point-cloud-viewer/"
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM := "file://PointCloudViewer_manifest.html;md5=7ea694db2dd8d82fd91a18cab8c2c2db"
 
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES = "opencv"
+
 PR = "r2"
 
 COMPATIBLE_MACHINE = "dra7xx"
meta-arago-extras/recipes-core/matrix/matrix-gui-machinevision-demos_2.0.bb +1 -1
index d164c71..25b1158 100644
@@ -28,7 +28,7 @@ RDEPENDS_matrix-machinevision-demo-dlp3dscanner = " \
 "
 
 RDEPENDS_matrix-machinevision-demo-dlp3dscanner_append_dra7xx = " \
-    ${@bb.utils.contains('MACHINE_FEATURES','gpu','point-cloud-viewer','',d)} \
+    ${@['','point-cloud-viewer'][oe.utils.all_distro_features(d, 'opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'gpu', True, False, d)]} \
 "
 
 RDEPENDS_matrix-machinevision-demo-barcoderoi = " \
Signature · 1 line
2.7.4
#6 lore raw

PATCH 7/24 gstreamer1.0-plugins-dsp66: require dsp machine and opencl distro features

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 .../recipes-core/packagegroups/packagegroup-arago-gst.bb              | 2 +-
 .../gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb                  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-gst.bb +1 -1
index b2f117f..2679251 100644
@@ -18,7 +18,7 @@ GSTREAMER_DEPS = " \
 "
 
 GSTREAMER_DSP = " \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'dsp', 'gstreamer1.0-plugins-dsp66', '', d)} \
+    ${@['','gstreamer1.0-plugins-dsp66'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
 "
 
 GSTREAMER_DEPS_append_dra7xx = " \
meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb +4 -0
index 6e28891..617fdc9 100644
@@ -16,6 +16,10 @@ COMPATIBLE_MACHINE = "dra7xx|keystone"
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base opencl ti-cgt6x-native clocl-native imglib-c66x vlib-c66x gettext-native"
 
 inherit autotools-brokensep pkgconfig gettext
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dsp"
+REQUIRED_DISTRO_FEATURES = "opencl"
 
 PR = "r1"
 
Signature · 1 line
2.7.4
#7 lore raw

PATCH 8/24 gstreamer1.0-plugins-ducati: require mmip machine feature

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 .../gst-plugins-ti/gstreamer1.0-plugins-ducati_git.bb         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-ducati_git.bb +8 -3
index 2a33f7c..ccf0fd5 100644
@@ -4,13 +4,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
 require gstreamer1.0-plugins-ti.inc
 
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "mmip"
+
 PR = "${INC_PR}.31"
 SRCREV = "7e3938f0854be99583f8b204f600907ea9e6471d"
 
 BRANCH ?= "master"
 
-SRC_URI = "git://git.ti.com/glsdk/gst-plugin-ducati.git;protocol=git;branch=${BRANCH} \
-	   file://0001-gstducati-configure.ac-stop-using-export-symbols-reg.patch \
-          "
+SRC_URI = " \
+    git://git.ti.com/glsdk/gst-plugin-ducati.git;protocol=git;branch=${BRANCH} \
+    file://0001-gstducati-configure.ac-stop-using-export-symbols-reg.patch \
+"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
Signature · 1 line
2.7.4
#8 lore raw

PATCH 9/24 gstreamer1.0-plugins-vpe: require mmip machine feature

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 .../recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-vpe_git.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-vpe_git.bb +4 -0
index ae7b25f..96c678d 100644
@@ -5,6 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
 require gstreamer1.0-plugins-ti.inc
 
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "mmip"
+
 PR = "${INC_PR}.20"
 SRCREV = "b9dba5a8bc7d14d55125abdce04672e3dc30bbdf"
 
Signature · 1 line
2.7.4
#9 lore raw

PATCH 10/24 gstreamer1.0-plugins-hevc: skip texrel QA check, cleanup

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 .../gst-plugins-ti/gstreamer1.0-plugins-hevc_git.bb            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-hevc_git.bb +6 -4
index 7a95a06..1f9796c 100644
@@ -1,4 +1,4 @@
-DESCRIPTION = "GStreamer plugin for ARM HEVC decoder"
+SUMMARY = "GStreamer plugin for ARM HEVC decoder"
 HOMEPAGE = "https://git.ti.com/processor-sdk/gst-plugin-hevc"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2827f94fc0a1adeff4d9702e97ce2979"
@@ -18,9 +18,9 @@ inherit autotools-brokensep pkgconfig gettext
 PR = "r5"
 
 do_configure() {
-        cd ${S}
-        chmod +x autogen.sh
-        ./autogen.sh --host=arm-linux --with-libtool-sysroot=${STAGING_DIR_TARGET} --prefix=/usr
+    cd ${S}
+    chmod +x autogen.sh
+    ./autogen.sh --host=arm-linux --with-libtool-sysroot=${STAGING_DIR_TARGET} --prefix=/usr
 }
 
 EXTRA_OECONF += "--enable-maintainer-mode"
@@ -29,3 +29,5 @@ EXTRA_OEMAKE += "'ERROR_CFLAGS=-Wno-deprecated-declarations'"
 FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"
 FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug"
 FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
+
+INSANE_SKIP_${PN} = "textrel"
Signature · 1 line
2.7.4
#10 lore raw

PATCH 11/24 fftlib: require dsp machine and openmp distro features

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta-arago-extras/recipes-ti/fftlib/fftlib_git.bb +5 -0
index 5b2ceaa..2631e72 100644
@@ -6,6 +6,11 @@ LIC_FILES_CHKSUM = "file://ti/fftlib/docs/manifest/manifest.xml.xdt;md5=178402e8
 
 include fftlib.inc
 
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dsp"
+REQUIRED_DISTRO_FEATURES = "openmp"
+
 PR = "${INC_PR}.0"
 
 DEPENDS = "common-csl-ip-rtos libarch ti-xdctools-native doxygen-native ti-cgt6x-native ti-xdais libulm dsplib-c66x php libxslt-native libxslt openmp-rtos"
Signature · 1 line
2.7.4
#11 lore raw

PATCH 12/24 ti-fftw: require dsp machine and opencl distro features

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta-arago-extras/recipes-ti/fftlib/ti-fftw_git.bb +5 -0
index abb5f60..84b6ba1 100644
@@ -7,6 +7,11 @@ LIC_FILES_CHKSUM = "file://docs/TI-FFTW_3.1.0_manifest.html;md5=aaa275ec704a7382
 
 include fftlib.inc
 
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dsp"
+REQUIRED_DISTRO_FEATURES = "opencl"
+
 PR = "${INC_PR}.0"
 
 DEPENDS = "common-csl-ip-rtos common-csl-ip ti-xdctools-native ti-sysbios ti-cgt6x-native ti-xdais libulm fftlib dsplib-c66x opencl clocl-native libarch"
Signature · 1 line
2.7.4
#12 lore raw

PATCH 13/24 libarch: require dsp machine and opencl distro features

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-extras/recipes-ti/libarch/libarch.inc | 5 +++++
 1 file changed, 5 insertions(+)
meta-arago-extras/recipes-ti/libarch/libarch.inc +5 -0
index a21333b..b7a7af6 100644
@@ -7,6 +7,11 @@ INC_PR = "r2"
 require recipes-ti/includes/arago-paths.inc
 require recipes-ti/includes/ti-staging.inc
 
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dsp"
+REQUIRED_DISTRO_FEATURES = "opencl"
+
 BRANCH = "master"
 LIC_FILES_CHKSUM = "file://src/ti/libarch/docs/LibArch_1.0.0_manifest.html;md5=bb48cacb8827ec8d8e5a94c4f2425ee3"
 SRC_URI = "git://git.ti.com/library-architecture/libarch.git;protocol=git;branch=${BRANCH}"
Signature · 1 line
2.7.4
#13 lore raw

PATCH 14/24 linalg: require dsp machine and opencl, openmp distro features

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 .../recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb    | 4 ++--
 meta-arago-extras/recipes-ti/linalg/linalg.inc                       | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb +2 -2
index 4b3e9db..63b9f20 100644
@@ -17,12 +17,12 @@ EXTRA_PKGS = " \
 
 #    ti-fftw-examples
 EXTRA_PKGS_append_k2hk = " \
-    linalg-examples \
+    ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-examples')} \
 "
 
 #    ti-fftw-examples
 EXTRA_PKGS_append_dra7xx = " \
-    linalg-examples \
+    ${@oe.utils.all_distro_features(d, 'openmp', 'linalg-examples')} \
 "
 
 RDEPENDS_${PN} = "\
meta-arago-extras/recipes-ti/linalg/linalg.inc +5 -0
index 60a9b4b..6883b99 100644
@@ -10,6 +10,11 @@ COMPATIBLE_MACHINE = "k2hk|dra7xx"
 require recipes-ti/includes/arago-paths.inc
 require recipes-ti/includes/ti-staging.inc
 
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dsp"
+REQUIRED_DISTRO_FEATURES = "opencl openmp"
+
 SRC_URI = " \
 	git://git.ti.com/dense-linear-algebra-libraries/linalg.git;protocol=git;branch=${BRANCH} \
 	file://0001-Makefile-fix-toolchain-variables.patch \
Signature · 1 line
2.7.4
#14 lore raw

PATCH 15/24 tidl-api: require dsp machine and opencl, opencv distro features

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc | 5 +++++
 1 file changed, 5 insertions(+)
meta-arago-extras/recipes-ti/tidl-api/tidl-api.inc +5 -0
index c81a97f..e0e3de5 100644
@@ -12,3 +12,8 @@ SRCREV = "4b801ad96b50f53e977b96d8b227ba4bcb26e011"
 
 # default patchdir is ${S}
 S = "${WORKDIR}/git"
+
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dsp"
+REQUIRED_DISTRO_FEATURES = "opencl opencv"
Signature · 1 line
2.7.4
#15 lore raw

PATCH 16/24 tiovx-app-host: require opencv distro feature, cleanup

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-extras/recipes-ti/tiovx/tiovx-app-host.bb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
meta-arago-extras/recipes-ti/tiovx/tiovx-app-host.bb +9 -5
index 1480d5c..7400681 100644
@@ -1,5 +1,7 @@
-SUMMARY = "TI OpenVX HOST (Linux A15) conformance verification application, Khronos tutorial example, and Host side IPC implementation "
-DESCRIPTION = "TI OpenVX implementation, TIOVX, includes Khronos defined conformance test and tutorial example, as well as additional TI specific tests. This package creates application which runs all the conformance tests (7K-8K) and Khronos tutorial exercise1. Same package includes IPC implementation (MessageQ based) needed for communication with DSP firmware (loaded at boot time) "
+SUMMARY = "TI OpenVX HOST (Linux A15) conformance verification application, Khronos tutorial example, and Host side IPC implementation"
+DESCRIPTION = "TI OpenVX implementation, TIOVX, includes Khronos defined conformance test and tutorial example, as well as additional TI \
+specific tests. This package creates application which runs all the conformance tests (7K-8K) and Khronos tutorial exercise1. \
+Same package includes IPC implementation (MessageQ based) needed for communication with DSP firmware (loaded at boot time)"
 
 LICENSE = "BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = "file://docs/manifest/TIOVX-APP-HOST_01.00.01.00_manifest.html;md5=247d7c56d783f583bf802490d5c93db3"
@@ -10,13 +12,15 @@ SRC_URI_append += "\
      file://setenv.sh \
 "
 
-inherit pkgconfig
+inherit pkgconfig features_check
+
+REQUIRED_DISTRO_FEATURES = "opencv"
 
 require recipes-ti/includes/arago-paths.inc
 require tiovx-sys.inc
 
-DEPENDS = " tiovx-sys-iface tiovx-lib-host ti-ipc cmem opencv udev"
-RDEPENDS_${PN} = " tiovx-sys-iface tiovx-sys-iface-firmware tiovx-lib-host ti-ipc cmem"
+DEPENDS = "tiovx-sys-iface tiovx-lib-host ti-ipc cmem opencv udev"
+RDEPENDS_${PN} = "tiovx-sys-iface tiovx-sys-iface-firmware tiovx-lib-host ti-ipc cmem"
 
 PR = "r3"
 
Signature · 1 line
2.7.4
#16 lore raw

PATCH 17/24 tiovx-lib-host: cleanup

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-extras/recipes-ti/tiovx/tiovx-lib-host.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta-arago-extras/recipes-ti/tiovx/tiovx-lib-host.bb +4 -3
index 9baac78..16f2339 100644
@@ -1,5 +1,7 @@
 SUMMARY = "TI OpenVX HOST (Linux A15) side library"
-DESCRIPTION = "TI OpenVX implementation, TIOVX, based on Khronos OpenVX framework implementation including multiple C66 optimized kernels. Khronos defined conformance test is part of this package as well as additional TI specific tests. Few tutorial examples are also included. This package creates necessary libraries and header files for Linux Host side only. "
+DESCRIPTION = "TI OpenVX implementation, TIOVX, based on Khronos OpenVX framework implementation including multiple C66 optimized kernels. \
+Khronos defined conformance test is part of this package as well as additional TI specific tests. Few tutorial examples are also included. \
+This package creates necessary libraries and header files for Linux Host side only. "
 
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://docs/manifest/TIOVX_manifest.html;md5=edd4fbfc6c1f01c20d49def4670efac0"
@@ -17,10 +19,9 @@ SRC_URI = "git://git.ti.com/processor-sdk/tiovx.git;protocol=git;branch=${BRANCH
 SRC_URI += "file://0001-Fix-paths-for-Yocto-build-and-add-RTOS-build-var.patch "
 SRCREV = "2bfa01201804eaf2e675c743e708e88ab612049e"
 
-
 S = "${WORKDIR}/git"
 
-DEPENDS = " tiovx-sys-iface "
+DEPENDS = "tiovx-sys-iface"
 
 EXTRA_OEMAKE += " GCCLINARO=${TOOLCHAIN_PATH} "
 EXTRA_OEMAKE += " SDKPLATFORMIFPATH=${TIOVX_INSTALL_DIR}/sys-iface BUILD_RTOS=no "
Signature · 1 line
2.7.4
#17 lore raw

PATCH 18/24 tiovx-sys-iface: require dsp machine feature, cleanup

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-extras/recipes-ti/tiovx/tiovx-sys-iface.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta-arago-extras/recipes-ti/tiovx/tiovx-sys-iface.bb +6 -4
index a60cbe5..80e3fa7 100644
@@ -1,5 +1,6 @@
-SUMMARY = "TI OpenVX interface header files between TIOVX library and HOST, DSP IPC side implementation "
-DESCRIPTION = "Collection of header files needed to defined interface between TIOVX library and HOST and DSP IPC side implementation. In order to maintain source compatibility, directory structure follows VSDK source tree layout."
+SUMMARY = "TI OpenVX interface header files between TIOVX library and HOST, DSP IPC side implementation"
+DESCRIPTION = "Collection of header files needed to define interface between TIOVX library and HOST and DSP IPC side implementation. \
+In order to maintain source compatibility, directory structure follows VSDK source tree layout."
 
 LICENSE = "TI-TSPA"
 LIC_FILES_CHKSUM = "file://iface/VSDK/docs/TIOVX-SYS-IFACE_1.0.0.0_manifest.html;md5=10904cbdb4f065c025a63ca71ae7de2d"
@@ -12,7 +13,9 @@ PR = "r1"
 COMPATIBLE_MACHINE = "dra7xx"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit update-alternatives
+inherit update-alternatives features_check
+
+REQUIRED_MACHINE_FEATURES = "dsp"
 
 SRC_URI_append += "\
      file://reload-dsp-fw.sh \
@@ -46,4 +49,3 @@ PACKAGES =+ "${PN}-firmware"
 FILES_${PN}-firmware = "${base_libdir}/firmware/*"
 
 INSANE_SKIP_${PN}-firmware = "arch"
-
Signature · 1 line
2.7.4
#18 lore raw

PATCH 19/24 matrix-gui-opencl-demos: require opencl distro feature

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-extras/recipes-core/matrix/matrix-gui-opencl-demos_2.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta-arago-extras/recipes-core/matrix/matrix-gui-opencl-demos_2.0.bb +3 -1
index aba9214..a2eba7b 100644
@@ -4,7 +4,9 @@ require matrix-gui-apps-git.inc
 
 PR = "${INC_PR}.2"
 
-inherit allarch
+inherit allarch features_check
+
+REQUIRED_DISTRO_FEATURES = "opencl"
 
 S = "${WORKDIR}/git/opencl_apps"
 
Signature · 1 line
2.7.4
#19 lore raw

PATCH 20/24 opencl-monitor: require dsp machine and opencl, openmp distro features

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta-arago-extras/recipes-ti/ocl/opencl-monitor_git.bb +5 -0
index 6689f94..620cb28 100644
@@ -5,6 +5,11 @@ LICENSE = "BSD"
 include ocl.inc
 require recipes-ti/includes/arago-paths.inc
 
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dsp"
+REQUIRED_DISTRO_FEATURES = "opencl openmp"
+
 PR = "${INC_PR}.1"
 SRC_URI += "file://0001-Update-VRING-in-resource-table-for-new-Linux-kernel.patch;patchdir=.."
 
Signature · 1 line
2.7.4
#20 lore raw

PATCH 21/24 opencl packagegroups, images: require opencl distro feature

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb       | 2 +-
 .../recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb | 4 ++--
 .../recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb | 4 +++-
 meta-arago-distro/recipes-core/packagegroups/ti-world.bb          | 8 ++++++--
 4 files changed, 12 insertions(+), 6 deletions(-)
meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb +1 -1
index 7f8b508..9049ada 100644
@@ -12,7 +12,7 @@ IMAGE_INSTALL += "\
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte','',d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \
+    ${@['','packagegroup-arago-tisdk-opencl'][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
     packagegroup-arago-tisdk-connectivity \
     packagegroup-arago-tisdk-crypto \
     packagegroup-arago-tisdk-matrix \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb +2 -2
index 1b57798..a6e5e4c 100644
@@ -212,9 +212,9 @@ RDEPENDS_${PN} = "        \
     ${MATRIX_TOUCH_APPS}  \
     ${MATRIX_APPS}        \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu',"${MATRIX_GPU_DEMOS}",'',d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES','dsp',"${MATRIX_OPENCL_APPS}",'',d)} \
+    ${@['',"${MATRIX_OPENCL_APPS}"][oe.utils.all_distro_features(d, 'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
 "
 
 RDEPENDS_${PN}-extra = " \
-    ${@bb.utils.contains('MACHINE_FEATURES','dsp',"${MATRIX_OPENCV_OPENCL_APPS}",'',d)} \
+    ${@['',"${MATRIX_OPENCV_OPENCL_APPS}"][oe.utils.all_distro_features(d, 'opencl opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]} \
 "
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb +3 -1
index 63b9f20..85ddcc0 100644
@@ -4,7 +4,9 @@ PR = "r4"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit packagegroup
+inherit packagegroup features_check
+
+REQUIRED_DISTRO_FEATURES = "opencl"
 
 PACKAGES =+ "${PN}-extra"
 
meta-arago-distro/recipes-core/packagegroups/ti-world.bb +6 -2
index 6c0ba5f..e357cd0 100644
@@ -33,6 +33,11 @@ DEVTOOLS = " \
     git \
 "
 
+OPENCL = " \
+    ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl ti-opencl','',d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
+"
+
 RDEPENDS_${PN} = "\
     packagegroup-arago-base \
     packagegroup-arago-console \
@@ -41,8 +46,7 @@ RDEPENDS_${PN} = "\
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte qt3d-examples','',d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl ti-opencl','',d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
+    ${@oe.utils.all_distro_features(d, "opencl", "${OPENCL}")} \
     packagegroup-arago-tisdk-connectivity \
     packagegroup-arago-tisdk-crypto \
     packagegroup-arago-tisdk-matrix \
Signature · 1 line
2.7.4
#21 lore raw

PATCH 22/24 openmpacc: require dsp machine and opencl, openmp distro features

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc | 5 +++++
 1 file changed, 5 insertions(+)
meta-arago-extras/recipes-ti/openmpacc/openmpacc.inc +5 -0
index d33a156..c56dee2 100644
@@ -2,6 +2,11 @@ SUMMARY = "TI OpenMP Accelerator Model"
 HOMEPAGE = "http://downloads.ti.com/mctools/esd/docs/openmpacc/"
 LICENSE = "BSD"
 
+inherit features_check
+
+REQUIRED_MACHINE_FEATURES = "dsp"
+REQUIRED_DISTRO_FEATURES = "opencl openmp"
+
 PV = "1.5.6.0"
 INC_PR = "r0"
 
Signature · 1 line
2.7.4
#22 lore raw

PATCH 23/24 opencv 3.1: drop outdated opencv version

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 ...01-3rdparty-ippicv-Use-pre-downloaded-ipp.patch |  28 ----
 ...ign-macro-redefinition-compile-time-error.patch |  39 -----
 .../0001-morph.cl-fix-compilation-error.patch      |  35 -----
 .../recipes-support/opencv/opencv/fixgcc60.patch   |  30 ----
 .../opencv/opencv/fixpkgconfig.patch               |  29 ----
 .../recipes-support/opencv/opencv_3.1.bb           | 165 ---------------------
 6 files changed, 326 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
 delete mode 100644 meta-arago-extras/recipes-support/opencv/opencv/0001-Fix-sign-macro-redefinition-compile-time-error.patch
 delete mode 100644 meta-arago-extras/recipes-support/opencv/opencv/0001-morph.cl-fix-compilation-error.patch
 delete mode 100644 meta-arago-extras/recipes-support/opencv/opencv/fixgcc60.patch
 delete mode 100644 meta-arago-extras/recipes-support/opencv/opencv/fixpkgconfig.patch
 delete mode 100644 meta-arago-extras/recipes-support/opencv/opencv_3.1.bb
meta-arago-extras/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch deleted +0 -28
deleted file mode 100644
index d568018..0000000
@@ -1,28 +0,0 @@
-From 049f931207631aa54af55a2917318d032b2ef3fa Mon Sep 17 00:00:00 2001
-From: Ricardo Ribalda Delgado <[email protected]>
-Date: Thu, 31 Mar 2016 00:20:15 +0200
-Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp
-
-Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
----
- 3rdparty/ippicv/downloader.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/3rdparty/ippicv/downloader.cmake b/3rdparty/ippicv/downloader.cmake
-index a6016dbe10bc..af4062c8e95e 100644
---- a/3rdparty/ippicv/downloader.cmake
-+++ b/3rdparty/ippicv/downloader.cmake
-@@ -31,8 +31,10 @@ function(_icv_downloader)
-     return() # Not supported
-   endif()
- 
-+  if(NOT DEFINED OPENCV_ICV_PATH)
-   set(OPENCV_ICV_UNPACK_PATH "${CMAKE_CURRENT_LIST_DIR}/unpack")
-   set(OPENCV_ICV_PATH "${OPENCV_ICV_UNPACK_PATH}${OPENCV_ICV_PACKAGE_SUBDIR}")
-+  endif()
- 
-   if(DEFINED OPENCV_ICV_PACKAGE_DOWNLOADED
-        AND OPENCV_ICV_PACKAGE_DOWNLOADED STREQUAL OPENCV_ICV_PACKAGE_HASH
--- 
-2.8.0.rc3
-
meta-arago-extras/recipes-support/opencv/opencv/0001-Fix-sign-macro-redefinition-compile-time-error.patch deleted +0 -39
deleted file mode 100644
index 481bccb..0000000
@@ -1,39 +0,0 @@
-From 395db9e7211d58473beafa6a9643d3cd49ad4eb4 Mon Sep 17 00:00:00 2001
-From: Gregory Kramida <[email protected]>
-Date: Mon, 23 May 2016 12:56:39 -0400
-Subject: [PATCH] Fix sign() macro redefinition compile-time error
-
----
- modules/tracking/include/opencv2/tracking/onlineMIL.hpp | 2 --
- modules/tracking/src/onlineMIL.cpp                      | 2 ++
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/tracking/include/opencv2/tracking/onlineMIL.hpp b/modules/tracking/include/opencv2/tracking/onlineMIL.hpp
-index b6fc25b..78e1372 100644
---- a/modules/tracking/include/opencv2/tracking/onlineMIL.hpp
-+++ b/modules/tracking/include/opencv2/tracking/onlineMIL.hpp
-@@ -54,8 +54,6 @@ namespace cv
- //TODO based on the original implementation
- //http://vision.ucsd.edu/~bbabenko/project_miltrack.shtml
- 
--#define  sign(s)  ((s > 0 ) ? 1 : ((s<0) ? -1 : 0))
--
- class ClfOnlineStump;
- 
- class CV_EXPORTS ClfMilBoost
-diff --git a/modules/tracking/src/onlineMIL.cpp b/modules/tracking/src/onlineMIL.cpp
-index 4fcfb54..29fa9fe 100644
---- a/modules/tracking/src/onlineMIL.cpp
-+++ b/modules/tracking/src/onlineMIL.cpp
-@@ -42,6 +42,8 @@
- #include "precomp.hpp"
- #include "opencv2/tracking/onlineMIL.hpp"
- 
-+#define  sign(s)  ((s > 0 ) ? 1 : ((s<0) ? -1 : 0))
-+
- template<class T> class SortableElementRev
- {
-  public:
--- 
-2.7.4
-
meta-arago-extras/recipes-support/opencv/opencv/0001-morph.cl-fix-compilation-error.patch deleted +0 -35
deleted file mode 100644
index 5f279f3..0000000
@@ -1,35 +0,0 @@
-From c3befabd0420d6665cc61931af5aea00e82977e3 Mon Sep 17 00:00:00 2001
-From: Djordje Senicic <[email protected]>
-Date: Tue, 17 Sep 2019 19:16:00 -0400
-Subject: [PATCH] morph.cl: fix compilation error
-
-Upstream-Status: Inappropriate [other]
-
-- TI C6x intrinsic _min2(), _max2() cannot be applied to data types  such as uchar3.
-
-Signed-off-by: Djordje Senicic <[email protected]>
----
- modules/imgproc/src/opencl/morph.cl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/imgproc/src/opencl/morph.cl b/modules/imgproc/src/opencl/morph.cl
-index 8e3ab2fa0..47243ca0c 100644
---- a/modules/imgproc/src/opencl/morph.cl
-+++ b/modules/imgproc/src/opencl/morph.cl
-@@ -90,11 +90,11 @@
- #if defined INTEL_DEVICE && defined DEPTH_0
- #define MORPH_OP(A, B) ((A) < (B) ? (A) : (B))
- #else
--#define MORPH_OP(A, B) _min2((A), (B))
-+#define MORPH_OP(A, B) min((A), (B))
- #endif
- #endif
- #ifdef OP_DILATE
--#define MORPH_OP(A, B) _max2((A), (B))
-+#define MORPH_OP(A, B) max((A), (B))
- #endif
- 
- #define PROCESS(y, x) \
--- 
-2.17.1
-
meta-arago-extras/recipes-support/opencv/opencv/fixgcc60.patch deleted +0 -30
deleted file mode 100644
index 5d0bf97..0000000
@@ -1,30 +0,0 @@
-diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
-index 28ccc1c6be4f..b0e1cbf77287 100644
---- a/cmake/OpenCVPCHSupport.cmake
-+++ b/cmake/OpenCVPCHSupport.cmake
-@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
-         ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
-         OUTPUT_VARIABLE gcc_compiler_version)
-     #MESSAGE("GCC Version: ${gcc_compiler_version}")
--    IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
-+    IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
-         SET(PCHSupport_FOUND TRUE)
-     ENDIF()
- 
-diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
-index 3a23cd73633d..1fea1578b1d9 100644
---- a/cmake/OpenCVUtils.cmake
-+++ b/cmake/OpenCVUtils.cmake
-@@ -76,7 +76,11 @@ function(ocv_include_directories)
-     if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}")
-       list(APPEND __add_before "${dir}")
-     else()
--      include_directories(AFTER SYSTEM "${dir}")
-+	    if (gcc_compiler_version VERSION_LESS "6.0.0")
-+		    include_directories(AFTER SYSTEM "${dir}")
-+	    else()
-+		    include_directories(AFTER "${dir}")
-+	    endif()
-     endif()
-   endforeach()
-   include_directories(BEFORE ${__add_before})
meta-arago-extras/recipes-support/opencv/opencv/fixpkgconfig.patch deleted +0 -29
deleted file mode 100644
index 3aeda7d..0000000
@@ -1,29 +0,0 @@
-diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
-index b8cb8777c06b..75281ee964fd 100644
---- a/cmake/OpenCVGenPkgconfig.cmake
-+++ b/cmake/OpenCVGenPkgconfig.cmake
-@@ -27,7 +27,7 @@ macro(fix_prefix lst isown)
-       get_filename_component(libdir "${item}" PATH)
-       get_filename_component(libname "${item}" NAME_WE)
-       string(REGEX REPLACE "^lib(.*)" "\\1" libname "${libname}")
--      list(APPEND _lst "-L${libdir}" "-l${libname}")
-+      list(APPEND _lst "-l${libname}")
-     else()
-       list(APPEND _lst "-l${item}")
-     endif()
-@@ -66,10 +66,14 @@ ocv_list_unique(_3rdparty)
- 
- set(OPENCV_PC_LIBS
-   "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}"
-+  "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}"
-   "${_modules}"
- )
- if (BUILD_SHARED_LIBS)
--  set(OPENCV_PC_LIBS_PRIVATE "${_extra}")
-+  set(OPENCV_PC_LIBS_PRIVATE
-+    "-L\${exec_prefix}/${OPENCV_LIB_INSTALL_PATH}"
-+    "${_extra}"
-+  )
- else()
-   set(OPENCV_PC_LIBS_PRIVATE
-     "-L\${exec_prefix}/${OPENCV_3P_LIB_INSTALL_PATH}"
meta-arago-extras/recipes-support/opencv/opencv_3.1.bb deleted +0 -165

165 lines not on this page · raw message

Signature · 1 line
2.7.4
#23 lore raw

PATCH 24/24 opencv: require opencv distro feature

In reply to Denys Dmytriyenko

From: Denys Dmytriyenko <[email protected]>

---
 meta-arago-distro/recipes-support/opencv/opencv_%.bbappend | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 meta-arago-distro/recipes-support/opencv/opencv_%.bbappend
meta-arago-distro/recipes-support/opencv/opencv_%.bbappend new file +3 -0
new file mode 100644
index 0000000..2ee6bff
@@ -0,0 +1,3 @@
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES = "opencv"
Signature · 1 line
2.7.4