Commit d16c4669 authored by Samuel Martin's avatar Samuel Martin Committed by Thomas Petazzoni
Browse files

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: default avatarSamuel Martin <s.martin49@gmail.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent fa6a965c

package/opencv/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -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

package/opencv/opencv.mk

+5 −6
Original line number Diff line number Diff line
@@ -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: