[wip/flann] Bump to 1.7.1

Changes since 1.6.11:

    Version 1.7.1 (23 December 2011)
        fixes in CUDA kd-tree index
        renamed some constants to avoid conflicts with other libraries

    Version 1.7.0 (20 December 2011)
        new index type (HierarchicalClusteringIndex) for matching features
        using any metric distance (works well for binary features and Hamming
        distances)
        LSH implementation for matching binary features contributed by Vincent
        Rabaud
        GPU kd-tree matching for 3D features on CUDA compatible hardware
        contributed by Andreas Muyzel
        support for multithreaded search using the TBB library contributed by
        Nick Vanbaelen
        better performance when searching for many neighbors
        improvements to the MPI search support
        support for radius search using multiple query points at once
        small breaking API change if upgrading from a previous version, check
        the manual on how to update your code.
        bug fixes

flann/Makefile

@@ -2,56 +2,34 @@
 # Created:			Nizar Sallem on Tue, 28 Dec 2010
 #
 
-PKGNAME= 			flann-${VERSION}
-DISTNAME=			flann-${VERSION}-src
-PKGREVISION=			1
-VERSION=			1.6.11
-EXTRACT_SUFX= .zip
-CATEGORIES=		math
+VERSION=	1.7.1
+DISTNAME=	flann-${VERSION}-src
+PKGNAME=	flann-${VERSION}
 MASTER_SITES=	http://www.cs.ubc.ca/~mariusm/uploads/FLANN/
+EXTRACT_SUFX=	.zip
 
+CATEGORIES=	math
+COMMENT=	Fast approximate nearest neighbor search for high dimension
 MAINTAINER=	openrobots@laas.fr
 HOMEPAGE=	http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN
-COMMENT=	Fast approximate nearest neighbor search library for high dimension
 LICENSE=	2-clause-bsd
 
 USE_LANGUAGES+=	c c++
-#you need it to disable cmake error since we do in-source build
-CMAKE_ARGS+= -DLATEX_OUTPUT_PATH=${WRKSRC}
-CMAKE_ARGS+= -DBUILD_PYTHON_BINDINGS=OFF
-
-#option for c bindings generation
-PKG_SUPPORTED_OPTIONS+=		c
-PKG_SUGGESTED_OPTIONS+=		c
-PKG_OPTION_DESCR.c=				Enable c bindings.
-define PKG_OPTION_SET.c
-  CMAKE_ARGS+=			-DBUILD_C_BINDINGS=ON
-endef
-define PKG_OPTION_UNSET.c
-  CMAKE_ARGS+=			-DBUILD_C_BINDINGS=OFF
-endef
-
-#option for matlab bindings generation
-PKG_SUPPORTED_OPTIONS+=		matlab
-PKG_SUGGESTED_OPTIONS-=		matlab
-PKG_OPTION_DESCR.matlab=	Enable matlab bindings.
-define PKG_OPTION_SET.matlab
-  CMAKE_ARGS+=			-DBUILD_MATLAB_BINDINGS=ON
-endef
-define PKG_OPTION_UNSET.matlab
-  CMAKE_ARGS+=			-DBUILD_MATLAB_BINDINGS=OFF
-endef
-
-#option for using mpi 
-PKG_SUPPORTED_OPTIONS+=		mpi
-PKG_SUGGESTED_OPTIONS-=		mpi
-PKG_OPTION_DESCR.mpi=	Enable message parsing interface using.
-define PKG_OPTION_SET.mpi
-  CMAKE_ARGS+=			-DUSE_MPI=ON
-endef
-define PKG_OPTION_UNSET.mpi
-  CMAKE_ARGS+=			-DUSE_MPI=OFF
-endef
+
+CMAKE_ARGS+=	-DBUILD_MATLAB_BINDINGS=OFF
+CMAKE_ARGS+=	-DBUILD_PYTHON_BINDINGS=OFF
+CMAKE_ARGS+=	-DUSE_MPI=OFF
+CMAKE_ARGS+=	-DBUILD_CUDA_LIB=OFF
+CMAKE_ARGS+=	-DBUILD_C_BINDINGS=ON
+
+CMAKE_ARGS+=	-DLATEX_COMPILER=${PREFIX.latex}/bin/latex
+
+# because of in-source build
+CMAKE_ARGS+=	-DLATEX_OUTPUT_PATH=${WRKSRC}
+
+# because -O triggers a g++-4.1.3 internal bug
+_CFLAGS_NDEBUG=$(if $(filter gcc-c++-4.1.%,${PKGVERSION.gcc-c++}),-O0,-O3)
+_CFLAGS_NDEBUG+= -DNDEBUG
 
 include ../../mk/sysdep/latex.mk
 include ../../mk/sysdep/cmake.mk

flann/PLIST

-@comment Tue Dec 28 12:44:07 CET 2010
-bin/flann_example_c
-bin/flann_example_cpp
+@comment Wed Jul 18 18:29:44 CEST 2012
 include/flann/algorithms/all_indices.h
 include/flann/algorithms/autotuned_index.h
 include/flann/algorithms/composite_index.h
 include/flann/algorithms/dist.h
 include/flann/algorithms/hierarchical_clustering_index.h
+include/flann/algorithms/kdtree_cuda_3d_index.h
+include/flann/algorithms/kdtree_cuda_builder.h
 include/flann/algorithms/kdtree_index.h
 include/flann/algorithms/kdtree_single_index.h
 include/flann/algorithms/kmeans_index.h
 include/flann/algorithms/linear_index.h
+include/flann/algorithms/lsh_index.h
 include/flann/algorithms/nn_index.h
+include/flann/config.h
+include/flann/defines.h
 include/flann/flann.h
 include/flann/flann.hpp
-include/flann/flann_mpi.hpp
 include/flann/general.h
 include/flann/io/hdf5.h
+include/flann/mpi/client.h
+include/flann/mpi/index.h
+include/flann/mpi/matrix.h
+include/flann/mpi/queries.h
+include/flann/mpi/server.h
 include/flann/nn/ground_truth.h
 include/flann/nn/index_testing.h
 include/flann/nn/simplex_downhill.h
+include/flann/tbb/bodies.hpp
 include/flann/util/allocator.h
+include/flann/util/any.h
+include/flann/util/cuda/heap.h
+include/flann/util/cuda/result_set.h
+include/flann/util/cutil_math.h
+include/flann/util/dynamic_bitset.h
 include/flann/util/heap.h
 include/flann/util/logger.h
+include/flann/util/lsh_table.h
 include/flann/util/matrix.h
 include/flann/util/object_factory.h
-include/flann/util/pair_iterator.hpp
+include/flann/util/params.h
 include/flann/util/random.h
 include/flann/util/result_set.h
 include/flann/util/sampling.h
 include/flann/util/saving.h
 include/flann/util/timer.h
 lib/libflann.so
+lib/libflann.so.1.7
 lib/libflann.so.${PKGVERSION}
-lib/libflann.so.1.6
 lib/libflann_cpp-gd.so
 lib/libflann_cpp.so
+lib/libflann_cpp.so.1.7
 lib/libflann_cpp.so.${PKGVERSION}
-lib/libflann_cpp.so.1.6
 lib/libflann_cpp_s-gd.a
 lib/libflann_cpp_s.a
 lib/libflann_s.a

flann/depend.mk

@@ -14,14 +14,15 @@ ifeq (+,$(FLANN_DEPEND_MK)) # -------------------------------------------
 PREFER.flann?=	robotpkg
 
 DEPEND_USE+=		flann
-DEPEND_ABI.flann?=	flann>=1.6.11
+DEPEND_ABI.flann?=	flann>=1.7
 DEPEND_DIR.flann?=	../../wip/flann
 
 SYSTEM_SEARCH.flann=\
-	include/flann/flann.h		\
-	include/flann/flann.hpp	\
-	lib/libflann.so					\
-	lib/libflann_cpp.so			\
+	'include/flann/config.h:/FLANN_VERSION/s/[^0-9.]//gp'	\
+	include/flann/flann.h					\
+	include/flann/flann.hpp					\
+	lib/libflann.so						\
+	lib/libflann_cpp.so					\
 	lib/libflann_cpp-gd.so
 
 endif # FLANN_DEPEND_MK -------------------------------------------------

flann/distinfo

-SHA1 (flann-1.6.11-src.zip) = a29ca96897572f352d2d1e00194c4cb7f1d764a8
-RMD160 (flann-1.6.11-src.zip) = c5b47c79490ed3b13722a8c2a6a0d2a6e14b662c
-Size (flann-1.6.11-src.zip) = 501116 bytes
-SHA1 (patch-aa) = e01dbb9586cabe327e93573180f42d59a1e31496
+SHA1 (flann-1.7.1-src.zip) = 61b9858620528919ea60a2a4b085ccc2b3c2d138
+RMD160 (flann-1.7.1-src.zip) = cec1ce99d2c91ddf8f20d5aa8009a08c5347b904
+Size (flann-1.7.1-src.zip) = 582517 bytes
+SHA1 (patch-aa) = cb8d071c7091be6df6cfc3a0608978a4b5a38816
 SHA1 (patch-ab) = d5e8047b5a01a7617839a3f5f88233b0c9d25764
+SHA1 (patch-ac) = 254fdc27725319eb87a05b25cccf236ede40843c
+SHA1 (patch-ad) = 77efb736ac941a2471b82f691764f88bac7efa2f

flann/patches/patch-aa

-diff -r -u src/cpp/CMakeLists.txt src/cpp/CMakeLists.txt
---- src/cpp/CMakeLists.txt	2011-05-17 07:34:24.000000000 +0100
-+++ src/cpp/CMakeLists.txt	2011-07-20 11:52:24.265513215 +0100
-@@ -35,12 +35,12 @@
+--- src/cpp/CMakeLists.txt	2012-07-18 17:37:07.660607502 +0200
++++ src/cpp/CMakeLists.txt.orig	2011-12-23 12:16:09.000000000 +0100
+@@ -60,12 +60,12 @@
  #debug libraries
  add_library(flann_cpp-gd SHARED ${CPP_SOURCES})
  set_target_properties(flann_cpp-gd PROPERTIES 
@@ -15,4 +14,4 @@ diff -r -u src/cpp/CMakeLists.txt src/cpp/CMakeLists.txt
 +set_target_properties(flann_cpp_s-gd PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}")
  set_property(TARGET flann_cpp_s-gd PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
  
- if (BUILD_C_BINDINGS)
+ 

flann/patches/patch-ac

+Examples require hdf5 library, for which we do not have a sysdep (yet)
+
+--- CMakeLists.txt~	2011-12-23 12:16:09.000000000 +0100
++++ CMakeLists.txt	2012-07-18 17:44:41.453575103 +0200
+@@ -143,7 +143,6 @@
+ 
+ add_subdirectory( cmake )
+ add_subdirectory( src )
+-add_subdirectory( examples )
+ add_subdirectory( test )
+ add_subdirectory( doc )
+ 

flann/patches/patch-ad

+Required at least on netbsd-5.1 where fabsl(3) is missing
+
+--- src/cpp/flann/algorithms/dist.h~	2011-12-23 12:16:09.000000000 +0100
++++ src/cpp/flann/algorithms/dist.h	2012-07-18 17:57:55.304606497 +0200
+@@ -54,13 +54,13 @@
+ inline int abs<int>(int x) { return ::abs(x); }
+ 
+ template<>
+-inline float abs<float>(float x) { return fabsf(x); }
++inline float abs<float>(float x) { return std::abs(x); }
+ 
+ template<>
+-inline double abs<double>(double x) { return fabs(x); }
++inline double abs<double>(double x) { return std::abs(x); }
+ 
+ template<>
+-inline long double abs<long double>(long double x) { return fabsl(x); }
++inline long double abs<long double>(long double x) { return std::abs(x); }
+ 
+ 
+ template<typename T>