diff options
| author | Samuel Martin <s.martin49@gmail.com> | 2014-04-23 01:15:39 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-07-16 22:51:19 +0200 |
| commit | d16c4669592d7be35076bd6925914ac524bb721c (patch) | |
| tree | 4f399226cf0557caebf86a606e72faa1f478b418 | |
| parent | fa6a965c5eca38332d3434071e325c15368b0420 (diff) | |
| download | buildroot-d16c4669592d7be35076bd6925914ac524bb721c.tar.gz buildroot-d16c4669592d7be35076bd6925914ac524bb721c.zip | |
opencv: bump to version 2.4.8
This patch bumps OpenCV version and address the minimal set of change to
get the new version building correctly:
- update the download location;
- force Qt version to Qt 4 when support is enabled;
- naively fix the v4l support.
However, it does not address a couple improvements, among these:
- jasper support;
- python/numpy support;
- Qt4 and Qt5 support (since the 2.4.6 release), so only Qt4 support is
supported in this patch;
- optional libv4l dependency (since 2.4.7 release);
- etc.
These will be addressed in followup patches.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/opencv/Config.in | 2 | ||||
| -rw-r--r-- | package/opencv/opencv.mk | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/package/opencv/Config.in b/package/opencv/Config.in index f9ee416e77..7644d64a94 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -8,7 +8,7 @@ menuconfig BR2_PACKAGE_OPENCV OpenCV (Open Source Computer Vision) is a library of programming functions for real time computer vision. - http://opencv.willowgarage.com/wiki/ + http://opencv.org/ if BR2_PACKAGE_OPENCV diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index 464a95a2fb..d56b5e4bc0 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENCV_VERSION = 2.4.2 -OPENCV_SITE = http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_VERSION) -OPENCV_SOURCE = OpenCV-$(OPENCV_VERSION).tar.bz2 +OPENCV_VERSION = 2.4.8 +OPENCV_SITE = $(call github,itseez,opencv,$(OPENCV_VERSION)) OPENCV_INSTALL_STAGING = YES OPENCV_LICENSE = BSD-3c OPENCV_LICENSE_FILES = doc/license.txt @@ -141,7 +140,7 @@ OPENCV_CONF_OPT += -DWITH_PNG=OFF endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT),y) -OPENCV_CONF_OPT += -DWITH_QT=ON +OPENCV_CONF_OPT += -DWITH_QT=4 OPENCV_DEPENDENCIES += qt else OPENCV_CONF_OPT += -DWITH_QT=OFF @@ -155,10 +154,10 @@ OPENCV_CONF_OPT += -DWITH_TIFF=OFF endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_V4L),y) -OPENCV_CONF_OPT += -DWITH_V4L=ON +OPENCV_CONF_OPT += -DWITH_V4L=ON -DWITH_LIBV4L=ON OPENCV_DEPENDENCIES += libv4l else -OPENCV_CONF_OPT += -DWITH_V4L=OFF +OPENCV_CONF_OPT += -DWITH_V4L=OFF -DWITH_LIBV4L=OFF endif # Installation hooks: |
