Skip to content

Commit d81f51e

Browse files
ItsNayabSDConchuOD
ItsNayabSD
authored and
ConchuOD
committed
configs: sama5: replace opencv3 with opencv4
There wasn't a newer version of `opencv3` for over a year. Upgrade to `opencv4` to prevent build failure. Signed-off-by: Nayab Sayed <[email protected]> Signed-off-by: Conor Dooley <[email protected]>
1 parent bd3276a commit d81f51e

9 files changed

+108
-117
lines changed

‎configs/sama5d27_som1_ek_graphics_defconfig

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,18 @@ BR2_PACKAGE_LIBOPENSSL_BIN=y
134134
BR2_PACKAGE_LEVELDB=y
135135
BR2_PACKAGE_CAIRO_TEE=y
136136
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
137-
BR2_PACKAGE_OPENCV3=y
138-
BR2_PACKAGE_OPENCV3_LIB_PHOTO=y
139-
BR2_PACKAGE_OPENCV3_LIB_PYTHON=y
140-
BR2_PACKAGE_OPENCV3_LIB_SHAPE=y
141-
BR2_PACKAGE_OPENCV3_LIB_STITCHING=y
142-
BR2_PACKAGE_OPENCV3_LIB_SUPERRES=y
143-
BR2_PACKAGE_OPENCV3_LIB_TS=y
144-
BR2_PACKAGE_OPENCV3_WITH_FFMPEG=y
145-
BR2_PACKAGE_OPENCV3_WITH_JASPER=y
146-
BR2_PACKAGE_OPENCV3_WITH_JPEG=y
147-
BR2_PACKAGE_OPENCV3_WITH_PNG=y
148-
BR2_PACKAGE_OPENCV3_WITH_TIFF=y
149-
BR2_PACKAGE_OPENCV3_WITH_V4L=y
137+
BR2_PACKAGE_OPENCV4=y
138+
BR2_PACKAGE_OPENCV4_LIB_PHOTO=y
139+
BR2_PACKAGE_OPENCV4_LIB_PYTHON=y
140+
BR2_PACKAGE_OPENCV4_LIB_SHAPE=y
141+
BR2_PACKAGE_OPENCV4_LIB_STITCHING=y
142+
BR2_PACKAGE_OPENCV4_LIB_SUPERRES=y
143+
BR2_PACKAGE_OPENCV4_LIB_TS=y
144+
BR2_PACKAGE_OPENCV4_WITH_FFMPEG=y
145+
BR2_PACKAGE_OPENCV4_WITH_JPEG=y
146+
BR2_PACKAGE_OPENCV4_WITH_PNG=y
147+
BR2_PACKAGE_OPENCV4_WITH_TIFF=y
148+
BR2_PACKAGE_OPENCV4_WITH_V4L=y
150149
BR2_PACKAGE_PANGOMM=y
151150
BR2_PACKAGE_LIBGPIOD=y
152151
BR2_PACKAGE_LIBGPIOD_TOOLS=y

‎configs/sama5d27_som1_ek_optee_graphics_defconfig

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -136,19 +136,18 @@ BR2_PACKAGE_LIBOPENSSL_BIN=y
136136
BR2_PACKAGE_LEVELDB=y
137137
BR2_PACKAGE_CAIRO_TEE=y
138138
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
139-
BR2_PACKAGE_OPENCV3=y
140-
BR2_PACKAGE_OPENCV3_LIB_PHOTO=y
141-
BR2_PACKAGE_OPENCV3_LIB_PYTHON=y
142-
BR2_PACKAGE_OPENCV3_LIB_SHAPE=y
143-
BR2_PACKAGE_OPENCV3_LIB_STITCHING=y
144-
BR2_PACKAGE_OPENCV3_LIB_SUPERRES=y
145-
BR2_PACKAGE_OPENCV3_LIB_TS=y
146-
BR2_PACKAGE_OPENCV3_WITH_FFMPEG=y
147-
BR2_PACKAGE_OPENCV3_WITH_JASPER=y
148-
BR2_PACKAGE_OPENCV3_WITH_JPEG=y
149-
BR2_PACKAGE_OPENCV3_WITH_PNG=y
150-
BR2_PACKAGE_OPENCV3_WITH_TIFF=y
151-
BR2_PACKAGE_OPENCV3_WITH_V4L=y
139+
BR2_PACKAGE_OPENCV4=y
140+
BR2_PACKAGE_OPENCV4_LIB_PHOTO=y
141+
BR2_PACKAGE_OPENCV4_LIB_PYTHON=y
142+
BR2_PACKAGE_OPENCV4_LIB_SHAPE=y
143+
BR2_PACKAGE_OPENCV4_LIB_STITCHING=y
144+
BR2_PACKAGE_OPENCV4_LIB_SUPERRES=y
145+
BR2_PACKAGE_OPENCV4_LIB_TS=y
146+
BR2_PACKAGE_OPENCV4_WITH_FFMPEG=y
147+
BR2_PACKAGE_OPENCV4_WITH_JPEG=y
148+
BR2_PACKAGE_OPENCV4_WITH_PNG=y
149+
BR2_PACKAGE_OPENCV4_WITH_TIFF=y
150+
BR2_PACKAGE_OPENCV4_WITH_V4L=y
152151
BR2_PACKAGE_PANGOMM=y
153152
BR2_PACKAGE_LIBGPIOD=y
154153
BR2_PACKAGE_LIBGPIOD_TOOLS=y

‎configs/sama5d27_wlsom1_ek_graphics_defconfig

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,18 @@ BR2_PACKAGE_LIBOPENSSL_BIN=y
134134
BR2_PACKAGE_LEVELDB=y
135135
BR2_PACKAGE_CAIRO_TEE=y
136136
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
137-
BR2_PACKAGE_OPENCV3=y
138-
BR2_PACKAGE_OPENCV3_LIB_PHOTO=y
139-
BR2_PACKAGE_OPENCV3_LIB_PYTHON=y
140-
BR2_PACKAGE_OPENCV3_LIB_SHAPE=y
141-
BR2_PACKAGE_OPENCV3_LIB_STITCHING=y
142-
BR2_PACKAGE_OPENCV3_LIB_SUPERRES=y
143-
BR2_PACKAGE_OPENCV3_LIB_TS=y
144-
BR2_PACKAGE_OPENCV3_WITH_FFMPEG=y
145-
BR2_PACKAGE_OPENCV3_WITH_JASPER=y
146-
BR2_PACKAGE_OPENCV3_WITH_JPEG=y
147-
BR2_PACKAGE_OPENCV3_WITH_PNG=y
148-
BR2_PACKAGE_OPENCV3_WITH_TIFF=y
149-
BR2_PACKAGE_OPENCV3_WITH_V4L=y
137+
BR2_PACKAGE_OPENCV4=y
138+
BR2_PACKAGE_OPENCV4_LIB_PHOTO=y
139+
BR2_PACKAGE_OPENCV4_LIB_PYTHON=y
140+
BR2_PACKAGE_OPENCV4_LIB_SHAPE=y
141+
BR2_PACKAGE_OPENCV4_LIB_STITCHING=y
142+
BR2_PACKAGE_OPENCV4_LIB_SUPERRES=y
143+
BR2_PACKAGE_OPENCV4_LIB_TS=y
144+
BR2_PACKAGE_OPENCV4_WITH_FFMPEG=y
145+
BR2_PACKAGE_OPENCV4_WITH_JPEG=y
146+
BR2_PACKAGE_OPENCV4_WITH_PNG=y
147+
BR2_PACKAGE_OPENCV4_WITH_TIFF=y
148+
BR2_PACKAGE_OPENCV4_WITH_V4L=y
150149
BR2_PACKAGE_PANGOMM=y
151150
BR2_PACKAGE_LIBGPIOD_TOOLS=y
152151
BR2_PACKAGE_LIBINPUT=y

‎configs/sama5d29_curiosity_graphics_defconfig

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,19 +132,18 @@ BR2_PACKAGE_LIBOPENSSL_BIN=y
132132
BR2_PACKAGE_LEVELDB=y
133133
BR2_PACKAGE_CAIRO_TEE=y
134134
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
135-
BR2_PACKAGE_OPENCV3=y
136-
BR2_PACKAGE_OPENCV3_LIB_PHOTO=y
137-
BR2_PACKAGE_OPENCV3_LIB_PYTHON=y
138-
BR2_PACKAGE_OPENCV3_LIB_SHAPE=y
139-
BR2_PACKAGE_OPENCV3_LIB_STITCHING=y
140-
BR2_PACKAGE_OPENCV3_LIB_SUPERRES=y
141-
BR2_PACKAGE_OPENCV3_LIB_TS=y
142-
BR2_PACKAGE_OPENCV3_WITH_FFMPEG=y
143-
BR2_PACKAGE_OPENCV3_WITH_JASPER=y
144-
BR2_PACKAGE_OPENCV3_WITH_JPEG=y
145-
BR2_PACKAGE_OPENCV3_WITH_PNG=y
146-
BR2_PACKAGE_OPENCV3_WITH_TIFF=y
147-
BR2_PACKAGE_OPENCV3_WITH_V4L=y
135+
BR2_PACKAGE_OPENCV4=y
136+
BR2_PACKAGE_OPENCV4_LIB_PHOTO=y
137+
BR2_PACKAGE_OPENCV4_LIB_PYTHON=y
138+
BR2_PACKAGE_OPENCV4_LIB_SHAPE=y
139+
BR2_PACKAGE_OPENCV4_LIB_STITCHING=y
140+
BR2_PACKAGE_OPENCV4_LIB_SUPERRES=y
141+
BR2_PACKAGE_OPENCV4_LIB_TS=y
142+
BR2_PACKAGE_OPENCV4_WITH_FFMPEG=y
143+
BR2_PACKAGE_OPENCV4_WITH_JPEG=y
144+
BR2_PACKAGE_OPENCV4_WITH_PNG=y
145+
BR2_PACKAGE_OPENCV4_WITH_TIFF=y
146+
BR2_PACKAGE_OPENCV4_WITH_V4L=y
148147
BR2_PACKAGE_PANGOMM=y
149148
BR2_PACKAGE_LIBGPIOD=y
150149
BR2_PACKAGE_LIBGPIOD_TOOLS=y

‎configs/sama5d2_ptc_ek_graphics_defconfig

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,19 +116,18 @@ BR2_PACKAGE_LIBOPENSSL_BIN=y
116116
BR2_PACKAGE_LEVELDB=y
117117
BR2_PACKAGE_CAIRO_TEE=y
118118
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
119-
BR2_PACKAGE_OPENCV3=y
120-
BR2_PACKAGE_OPENCV3_LIB_PHOTO=y
121-
BR2_PACKAGE_OPENCV3_LIB_PYTHON=y
122-
BR2_PACKAGE_OPENCV3_LIB_SHAPE=y
123-
BR2_PACKAGE_OPENCV3_LIB_STITCHING=y
124-
BR2_PACKAGE_OPENCV3_LIB_SUPERRES=y
125-
BR2_PACKAGE_OPENCV3_LIB_TS=y
126-
BR2_PACKAGE_OPENCV3_WITH_FFMPEG=y
127-
BR2_PACKAGE_OPENCV3_WITH_JASPER=y
128-
BR2_PACKAGE_OPENCV3_WITH_JPEG=y
129-
BR2_PACKAGE_OPENCV3_WITH_PNG=y
130-
BR2_PACKAGE_OPENCV3_WITH_TIFF=y
131-
BR2_PACKAGE_OPENCV3_WITH_V4L=y
119+
BR2_PACKAGE_OPENCV4=y
120+
BR2_PACKAGE_OPENCV4_LIB_PHOTO=y
121+
BR2_PACKAGE_OPENCV4_LIB_PYTHON=y
122+
BR2_PACKAGE_OPENCV4_LIB_SHAPE=y
123+
BR2_PACKAGE_OPENCV4_LIB_STITCHING=y
124+
BR2_PACKAGE_OPENCV4_LIB_SUPERRES=y
125+
BR2_PACKAGE_OPENCV4_LIB_TS=y
126+
BR2_PACKAGE_OPENCV4_WITH_FFMPEG=y
127+
BR2_PACKAGE_OPENCV4_WITH_JPEG=y
128+
BR2_PACKAGE_OPENCV4_WITH_PNG=y
129+
BR2_PACKAGE_OPENCV4_WITH_TIFF=y
130+
BR2_PACKAGE_OPENCV4_WITH_V4L=y
132131
BR2_PACKAGE_PANGOMM=y
133132
BR2_PACKAGE_LIBGPIOD_TOOLS=y
134133
BR2_PACKAGE_LIBINPUT=y

‎configs/sama5d2_xplained_graphics_defconfig

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -133,19 +133,18 @@ BR2_PACKAGE_LIBOPENSSL_BIN=y
133133
BR2_PACKAGE_LEVELDB=y
134134
BR2_PACKAGE_CAIRO_TEE=y
135135
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
136-
BR2_PACKAGE_OPENCV3=y
137-
BR2_PACKAGE_OPENCV3_LIB_PHOTO=y
138-
BR2_PACKAGE_OPENCV3_LIB_PYTHON=y
139-
BR2_PACKAGE_OPENCV3_LIB_SHAPE=y
140-
BR2_PACKAGE_OPENCV3_LIB_STITCHING=y
141-
BR2_PACKAGE_OPENCV3_LIB_SUPERRES=y
142-
BR2_PACKAGE_OPENCV3_LIB_TS=y
143-
BR2_PACKAGE_OPENCV3_WITH_FFMPEG=y
144-
BR2_PACKAGE_OPENCV3_WITH_JASPER=y
145-
BR2_PACKAGE_OPENCV3_WITH_JPEG=y
146-
BR2_PACKAGE_OPENCV3_WITH_PNG=y
147-
BR2_PACKAGE_OPENCV3_WITH_TIFF=y
148-
BR2_PACKAGE_OPENCV3_WITH_V4L=y
136+
BR2_PACKAGE_OPENCV4=y
137+
BR2_PACKAGE_OPENCV4_LIB_PHOTO=y
138+
BR2_PACKAGE_OPENCV4_LIB_PYTHON=y
139+
BR2_PACKAGE_OPENCV4_LIB_SHAPE=y
140+
BR2_PACKAGE_OPENCV4_LIB_STITCHING=y
141+
BR2_PACKAGE_OPENCV4_LIB_SUPERRES=y
142+
BR2_PACKAGE_OPENCV4_LIB_TS=y
143+
BR2_PACKAGE_OPENCV4_WITH_FFMPEG=y
144+
BR2_PACKAGE_OPENCV4_WITH_JPEG=y
145+
BR2_PACKAGE_OPENCV4_WITH_PNG=y
146+
BR2_PACKAGE_OPENCV4_WITH_TIFF=y
147+
BR2_PACKAGE_OPENCV4_WITH_V4L=y
149148
BR2_PACKAGE_PANGOMM=y
150149
BR2_PACKAGE_LIBGPIOD=y
151150
BR2_PACKAGE_LIBGPIOD_TOOLS=y

‎configs/sama5d2_xplained_optee_graphics_defconfig

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -135,19 +135,18 @@ BR2_PACKAGE_LIBOPENSSL_BIN=y
135135
BR2_PACKAGE_LEVELDB=y
136136
BR2_PACKAGE_CAIRO_TEE=y
137137
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
138-
BR2_PACKAGE_OPENCV3=y
139-
BR2_PACKAGE_OPENCV3_LIB_PHOTO=y
140-
BR2_PACKAGE_OPENCV3_LIB_PYTHON=y
141-
BR2_PACKAGE_OPENCV3_LIB_SHAPE=y
142-
BR2_PACKAGE_OPENCV3_LIB_STITCHING=y
143-
BR2_PACKAGE_OPENCV3_LIB_SUPERRES=y
144-
BR2_PACKAGE_OPENCV3_LIB_TS=y
145-
BR2_PACKAGE_OPENCV3_WITH_FFMPEG=y
146-
BR2_PACKAGE_OPENCV3_WITH_JASPER=y
147-
BR2_PACKAGE_OPENCV3_WITH_JPEG=y
148-
BR2_PACKAGE_OPENCV3_WITH_PNG=y
149-
BR2_PACKAGE_OPENCV3_WITH_TIFF=y
150-
BR2_PACKAGE_OPENCV3_WITH_V4L=y
138+
BR2_PACKAGE_OPENCV4=y
139+
BR2_PACKAGE_OPENCV4_LIB_PHOTO=y
140+
BR2_PACKAGE_OPENCV4_LIB_PYTHON=y
141+
BR2_PACKAGE_OPENCV4_LIB_SHAPE=y
142+
BR2_PACKAGE_OPENCV4_LIB_STITCHING=y
143+
BR2_PACKAGE_OPENCV4_LIB_SUPERRES=y
144+
BR2_PACKAGE_OPENCV4_LIB_TS=y
145+
BR2_PACKAGE_OPENCV4_WITH_FFMPEG=y
146+
BR2_PACKAGE_OPENCV4_WITH_JPEG=y
147+
BR2_PACKAGE_OPENCV4_WITH_PNG=y
148+
BR2_PACKAGE_OPENCV4_WITH_TIFF=y
149+
BR2_PACKAGE_OPENCV4_WITH_V4L=y
151150
BR2_PACKAGE_PANGOMM=y
152151
BR2_PACKAGE_LIBGPIOD=y
153152
BR2_PACKAGE_LIBGPIOD_TOOLS=y

‎configs/sama5d3_xplained_graphics_defconfig

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,18 @@ BR2_PACKAGE_LIBOPENSSL_BIN=y
117117
BR2_PACKAGE_LEVELDB=y
118118
BR2_PACKAGE_CAIRO_TEE=y
119119
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
120-
BR2_PACKAGE_OPENCV3=y
121-
BR2_PACKAGE_OPENCV3_LIB_PHOTO=y
122-
BR2_PACKAGE_OPENCV3_LIB_PYTHON=y
123-
BR2_PACKAGE_OPENCV3_LIB_SHAPE=y
124-
BR2_PACKAGE_OPENCV3_LIB_STITCHING=y
125-
BR2_PACKAGE_OPENCV3_LIB_SUPERRES=y
126-
BR2_PACKAGE_OPENCV3_LIB_TS=y
127-
BR2_PACKAGE_OPENCV3_WITH_FFMPEG=y
128-
BR2_PACKAGE_OPENCV3_WITH_JASPER=y
129-
BR2_PACKAGE_OPENCV3_WITH_JPEG=y
130-
BR2_PACKAGE_OPENCV3_WITH_PNG=y
131-
BR2_PACKAGE_OPENCV3_WITH_TIFF=y
132-
BR2_PACKAGE_OPENCV3_WITH_V4L=y
120+
BR2_PACKAGE_OPENCV4=y
121+
BR2_PACKAGE_OPENCV4_LIB_PHOTO=y
122+
BR2_PACKAGE_OPENCV4_LIB_PYTHON=y
123+
BR2_PACKAGE_OPENCV4_LIB_SHAPE=y
124+
BR2_PACKAGE_OPENCV4_LIB_STITCHING=y
125+
BR2_PACKAGE_OPENCV4_LIB_SUPERRES=y
126+
BR2_PACKAGE_OPENCV4_LIB_TS=y
127+
BR2_PACKAGE_OPENCV4_WITH_FFMPEG=y
128+
BR2_PACKAGE_OPENCV4_WITH_JPEG=y
129+
BR2_PACKAGE_OPENCV4_WITH_PNG=y
130+
BR2_PACKAGE_OPENCV4_WITH_TIFF=y
131+
BR2_PACKAGE_OPENCV4_WITH_V4L=y
133132
BR2_PACKAGE_PANGOMM=y
134133
BR2_PACKAGE_LIBGPIOD=y
135134
BR2_PACKAGE_LIBGPIOD_TOOLS=y

‎configs/sama5d4_xplained_graphics_defconfig

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -119,19 +119,18 @@ BR2_PACKAGE_LIBOPENSSL_BIN=y
119119
BR2_PACKAGE_LEVELDB=y
120120
BR2_PACKAGE_CAIRO_TEE=y
121121
BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
122-
BR2_PACKAGE_OPENCV3=y
123-
BR2_PACKAGE_OPENCV3_LIB_PHOTO=y
124-
BR2_PACKAGE_OPENCV3_LIB_PYTHON=y
125-
BR2_PACKAGE_OPENCV3_LIB_SHAPE=y
126-
BR2_PACKAGE_OPENCV3_LIB_STITCHING=y
127-
BR2_PACKAGE_OPENCV3_LIB_SUPERRES=y
128-
BR2_PACKAGE_OPENCV3_LIB_TS=y
129-
BR2_PACKAGE_OPENCV3_WITH_FFMPEG=y
130-
BR2_PACKAGE_OPENCV3_WITH_JASPER=y
131-
BR2_PACKAGE_OPENCV3_WITH_JPEG=y
132-
BR2_PACKAGE_OPENCV3_WITH_PNG=y
133-
BR2_PACKAGE_OPENCV3_WITH_TIFF=y
134-
BR2_PACKAGE_OPENCV3_WITH_V4L=y
122+
BR2_PACKAGE_OPENCV4=y
123+
BR2_PACKAGE_OPENCV4_LIB_PHOTO=y
124+
BR2_PACKAGE_OPENCV4_LIB_PYTHON=y
125+
BR2_PACKAGE_OPENCV4_LIB_SHAPE=y
126+
BR2_PACKAGE_OPENCV4_LIB_STITCHING=y
127+
BR2_PACKAGE_OPENCV4_LIB_SUPERRES=y
128+
BR2_PACKAGE_OPENCV4_LIB_TS=y
129+
BR2_PACKAGE_OPENCV4_WITH_FFMPEG=y
130+
BR2_PACKAGE_OPENCV4_WITH_JPEG=y
131+
BR2_PACKAGE_OPENCV4_WITH_PNG=y
132+
BR2_PACKAGE_OPENCV4_WITH_TIFF=y
133+
BR2_PACKAGE_OPENCV4_WITH_V4L=y
135134
BR2_PACKAGE_PANGOMM=y
136135
BR2_PACKAGE_LIBGPIOD=y
137136
BR2_PACKAGE_LIBGPIOD_TOOLS=y

0 commit comments

Comments
 (0)