summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/recipes-graphics
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-01-22 17:30:26 -0500
committerScott Murray <scott.murray@konsulko.com>2020-01-22 18:14:31 -0500
commitfc7f233e63feb4c4d9dac698f94cf0daecb63e0a (patch)
tree0d59fea4fb78cd162fa1ce587ce2dde554256a25 /meta-agl-bsp/recipes-graphics
parenta9bd6c700a81ddad69d2e61b75db392088b6902f (diff)
meta-agl-bsp meta-agl-profile-core: upgrade to opencv 4.x
Rename meta-agl-bsp and meta-agl-profile-core bbappends to handle opencv upgrade from 3.x to 4.x, and update patch in meta-agl-bsp. Bug-AGL: SPEC-2932 Change-Id: I200fed501d0d09cb2ae6953fe95e3dafcc383457 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'meta-agl-bsp/recipes-graphics')
-rw-r--r--meta-agl-bsp/recipes-graphics/opencv/opencv/0004-Change-Max-Device-Count-To-16.patch25
-rw-r--r--meta-agl-bsp/recipes-graphics/opencv/opencv_4.%.bbappend (renamed from meta-agl-bsp/recipes-graphics/opencv/opencv_3.%.bbappend)0
2 files changed, 6 insertions, 19 deletions
diff --git a/meta-agl-bsp/recipes-graphics/opencv/opencv/0004-Change-Max-Device-Count-To-16.patch b/meta-agl-bsp/recipes-graphics/opencv/opencv/0004-Change-Max-Device-Count-To-16.patch
index fb574847a..2ad367c8d 100644
--- a/meta-agl-bsp/recipes-graphics/opencv/opencv/0004-Change-Max-Device-Count-To-16.patch
+++ b/meta-agl-bsp/recipes-graphics/opencv/opencv/0004-Change-Max-Device-Count-To-16.patch
@@ -1,26 +1,13 @@
-diff --git a/modules/videoio/src/cap_libv4l.cpp b/modules/videoio/src/cap_libv4l.cpp
-index d82ad43..a3929a6 100644
---- a/modules/videoio/src/cap_libv4l.cpp
-+++ b/modules/videoio/src/cap_libv4l.cpp
-@@ -271,7 +271,7 @@ make & enjoy!
- #define DEFAULT_V4L_HEIGHT 480
-
- #define CHANNEL_NUMBER 1
--#define MAX_CAMERAS 8
-+#define MAX_CAMERAS 16
-
-
- // default and maximum number of V4L buffers, not including last, 'special' buffer
diff --git a/modules/videoio/src/cap_v4l.cpp b/modules/videoio/src/cap_v4l.cpp
-index 37d93cd..6b4321c 100644
+index c36a619a56..0040e4574e 100644
--- a/modules/videoio/src/cap_v4l.cpp
+++ b/modules/videoio/src/cap_v4l.cpp
-@@ -241,7 +241,7 @@ make & enjoy!
+@@ -256,7 +256,7 @@ make & enjoy!
+ #define DEFAULT_V4L_HEIGHT 480
#define DEFAULT_V4L_FPS 30
-
- #define CHANNEL_NUMBER 1
+
-#define MAX_CAMERAS 8
+#define MAX_CAMERAS 16
-
-
+
// default and maximum number of V4L buffers, not including last, 'special' buffer
+ #define MAX_V4L_BUFFERS 10
diff --git a/meta-agl-bsp/recipes-graphics/opencv/opencv_3.%.bbappend b/meta-agl-bsp/recipes-graphics/opencv/opencv_4.%.bbappend
index 8a68b0641..8a68b0641 100644
--- a/meta-agl-bsp/recipes-graphics/opencv/opencv_3.%.bbappend
+++ b/meta-agl-bsp/recipes-graphics/opencv/opencv_4.%.bbappend