From a881d89fb12d0850dbfb48362fe44490633824e5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 14 Oct 2015 11:36:04 -0300 Subject: opencv: Use the 2.4 release only The opencv 3.0 is not tested and does not have the i.MX6 specific patch ported so we disable it for the i.MX6 SoC from Quad, DualLite, SoloX and SoloLite families. The 2.4 is used instead. This fixes following warning: ,---- | NOTE: multiple providers are available for runtime opencv-samples (opencv-samples, opencv) | NOTE: consider defining a PREFERRED_PROVIDER entry to match opencv-samples `---- Change-Id: I2f897cdd31dcee9046ee7d28ef4dcadb154ae88c Signed-off-by: Otavio Salvador --- .../openembedded-layer/recipes-support/opencv/opencv_%.bbappend | 5 ----- .../openembedded-layer/recipes-support/opencv/opencv_2.4.bbappend | 5 +++++ .../openembedded-layer/recipes-support/opencv/opencv_3.0.bbappend | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_%.bbappend create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_2.4.bbappend create mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_3.0.bbappend (limited to 'dynamic-layers') diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_%.bbappend b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_%.bbappend deleted file mode 100644 index f1d0e29b..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append_mx6sx = " file://0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch" - -PACKAGECONFIG_remove_mx6 = "v4l" diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_2.4.bbappend b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_2.4.bbappend new file mode 100644 index 00000000..f1d0e29b --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_2.4.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_append_mx6sx = " file://0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch" + +PACKAGECONFIG_remove_mx6 = "v4l" diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_3.0.bbappend b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_3.0.bbappend new file mode 100644 index 00000000..881702e0 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_3.0.bbappend @@ -0,0 +1,4 @@ +COMPATIBLE_MACHINE_mx6q = "(-)" +COMPATIBLE_MACHINE_mx6dl = "(-)" +COMPATIBLE_MACHINE_mx6sx = "(-)" +COMPATIBLE_MACHINE_mx6sl = "(-)" -- cgit v1.2.3-54-g00ecf