From 0ff3d3d4710387fdf15ce8d129cda29eef16f8e3 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Mon, 16 Jul 2012 23:37:30 +0200 Subject: opencv: bump to version 2.4.2 Update Config.in and .mk according to the new features. Remove the patch handling build with uclibc without long double support, which seems not necessary anymore. Signed-off-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- ...pencv-uclibc-optional-long-double-support.patch | 40 ---------------------- 1 file changed, 40 deletions(-) delete mode 100644 package/opencv/opencv-uclibc-optional-long-double-support.patch (limited to 'package/opencv/opencv-uclibc-optional-long-double-support.patch') diff --git a/package/opencv/opencv-uclibc-optional-long-double-support.patch b/package/opencv/opencv-uclibc-optional-long-double-support.patch deleted file mode 100644 index b319849fb..000000000 --- a/package/opencv/opencv-uclibc-optional-long-double-support.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 ---- - 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 - #endif -+#include - - #include "defines.h" - -@@ -59,9 +60,11 @@ - template<> - inline double abs(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 x) { return fabsl(x); } -- -+#endif - - template - struct Accumulator { typedef T Type; }; -- cgit v1.2.3