aboutsummaryrefslogtreecommitdiff
path: root/package/opencv3/opencv3.mk
diff options
context:
space:
mode:
authorGravatar Bernd Kuhls <bernd.kuhls@t-online.de>2016-03-28 21:49:33 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-03-29 03:08:21 +0200
commitffd0beb788ad57ea94bc3952e7f3960d3231997d (patch)
tree6482eb7f36e251d88d966d3a4e4c361063f42083 /package/opencv3/opencv3.mk
parent4aa2831ac67d7411369eb99c3674d221e08d0210 (diff)
downloadbuildroot-ffd0beb788ad57ea94bc3952e7f3960d3231997d.tar.gz
buildroot-ffd0beb788ad57ea94bc3952e7f3960d3231997d.tar.bz2
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/opencv3.mk')
-rw-r--r--package/opencv3/opencv3.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk
index 3ce78b5c03..91cdfe6428 100644
--- a/package/opencv3/opencv3.mk
+++ b/package/opencv3/opencv3.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENCV3_VERSION = 3.0.0
+OPENCV3_VERSION = 3.1.0
OPENCV3_SITE = $(call github,itseez,opencv,$(OPENCV3_VERSION))
OPENCV3_INSTALL_STAGING = YES
OPENCV3_LICENSE = BSD-3c
@@ -15,7 +15,8 @@ OPENCV3_CONF_OPTS += \
-DBUILD_DOCS=OFF \
-DBUILD_PERF_TESTS=$(if $(BR2_PACKAGE_OPENCV3_BUILD_PERF_TESTS),ON,OFF) \
-DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV3_BUILD_TESTS),ON,OFF) \
- -DBUILD_WITH_DEBUG_INFO=OFF
+ -DBUILD_WITH_DEBUG_INFO=OFF \
+ -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
ifeq ($(BR2_PACKAGE_OPENCV3_BUILD_TESTS)$(BR2_PACKAGE_OPENCV3_BUILD_PERF_TESTS),)
OPENCV3_CONF_OPTS += -DINSTALL_TEST=OFF
@@ -70,7 +71,6 @@ OPENCV3_CONF_OPTS += \
-DBUILD_opencv_core=ON \
-DBUILD_opencv_features2d=$(if $(BR2_PACKAGE_OPENCV3_LIB_FEATURES2D),ON,OFF) \
-DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV3_LIB_FLANN),ON,OFF) \
- -DBUILD_opencv_hal=ON \
-DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),ON,OFF) \
-DBUILD_opencv_imgcodecs=$(if $(BR2_PACKAGE_OPENCV3_LIB_IMGCODECS),ON,OFF) \
-DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV3_LIB_IMGPROC),ON,OFF) \
@@ -201,14 +201,15 @@ OPENCV3_CONF_OPTS += \
-DWITH_EIGEN=OFF \
-DWITH_GDAL=OFF \
-DWITH_GPHOTO2=OFF \
+ -DWITH_MATLAB=OFF \
-DWITH_OPENCL=OFF \
-DWITH_OPENCL_SVM=OFF \
-DWITH_OPENEXR=OFF \
- -DWITH_OPENGL=OFF \
- -DWITH_OPENMP=OFF \
-DWITH_OPENNI2=OFF \
-DWITH_OPENNI=OFF \
-DWITH_UNICAP=OFF \
+ -DWITH_VA=OFF \
+ -DWITH_VA_INTEL=OFF \
-DWITH_VTK=OFF \
-DWITH_WEBP=OFF \
-DWITH_XINE=OFF