From fc7f233e63feb4c4d9dac698f94cf0daecb63e0a Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 22 Jan 2020 17:30:26 -0500 Subject: 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 --- .../0004-Change-Max-Device-Count-To-16.patch | 25 ++++++---------------- .../recipes-graphics/opencv/opencv_3.%.bbappend | 5 ----- .../recipes-graphics/opencv/opencv_4.%.bbappend | 5 +++++ 3 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 meta-agl-bsp/recipes-graphics/opencv/opencv_3.%.bbappend create mode 100644 meta-agl-bsp/recipes-graphics/opencv/opencv_4.%.bbappend (limited to 'meta-agl-bsp/recipes-graphics/opencv') 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_3.%.bbappend deleted file mode 100644 index 8a68b0641..000000000 --- a/meta-agl-bsp/recipes-graphics/opencv/opencv_3.%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://0004-Change-Max-Device-Count-To-16.patch \ - " diff --git a/meta-agl-bsp/recipes-graphics/opencv/opencv_4.%.bbappend b/meta-agl-bsp/recipes-graphics/opencv/opencv_4.%.bbappend new file mode 100644 index 000000000..8a68b0641 --- /dev/null +++ b/meta-agl-bsp/recipes-graphics/opencv/opencv_4.%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0004-Change-Max-Device-Count-To-16.patch \ + " -- cgit 1.2.3-korg