gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

opencv: bump version to fix ffmpeg support build

Browse Source 
A newer version of opencv is needed after the ffmpeg version bump. This
version does need a minor patch for fabsl on uClibc though.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2011-12-11 21:54:52 +01:00
parent 265356b6b9
commit 848fa1d243
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
package/opencv/opencv-uclibc-optional-long-double-support.patch Normal file
View File

@ -0,0 +1,40 @@
Upstream: https://code.ros.org/trac/opencv/ticket/1515
[PATCH] Fix compile issue in flann module on uClibc without long double support
uClibc configured without UCLIBC_HAS_LONG_DOUBLE_MATH (because of user
choice or simply that the arch doesn't provide long doubles) doesn't
provide fabsl(), breaking the build in the flann module.
Work around it by not providing the long double template specialization.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
modules/flann/include/opencv2/flann/dist.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Index: opencv-2.3.1a/modules/flann/include/opencv2/flann/dist.h
===================================================================
--- opencv-2.3.1a.orig/modules/flann/include/opencv2/flann/dist.h
+++ opencv-2.3.1a/modules/flann/include/opencv2/flann/dist.h
@@ -40,6 +40,7 @@
#else
#include <stdint.h>
#endif
+#include <features.h>
#include "defines.h"
@@ -59,9 +60,11 @@
template<>
inline double abs<double>(double x) { return fabs(x); }
+/* uClibc configured without long double math doesn't provide fabsl */
+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LONG_DOUBLE_MATH__))
template<>
inline long double abs<long double>(long double x) { return fabsl(x); }
-
+#endif
template<typename T>
struct Accumulator { typedef T Type; };

5
package/opencv/opencv.mk
View File

@ -3,9 +3,8 @@
# OpenCV (Open Source Computer Vision)
#
#############################################################
OPENCV_SERIES = 2.3
OPENCV_VERSION = $(OPENCV_SERIES).0
OPENCV_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/opencvlibrary/opencv-unix/$(OPENCV_SERIES)
OPENCV_VERSION = 2.3.1a
OPENCV_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/opencvlibrary/opencv-unix/2.3.1
OPENCV_SOURCE = OpenCV-$(OPENCV_VERSION).tar.bz2
OPENCV_INSTALL_STAGING = YES