diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-07-15 17:14:27 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-07-16 15:01:29 -0300 |
commit | f8517afc7a5ada4538b3b7d397fa32586d57ffe5 (patch) | |
tree | 79349f091306d1760fd4687e62336ffa8fb8c721 /openembedded-layer/recipes-support/opencv | |
parent | c92b415d653afc55f33b6b93fb9248193bfd4fa0 (diff) | |
download | meta-freescale-f8517afc7a5ada4538b3b7d397fa32586d57ffe5.tar.gz |
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 <otavio@ossystems.com.br>
Diffstat (limited to 'openembedded-layer/recipes-support/opencv')
-rw-r--r-- | openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch | 46 | ||||
-rw-r--r-- | openembedded-layer/recipes-support/opencv/opencv_%.bbappend | 3 |
2 files changed, 49 insertions, 0 deletions
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 @@ | |||
1 | From 90f869763026e8ff18aeecde217d778f00e4f294 Mon Sep 17 00:00:00 2001 | ||
2 | From: Shawn Xiao <b49994@freescale.com> | ||
3 | Date: Tue, 10 Feb 2015 16:11:59 +0800 | ||
4 | Subject: [PATCH] MGS-515 [#ccc] Opencv app can't run on imx6sx with cam | ||
5 | |||
6 | This issue is caused by the no support of VIDIOC_QUERYCTRL ioctl | ||
7 | item in latest cam driver. | ||
8 | |||
9 | Modified the errno in check logic to compatible with new driver. | ||
10 | |||
11 | Feb 10, 2015 | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Shawn Xiao <b49994@freescale.com> | ||
16 | --- | ||
17 | modules/highgui/src/cap_v4l.cpp | 6 ++++-- | ||
18 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/modules/highgui/src/cap_v4l.cpp b/modules/highgui/src/cap_v4l.cpp | ||
21 | index c9fca05..8c46b6c 100644 | ||
22 | --- a/modules/highgui/src/cap_v4l.cpp | ||
23 | +++ b/modules/highgui/src/cap_v4l.cpp | ||
24 | @@ -707,7 +707,8 @@ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture) | ||
25 | |||
26 | } else { | ||
27 | |||
28 | - if (errno == EINVAL) | ||
29 | + if (errno == ENOTTY || | ||
30 | + errno == EINVAL) | ||
31 | continue; | ||
32 | |||
33 | perror ("VIDIOC_QUERYCTRL"); | ||
34 | @@ -774,7 +775,8 @@ static void v4l2_scan_controls(CvCaptureCAM_V4L* capture) | ||
35 | |||
36 | } else { | ||
37 | |||
38 | - if (errno == EINVAL) | ||
39 | + if (errno == ENOTTY || | ||
40 | + errno == EINVAL) | ||
41 | break; | ||
42 | |||
43 | perror ("VIDIOC_QUERYCTRL"); | ||
44 | -- | ||
45 | 2.3.0 | ||
46 | |||
diff --git a/openembedded-layer/recipes-support/opencv/opencv_%.bbappend b/openembedded-layer/recipes-support/opencv/opencv_%.bbappend new file mode 100644 index 00000000..be166965 --- /dev/null +++ b/openembedded-layer/recipes-support/opencv/opencv_%.bbappend | |||
@@ -0,0 +1,3 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | SRC_URI_append_mx6sx = " file://0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch" | ||