From f8517afc7a5ada4538b3b7d397fa32586d57ffe5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 15 Jul 2015 17:14:27 -0300 Subject: Move meta-fsl-arm content to layer root The meta-fsl-arm is going to be used as the base for this layer. It contains a clean history and allowing a more granullar set of changes. This commit is just a rename of all contents of meta-fsl-arm subdirectory to this layer's root, subsequent changes are based on top of that. Signed-off-by: Otavio Salvador --- ...c-Opencv-app-can-t-run-on-imx6sx-with-cam.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch (limited to 'openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch') diff --git a/openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch b/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/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 +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 +--- + 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 + -- cgit v1.2.3-54-g00ecf