summaryrefslogtreecommitdiffstats
path: root/package/opencv3/Config.in
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2016-03-28 21:49:33 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-03-29 03:08:21 +0200
commitffd0beb788ad57ea94bc3952e7f3960d3231997d (patch)
tree6482eb7f36e251d88d966d3a4e4c361063f42083 /package/opencv3/Config.in
parent4aa2831ac67d7411369eb99c3674d221e08d0210 (diff)
downloadbuildroot-ffd0beb788ad57ea94bc3952e7f3960d3231997d.tar.gz
buildroot-ffd0beb788ad57ea94bc3952e7f3960d3231997d.zip
package/opencv3: bump version to 3.1.0
Removed patches applied upstream. This version bump is needed to provide support for ffmpeg 3.0: https://github.com/Itseez/opencv/commit/278747ba458c9097aa72bf664c7a8df96d3a56fa Use BR2_PACKAGE_FFMPEG_AVRESAMPLE by default because OpenCV can use it after https://github.com/Itseez/opencv/commit/2b2e3ee93c6788b892b084cc04d0ead5ab75c197 Before this patch: -- FFMPEG: YES -- codec: YES (ver 57.24.103) -- format: YES (ver 57.25.100) -- util: YES (ver 55.17.103) -- swscale: YES (ver 4.0.100) -- resample: NO After this patch: -- FFMPEG: YES -- codec: YES (ver 57.24.103) -- format: YES (ver 57.25.100) -- util: YES (ver 55.17.103) -- swscale: YES (ver 4.0.100) -- resample: YES (ver 3.0.0) Disabled new options: WITH_MATLAB, WITH_VA, WITH_VA_INTEL, DOWNLOAD_EXTERNAL_TEST_DATA Removed obsolete option BUILD_opencv_hal Removed options WITH_OPENGL & WITH_OPENMP from the "Disabled features" block because they have their own ifeq-block later on. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/opencv3/Config.in')
-rw-r--r--package/opencv3/Config.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in
index 3a185d6871..31fd98a36d 100644
--- a/package/opencv3/Config.in
+++ b/package/opencv3/Config.in
@@ -243,6 +243,7 @@ config BR2_PACKAGE_OPENCV3_WITH_FFMPEG
bool "ffmpeg support"
select BR2_PACKAGE_BZIP2
select BR2_PACKAGE_FFMPEG
+ select BR2_PACKAGE_FFMPEG_AVRESAMPLE
select BR2_PACKAGE_FFMPEG_SWSCALE
depends on !BR2_nios2 # ffmpeg
help
OpenPOWER on IntegriCloud