diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2018-07-09 01:40:24 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2018-07-09 01:40:24 +0000 |
| commit | f77b145839b03dc2bdcd37582f1aa9a337ef1847 (patch) | |
| tree | 3e542498813a8d98e7dee3531f90694f4b8d0d5c /math/flann | |
| parent | 46ce07ae908f92f96bd8015d0049ea0945d7fbd1 (diff) | |
| download | ports-f77b145839b03dc2bdcd37582f1aa9a337ef1847.tar.gz ports-f77b145839b03dc2bdcd37582f1aa9a337ef1847.zip | |
math/flann: Update 1.8.4 -> 1.9.1-19
A case of abandoned tarball site, and move to github.
Change to CMAKE_ARGS -> CMAKE_OFF.
Remove options DOCS and EXAMPLES: docs now wants latex and other large things,
EXAMPLES weren't meaningful.
Reported by: repology.org
Notes
Notes:
svn path=/head/; revision=474216
Diffstat (limited to 'math/flann')
| -rw-r--r-- | math/flann/Makefile | 19 | ||||
| -rw-r--r-- | math/flann/distinfo | 6 | ||||
| -rw-r--r-- | math/flann/files/patch-src_cpp_flann_algorithms_kdtree__index.h | 19 | ||||
| -rw-r--r-- | math/flann/pkg-plist | 9 |
4 files changed, 17 insertions, 36 deletions
diff --git a/math/flann/Makefile b/math/flann/Makefile index a5a8908cb2a9..38e5353770a2 100644 --- a/math/flann/Makefile +++ b/math/flann/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= flann -DISTVERSION= 1.8.4 -DISTVERSIONSUFFIX= -src +DISTVERSION= 1.9.1-19 +DISTVERSIONSUFFIX= -gf3a17cd CATEGORIES= math -MASTER_SITES= http://people.cs.ubc.ca/~mariusm/uploads/FLANN/ MAINTAINER= yuri@FreeBSD.org COMMENT= Library for fast nearest neighbor searches in high dimensional spaces @@ -15,16 +14,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libhdf5.so:science/hdf5 \ libsz.so:science/szip -USES= cmake:outsource zip -CMAKE_ARGS= -DBUILD_PYTHON_BINDINGS:BOOL=OFF \ - -DBUILD_MATLAB_BINDINGS:BOOL=OFF \ - -DEXAMPLES_SUBDIR:STRING="share/examples/flann" \ - -DUSE_OPENMP:BOOL=OFF # OpenMP search is broken in cmake: https://gitlab.kitware.com/cmake/cmake/issues/17474 +USES= cmake:outsource +USE_GITHUB= yes +GH_ACCOUNT= mariusmuja USE_LDCONFIG= yes -OPTIONS_DEFINE= DOCS EXAMPLES -PLIST_SUB= SHL3=${DISTVERSION} SHL2=${DISTVERSION:R} +PLIST_SUB= SHL3=${DISTVERSION:C/-.*//} SHL2=${DISTVERSION:R} -EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES +CMAKE_OFF= BUILD_PYTHON_BINDINGS BUILD_MATLAB_BINDINGS BUILD_EXAMPLES BUILD_TESTS BUILD_DOC \ + USE_OPENMP # OpenMP search is broken in cmake: https://gitlab.kitware.com/cmake/cmake/issues/17474 .include <bsd.port.mk> diff --git a/math/flann/distinfo b/math/flann/distinfo index 1d03f49a3d4a..db09e872a66b 100644 --- a/math/flann/distinfo +++ b/math/flann/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514618300 -SHA256 (flann-1.8.4-src.zip) = dfbb9321b0d687626a644c70872a2c540b16200e7f4c7bd72f91ae032f445c08 -SIZE (flann-1.8.4-src.zip) = 561057 +TIMESTAMP = 1531098190 +SHA256 (mariusmuja-flann-1.9.1-19-gf3a17cd_GH0.tar.gz) = 5b6f7c8438875ce212da09a9c0e9bbf229bff8ecd326a39b9558b9cc192bb73f +SIZE (mariusmuja-flann-1.9.1-19-gf3a17cd_GH0.tar.gz) = 486172 diff --git a/math/flann/files/patch-src_cpp_flann_algorithms_kdtree__index.h b/math/flann/files/patch-src_cpp_flann_algorithms_kdtree__index.h deleted file mode 100644 index 27c54262e392..000000000000 --- a/math/flann/files/patch-src_cpp_flann_algorithms_kdtree__index.h +++ /dev/null @@ -1,19 +0,0 @@ ---- src/cpp/flann/algorithms/kdtree_index.h.orig 2013-01-16 06:38:32 UTC -+++ src/cpp/flann/algorithms/kdtree_index.h -@@ -36,6 +36,7 @@ - #include <cassert> - #include <cstring> - #include <stdarg.h> -+#include <math.h> - - #include "flann/general.h" - #include "flann/algorithms/nn_index.h" -@@ -663,7 +664,7 @@ private: - ElementType max_span = 0; - size_t div_feat = 0; - for (size_t i=0;i<veclen_;++i) { -- ElementType span = abs(point[i]-leaf_point[i]); -+ ElementType span = fabs(point[i]-leaf_point[i]); - if (span > max_span) { - max_span = span; - div_feat = i; diff --git a/math/flann/pkg-plist b/math/flann/pkg-plist index 9e30fc268685..09b05ca5041c 100644 --- a/math/flann/pkg-plist +++ b/math/flann/pkg-plist @@ -14,6 +14,8 @@ include/flann/algorithms/lsh_index.h include/flann/algorithms/nn_index.h include/flann/config.h include/flann/defines.h +include/flann/ext/lz4.h +include/flann/ext/lz4hc.h include/flann/flann.h include/flann/flann.hpp include/flann/general.h @@ -44,6 +46,10 @@ include/flann/util/sampling.h include/flann/util/saving.h include/flann/util/serialization.h include/flann/util/timer.h +lib/cmake/flann/flann-config-version.cmake +lib/cmake/flann/flann-config.cmake +lib/cmake/flann/flann-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/flann/flann-targets.cmake lib/libflann.so lib/libflann.so.%%SHL2%% lib/libflann.so.%%SHL3%% @@ -53,6 +59,3 @@ lib/libflann_cpp.so.%%SHL3%% lib/libflann_cpp_s.so lib/libflann_s.so libdata/pkgconfig/flann.pc -%%PORTDOCS%%%%DOCSDIR%%/manual.pdf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flann_example_c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flann_example_cpp |