7 files changed, 0 insertions, 198 deletions
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest
index ea3a2c7cf1d7..6fdd9de9ab33 100644
--- a/sci-libs/flann/Manifest
+++ b/sci-libs/flann/Manifest
@@ -1,9 +1,3 @@
-AUX flann-1.8.4-CUDA_NVCC_FLAGS.patch 618 BLAKE2B aeede537c8996a6850a411101895bd5fb84afd70ea98f9a8ce6ef581ac85dc381ab1e65ab6d0061a3a2e776d6bda0d5d0581379a2b1077d0785a1a3e0d20c614 SHA512 8a6e385b0b36386288861bb795fda34cc636d73862c1321fc4482855dd5032179bf3ea0016bd7c51e8d6abf0da3b70f6d22058d8fd2da414db09b2e2bb662a7b
-AUX flann-1.8.4-cuda5.5.patch 2227 BLAKE2B 383d33d3463c5be530f6ce6fdb12ac1abc44ddb3d99f1742136e4f9f9633ebccc0b8fd57d53aeecf74be70b2fd5f4e714d0bdc2f809c7a62bb67d7988f4c9f59 SHA512 628367450c5d1a45dc69817ce58e90f87602d1593244a2663703ce02967e98a1fb323ec636700bd20b9278640d89b4453330d1e08e49ebdbfffce65ab5c7ba74
-AUX flann-1.8.4-docdir.patch 571 BLAKE2B 19e6c5161290bec1b85157452884ba9c6272fe85002213023f2e07370ef639e517409496e4418d22ed748921ab9bf0d54d581ff6292bf31bbbcdef3219e67cf5 SHA512 ef2fc88ff254afebf75a75bebad5021ec5aa00077cf3ed3b31242a7e7c17ee872d3cff71064b6bd6ecaf7c284dba31032aa0d0f71ba6257e1ebd01513036978c
-AUX flann-1.8.4-examples.patch 1020 BLAKE2B b4eb466cb53aa6e4ebb2285c605685974e6d371fd4efd2a33c71c78acf427c33c326ca5c29b38a6a8e3641c1063226f18c9dcf75a6e4e5e095a9ca3555bf83af SHA512 5baeb594d2b4a1a8456135c9f0bec72a3182dcacbdebd398b079f13982e5e7a1722500313699ea25b7085f1dca3cab4ea355992d9014135e011452168e65fc83
-AUX flann-1.8.4-multilib.patch 570 BLAKE2B c3f6e2a88a6d6eed16b5cafedf2ba99b51d9686e83f2f8b10ac7ed28b835965cda7ff4702d2f106585cea941ae1475eab89f1323f3c5ad8e05553203c5bece8d SHA512 1f5a72920af200f23a318b3205cce498a6f193eb8f89b85fcc9b8ef45c49b4b98143cc9cc6996821e63cdb709eeac0f13b46c129471aa82a06ec22be1f4ec8f6
-AUX flann-1.8.4-options.patch 1485 BLAKE2B 2691716dfda2e931849a0852c7be75b3dbc14877950ade2a52481108d75b84aea2686f2245f7b924c0f1a20f94e3ff34372fda519c474e0bdfc961911e746ccf SHA512 2335ddf683d883f0b5247b4d7e688644231c2d6a914c0d271965b0024270e77a36ccded142ab666651833712cb64a427eb753f76757cf5eb765f130b170f4251
 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
 EBUILD flann-1.9.1.ebuild 2185 BLAKE2B d81b5cc93e470f846c915401b35d7bcdae4c8c9a14c412829035367f85c1f4c9eb690bef0002d24adf78ab655603a06c14969a95670fab826baf04f14b025d2a SHA512 d2b3ee61c1066ca047bfa5ccbad4c37402fc3f10fbe0f4be8ea75580935de055cde09ea7db2a9a51ba4da14e7f069748be8642c63b5cd074d86bffbaaf568650
 EBUILD flann-9999.ebuild 2121 BLAKE2B 336e31bc0e5ece6c63ca3c82e3b61605fbfa46e76ab111574b3d05303add959c31b2339c60768d7ab32f56e534b7cb08f08c1a29fb15279bf2d048a02d00df06 SHA512 6e3978c5c92f2723eed4615cc292aedd3be146a9afe0fc47cd1922a12fb9fb58d81d2f284f2946d96c5f4c2d235f06c0dc5929b37258ea83bf412d36a0ac1e2e
diff --git a/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch b/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch
deleted file mode 100644
index 1a068af28351..000000000000
--- a/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/cpp/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index 8e72409..a4b35b1 100644
---- a/src/cpp/CMakeLists.txt
-+++ b/src/cpp/CMakeLists.txt
-@@ -15,7 +15,7 @@ endif()
- set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA)
- 
- if (BUILD_CUDA_LIB)
--    SET(CUDA_NVCC_FLAGS -DFLANN_USE_CUDA)
-+    SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-DFLANN_USE_CUDA")
-     if(CMAKE_COMPILER_IS_GNUCC)
- 		set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-Xcompiler;-fPIC;-arch=sm_13" )
-         if (NVCC_COMPILER_BINDIR)
diff --git a/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch b/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch
deleted file mode 100644
index 046b3252c36f..000000000000
--- a/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch
+++ /dev/null
@@ -1,61 +0,0 @@
- src/cpp/flann/util/cuda/result_set.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/cpp/flann/util/cuda/result_set.h b/src/cpp/flann/util/cuda/result_set.h
-index 9ac8111..324ca1e 100644
---- a/src/cpp/flann/util/cuda/result_set.h
-+++ b/src/cpp/flann/util/cuda/result_set.h
-@@ -54,7 +54,7 @@ struct SingleResultSet
-     DistanceType bestDist;
-     const DistanceType epsError;
- 
--    __device__
-+    __device__ __host__
-     SingleResultSet( DistanceType eps ) : bestIndex(-1),bestDist(INFINITY), epsError(eps){ }
- 
-     __device__
-@@ -129,7 +129,7 @@ struct KnnResultSet
-     const DistanceType epsError;
- 
- 
--    __device__
-+    __device__ __host__
-     KnnResultSet(int knn, bool sortResults, DistanceType eps) : foundNeighbors(0),largestHeapDist(INFINITY),k(knn), sorted(sortResults), epsError(eps){ }
- 
-     //          __host__ __device__
-@@ -229,7 +229,7 @@ struct CountingRadiusResultSet
-     DistanceType radius_sq_;
-     int max_neighbors_;
- 
--    __device__
-+    __device__ __host__
-     CountingRadiusResultSet(DistanceType radius, int max_neighbors) : count_(0),radius_sq_(radius), max_neighbors_(max_neighbors){ }
- 
-     __device__
-@@ -279,7 +279,7 @@ struct RadiusKnnResultSet
-     //          int count_;
- 
- 
--    __device__
-+    __device__ __host__
-     RadiusKnnResultSet(DistanceType radius, int knn, int* segment_starts, bool sortResults) : foundNeighbors(0),largestHeapDist(radius),k(knn), sorted(sortResults), radius_sq_(radius),segment_starts_(segment_starts) { }
- 
-     //          __host__ __device__
-@@ -381,7 +381,7 @@ struct KnnRadiusResultSet
-     const DistanceType radius_sq;
- 
- 
--    __device__
-+    __device__ __host__
-     KnnRadiusResultSet(int knn, bool sortResults, DistanceType eps, DistanceType radius) : foundNeighbors(0),largestHeapDist(radius),k(knn), sorted(sortResults), epsError(eps),radius_sq(radius){ }
- 
-     //          __host__ __device__
-@@ -484,7 +484,7 @@ struct RadiusResultSet
-     int count_;
-     bool sorted_;
- 
--    __device__
-+    __device__ __host__
-     RadiusResultSet(DistanceType radius, int* segment_starts, bool sorted) : radius_sq_(radius), segment_starts_(segment_starts), count_(0), sorted_(sorted){ }
- 
-     __device__
diff --git a/sci-libs/flann/files/flann-1.8.4-docdir.patch b/sci-libs/flann/files/flann-1.8.4-docdir.patch
deleted file mode 100644
index 4b16684de14d..000000000000
--- a/sci-libs/flann/files/flann-1.8.4-docdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- doc/CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 2d8eb24..aeac8ed 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -1,4 +1,8 @@
- find_package(LATEX)
-+
-+if (NOT DOCDIR)
-+  set(DOCDIR share/doc/flann)
-+endif ()
-  
- if (EXISTS ${PDFLATEX_COMPILER} AND EXISTS ${BIBTEX_COMPILER})
-     include(${PROJECT_SOURCE_DIR}/cmake/UseLATEX.cmake)
-@@ -14,6 +18,6 @@ endif()
- 
- install(
-     FILES manual.pdf
--    DESTINATION share/doc/flann
-+    DESTINATION ${DOCDIR}
-     OPTIONAL
- )
diff --git a/sci-libs/flann/files/flann-1.8.4-examples.patch b/sci-libs/flann/files/flann-1.8.4-examples.patch
deleted file mode 100644
index b3346b35f73c..000000000000
--- a/sci-libs/flann/files/flann-1.8.4-examples.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3922081fbd6710f4b72421069f6bf24dc37d35a8 Mon Sep 17 00:00:00 2001
-From: Casey Goodlett <casey.goodlett@kitware.com>
-Date: Thu, 8 Aug 2013 18:42:45 -0400
-Subject: [PATCH] Option to disable example building
-
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b19367..410a8f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,6 +53,7 @@ option(BUILD_C_BINDINGS "Build C bindings" ON)
- option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON)
- option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON)
- option(BUILD_CUDA_LIB "Build CUDA library" OFF)
-+option(BUILD_EXAMPLES "Build examples" ON)
- option(USE_OPENMP "Use OpenMP multi-threading" ON)
- option(USE_MPI "Use MPI" OFF)
- 
-@@ -154,7 +155,9 @@ endif()
- 
- add_subdirectory( cmake )
- add_subdirectory( src )
--add_subdirectory( examples )
-+if (BUILD_EXAMPLES)
-+  add_subdirectory( examples )
-+endif(BUILD_EXAMPLES)
- add_subdirectory( test )
- add_subdirectory( doc )
- 
--- 
-1.8.5.1
-
diff --git a/sci-libs/flann/files/flann-1.8.4-multilib.patch b/sci-libs/flann/files/flann-1.8.4-multilib.patch
deleted file mode 100644
index 17a9d65dd778..000000000000
--- a/sci-libs/flann/files/flann-1.8.4-multilib.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- cmake/flann_utils.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake
-index 1a10939..afe4742 100644
---- a/cmake/flann_utils.cmake
-+++ b/cmake/flann_utils.cmake
-@@ -1,6 +1,6 @@
- macro(GET_OS_INFO)
-     string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME})
--    set(FLANN_LIB_INSTALL_DIR "lib")
-+    set(FLANN_LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
-     set(FLANN_INCLUDE_INSTALL_DIR
-         "include/${PROJECT_NAME_LOWER}-${FLANN_MAJOR_VERSION}.${FLANN_MINOR_VERSION}")
- endmacro(GET_OS_INFO)
diff --git a/sci-libs/flann/files/flann-1.8.4-options.patch b/sci-libs/flann/files/flann-1.8.4-options.patch
deleted file mode 100644
index dd212aca66a4..000000000000
--- a/sci-libs/flann/files/flann-1.8.4-options.patch
+++ /dev/null
@@ -1,41 +0,0 @@
- CMakeLists.txt | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 410a8f9..b6244a4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,6 +54,8 @@ option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON)
- option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON)
- option(BUILD_CUDA_LIB "Build CUDA library" OFF)
- option(BUILD_EXAMPLES "Build examples" ON)
-+option(BUILD_TESTS "Build tests" ON)
-+option(BUILD_DOC "Build documentation" ON)
- option(USE_OPENMP "Use OpenMP multi-threading" ON)
- option(USE_MPI "Use MPI" OFF)
- 
-@@ -158,8 +160,12 @@ add_subdirectory( src )
- if (BUILD_EXAMPLES)
-   add_subdirectory( examples )
- endif(BUILD_EXAMPLES)
--add_subdirectory( test )
--add_subdirectory( doc )
-+if (BUILD_TESTS)
-+  add_subdirectory( test )
-+endif (BUILD_TESTS)
-+if (BUILD_DOC)
-+  add_subdirectory( doc )
-+endif (BUILD_DOC)
- 
- 
- # CPACK options
-@@ -202,6 +208,9 @@ include(CPack)
- message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}")
- message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
- message(STATUS "Building C bindings: ${BUILD_C_BINDINGS}")
-+message(STATUS "Building examples: ${BUILD_EXAMPLES}")
-+message(STATUS "Building tests: ${BUILD_TESTS}")
-+message(STATUS "Building documentation: ${BUILD_DOC}")
- message(STATUS "Building python bindings: ${BUILD_PYTHON_BINDINGS}")
- message(STATUS "Building matlab bindings: ${BUILD_MATLAB_BINDINGS}")
- message(STATUS "Building CUDA library: ${BUILD_CUDA_LIB}")