From: Lauren Post <lauren.post@freescale.com>
Date: Thu, 2 Apr 2015 20:38:38 +0000 (-0500)
Subject: opencv: Add i.MX6SoloX support
X-Git-Tag: 2.1~613
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=636ec2d5c74316dcde6d1eb2dae76b34c28cd7ae;p=meta-freescale.git

opencv: Add i.MX6SoloX support

Change-Id: I0abbcb9cf3b9962a9e2ee5901422f18d2e971bd0
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-arm/openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch b/meta-fsl-arm/openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch
new file mode 100644
index 00000000..274fbe74
--- /dev/null
+++ b/meta-fsl-arm/openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch
@@ -0,0 +1,46 @@
+From 90f869763026e8ff18aeecde217d778f00e4f294 Mon Sep 17 00:00:00 2001
+From: Shawn Xiao <b49994@freescale.com>
+Date: Tue, 10 Feb 2015 16:11:59 +0800
+Subject: [PATCH] MGS-515 [#ccc] Opencv app can't run on imx6sx with cam
+
+This issue is caused by the no support of VIDIOC_QUERYCTRL ioctl
+item in latest cam driver.
+
+Modified the errno in check logic to compatible with new driver.
+
+Feb 10, 2015
+
+Upstream-Status: Pending
+
+Signed-off-by: Shawn Xiao <b49994@freescale.com>
+---
+ modules/highgui/src/cap_v4l.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/modules/highgui/src/cap_v4l.cpp b/modules/highgui/src/cap_v4l.cpp
+index c9fca05..8c46b6c 100644
+--- a/modules/highgui/src/cap_v4l.cpp
++++ b/modules/highgui/src/cap_v4l.cpp
+@@ -707,7 +707,8 @@ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture)
+ 
+     } else {
+ 
+-      if (errno == EINVAL)
++      if (errno == ENOTTY ||
++          errno == EINVAL)
+         continue;
+ 
+       perror ("VIDIOC_QUERYCTRL");
+@@ -774,7 +775,8 @@ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture)
+ 
+     } else {
+ 
+-      if (errno == EINVAL)
++      if (errno == ENOTTY ||
++          errno == EINVAL)
+         break;
+ 
+       perror ("VIDIOC_QUERYCTRL");
+-- 
+2.3.0
+
diff --git a/meta-fsl-arm/openembedded-layer/recipes-support/opencv/opencv_%.bbappend b/meta-fsl-arm/openembedded-layer/recipes-support/opencv/opencv_%.bbappend
new file mode 100644
index 00000000..be166965
--- /dev/null
+++ b/meta-fsl-arm/openembedded-layer/recipes-support/opencv/opencv_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append_mx6sx = " file://0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch"