From c5a8ed3a0ba284a7ddbd40266cb51a50442e0241 Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Mon, 10 Dec 2012 18:50:35 +0100
Subject: [PATCH] [wip/flann] Delete: moved to robotpkg
---
Makefile | 1 -
flann/DESCR | 8 ------
flann/Makefile | 36 --------------------------
flann/PLIST | 58 ------------------------------------------
flann/depend.mk | 30 ----------------------
flann/distinfo | 7 -----
flann/patches/patch-aa | 17 -------------
flann/patches/patch-ab | 13 ----------
flann/patches/patch-ac | 12 ---------
flann/patches/patch-ad | 21 ---------------
10 files changed, 203 deletions(-)
delete mode 100644 flann/DESCR
delete mode 100644 flann/Makefile
delete mode 100644 flann/PLIST
delete mode 100644 flann/depend.mk
delete mode 100644 flann/distinfo
delete mode 100644 flann/patches/patch-aa
delete mode 100644 flann/patches/patch-ab
delete mode 100644 flann/patches/patch-ac
delete mode 100644 flann/patches/patch-ad
diff --git a/Makefile b/Makefile
index 58b831c7..4ae6d7a7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@
COMMENT= WIP packages
SUBDIR+= attentional-genom
-SUBDIR+= flann
SUBDIR+= genom3
SUBDIR+= genom3-openprs
SUBDIR+= genom3-pocolibs
diff --git a/flann/DESCR b/flann/DESCR
deleted file mode 100644
index 918f69b6..00000000
--- a/flann/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-FLANN is a library for performing fast approximate nearest neighbor
-searches in high dimensional spaces. It contains a collection of
-algorithms we found to work best for nearest neighbor search and a system
-for automatically choosing the best algorithm and optimum parameters
-depending on the dataset.
-
-FLANN is written in C++ and contains bindings for the following languages:
-C, MATLAB and Python.
diff --git a/flann/Makefile b/flann/Makefile
deleted file mode 100644
index 42a4f12d..00000000
--- a/flann/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# robotpkg Makefile for: math/flann
-# Created: Nizar Sallem on Tue, 28 Dec 2010
-#
-
-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
-LICENSE= 2-clause-bsd
-
-USE_LANGUAGES+= c c++
-
-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
-include ../../mk/robotpkg.mk
diff --git a/flann/PLIST b/flann/PLIST
deleted file mode 100644
index ca04581d..00000000
--- a/flann/PLIST
+++ /dev/null
@@ -1,58 +0,0 @@
-@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/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/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_cpp-gd.so
-lib/libflann_cpp.so
-lib/libflann_cpp.so.1.7
-lib/libflann_cpp.so.${PKGVERSION}
-lib/libflann_cpp_s-gd.a
-lib/libflann_cpp_s.a
-lib/libflann_s.a
-lib/pkgconfig/flann.pc
-share/doc/flann/manual.pdf
diff --git a/flann/depend.mk b/flann/depend.mk
deleted file mode 100644
index 07eae8b5..00000000
--- a/flann/depend.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# robotpkg depend.mk for: math/flann
-# Created: Nizar Sallem on Wed, 20 Jul 2011
-#
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-FLANN_DEPEND_MK:= ${FLANN_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= flann
-endif
-
-ifeq (+,$(FLANN_DEPEND_MK)) # -------------------------------------------
-
-PREFER.flann?= robotpkg
-
-DEPEND_USE+= flann
-DEPEND_ABI.flann?= flann>=1.7
-DEPEND_DIR.flann?= ../../wip/flann
-
-SYSTEM_SEARCH.flann=\
- '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 -------------------------------------------------
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/flann/distinfo b/flann/distinfo
deleted file mode 100644
index 5a263ca3..00000000
--- a/flann/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-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
diff --git a/flann/patches/patch-aa b/flann/patches/patch-aa
deleted file mode 100644
index 0dfc1733..00000000
--- a/flann/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
-- COMPILE_FLAGS ${CMAKE_CXX_FLAGS_DEBUG}
-+ COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}"
- DEFINE_SYMBOL FLANN_EXPORTS
- )
-
- add_library(flann_cpp_s-gd STATIC ${CPP_SOURCES})
--set_target_properties(flann_cpp_s-gd PROPERTIES COMPILE_FLAGS ${CMAKE_CXX_FLAGS_DEBUG})
-+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)
-
-
diff --git a/flann/patches/patch-ab b/flann/patches/patch-ab
deleted file mode 100644
index 3295e8f2..00000000
--- a/flann/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-Do not install files in $PREFIX/lib64
-
---- cmake/flann_utils.cmake.orig 2011-09-12 16:55:08.455179000 +0200
-+++ cmake/flann_utils.cmake 2011-09-12 16:55:13.939530000 +0200
-@@ -2,7 +2,7 @@
- string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME})
- if(OS_IS_LINUX)
- if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-- set(FLANN_LIB_INSTALL_DIR "lib64")
-+ set(FLANN_LIB_INSTALL_DIR "lib")
- else(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
- set(FLANN_LIB_INSTALL_DIR "lib")
- endif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
diff --git a/flann/patches/patch-ac b/flann/patches/patch-ac
deleted file mode 100644
index 6221a930..00000000
--- a/flann/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-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 )
-
diff --git a/flann/patches/patch-ad b/flann/patches/patch-ad
deleted file mode 100644
index 61f274e5..00000000
--- a/flann/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-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>
--
GitLab