diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2015-07-15 17:21:16 -0300 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-07-16 15:01:29 -0300 |
| commit | ca38cdc4de1143cf6b7af76e9426ecf31f0922f0 (patch) | |
| tree | 01db34465457c4b22036f27dba53d55f01ef6d03 /dynamic-layers/openembedded-layer/recipes-support | |
| parent | b6e2300960729d67720e1e626051999ca7a7009f (diff) | |
| download | meta-freescale-ca38cdc4de1143cf6b7af76e9426ecf31f0922f0.tar.gz | |
Move external layer's specific changes for 'dynamic-layers' subdir
The external layer's specific changes are now in the 'dynamic-layers'
subdirectory. This approach ease the identification of layer specific
recipes and extensions as all those are more visible isolated of the
main layer components.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support')
2 files changed, 49 insertions, 0 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv/0001-MGS-515-ccc-Opencv-app-can-t-run-on-imx6sx-with-cam.patch b/dynamic-layers/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 000000000..274fbe74f --- /dev/null +++ b/dynamic-layers/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/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_%.bbappend b/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_%.bbappend new file mode 100644 index 000000000..be1669659 --- /dev/null +++ b/dynamic-layers/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" | ||
