CVS commit: pkgsrc/math

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/math
From: "Dr. Thomas Orgis" <thor%netbsd.org@localhost>
Date: Tue, 27 Apr 2021 15:16:46 +0000

Module Name:    pkgsrc
Committed By:   thor
Date:           Tue Apr 27 15:16:46 UTC 2021

Modified Files:
        pkgsrc/math: Makefile
Added Files:
        pkgsrc/math/flann-lib: DESCR Makefile PLIST buildlink3.mk distinfo
        pkgsrc/math/flann-lib/patches: patch-src_cpp_CMAkeLists.txt

Log Message:
math/flann-lib: added library for nearest-neighbor search


To generate a diff of this commit:
cvs rdiff -u -r1.496 -r1.497 pkgsrc/math/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/math/flann-lib/DESCR \
    pkgsrc/math/flann-lib/Makefile pkgsrc/math/flann-lib/PLIST \
    pkgsrc/math/flann-lib/buildlink3.mk pkgsrc/math/flann-lib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/flann-lib/patches/patch-src_cpp_CMAkeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/Makefile
diff -u pkgsrc/math/Makefile:1.496 pkgsrc/math/Makefile:1.497
--- pkgsrc/math/Makefile:1.496  Tue Apr 27 08:23:15 2021
+++ pkgsrc/math/Makefile        Tue Apr 27 15:16:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.496 2021/04/27 08:23:15 wiz Exp $
+# $NetBSD: Makefile,v 1.497 2021/04/27 15:16:46 thor Exp $
 
 COMMENT=       Mathematics
 
@@ -169,6 +169,7 @@ SUBDIR+=    fftw2
 SUBDIR+=       fftwf
 SUBDIR+=       fgmp
 SUBDIR+=       fityk
+SUBDIR+=       flann-lib
 SUBDIR+=       fplll
 SUBDIR+=       fricas
 SUBDIR+=       funst

Added files:

Index: pkgsrc/math/flann-lib/DESCR
diff -u /dev/null pkgsrc/math/flann-lib/DESCR:1.1
--- /dev/null   Tue Apr 27 15:16:46 2021
+++ pkgsrc/math/flann-lib/DESCR Tue Apr 27 15:16:46 2021
@@ -0,0 +1,6 @@
+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, Python, and Ruby.
Index: pkgsrc/math/flann-lib/Makefile
diff -u /dev/null pkgsrc/math/flann-lib/Makefile:1.1
--- /dev/null   Tue Apr 27 15:16:46 2021
+++ pkgsrc/math/flann-lib/Makefile      Tue Apr 27 15:16:46 2021
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.1 2021/04/27 15:16:46 thor Exp $
+
+GITHUB_PROJECT=        flann
+GITHUB_TAG=    1.9.1
+DISTNAME=      1.9.1
+PKGNAME=       ${GITHUB_PROJECT}-lib-${DISTNAME}
+CATEGORIES=    math
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=mariusmuja/}
+DIST_SUBDIR=   ${GITHUB_PROJECT}
+
+MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
+HOMEPAGE=      https://github.com/mariusmuja/flann/
+COMMENT=       Fast Library for Approximate Nearest Neighbors
+LICENSE=       modified-bsd
+
+WRKSRC=                ${WRKDIR}/flann-1.9.1
+USE_CMAKE=     yes
+USE_TOOLS+=    pkg-config
+USE_LANGUAGES= c c++
+
+CMAKE_ARGS+=   -DBUILD_DOC=OFF
+CMAKE_ARGS+=   -DBUILD_PYTHON_BINDINGS=OFF
+CMAKE_ARGS+=   -DBUILD_MATLAB_BINDINGS=OFF
+# Need to check if those two are out of experimental stage.
+# MPI needs parallel HDF5.
+CMAKE_ARGS+=   -DUSE_MPI=OFF
+CMAKE_ARGS+=   -DBUILD_CUDA_LIB=OFF
+
+PKGCONFIG_OVERRIDE+=   cmake/flann.pc.in
+
+.include "../../devel/hdf5-c++/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/flann-lib/PLIST
diff -u /dev/null pkgsrc/math/flann-lib/PLIST:1.1
--- /dev/null   Tue Apr 27 15:16:46 2021
+++ pkgsrc/math/flann-lib/PLIST Tue Apr 27 15:16:46 2021
@@ -0,0 +1,60 @@
+@comment $NetBSD: PLIST,v 1.1 2021/04/27 15:16:46 thor Exp $
+bin/flann_example_c
+bin/flann_example_cpp
+include/flann/algorithms/all_indices.h
+include/flann/algorithms/autotuned_index.h
+include/flann/algorithms/center_chooser.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/ext/lz4.h
+include/flann/ext/lz4hc.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/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/serialization.h
+include/flann/util/timer.h
+lib/libflann.so
+lib/libflann.so.1.9
+lib/libflann.so.${PKGVERSION}
+lib/libflann_cpp.so
+lib/libflann_cpp.so.1.9
+lib/libflann_cpp.so.${PKGVERSION}
+lib/libflann_cpp_s.a
+lib/libflann_s.a
+lib/pkgconfig/flann.pc
Index: pkgsrc/math/flann-lib/buildlink3.mk
diff -u /dev/null pkgsrc/math/flann-lib/buildlink3.mk:1.1
--- /dev/null   Tue Apr 27 15:16:46 2021
+++ pkgsrc/math/flann-lib/buildlink3.mk Tue Apr 27 15:16:46 2021
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2021/04/27 15:16:46 thor Exp $
+
+BUILDLINK_TREE+=       flann-lib
+
+.if !defined(FLANN_LIB_BUILDLINK3_MK)
+FLANN_LIB_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.flann-lib+=      flann-lib>=1.9.0
+BUILDLINK_ABI_DEPENDS.flann-lib+=      flann-lib>=1.9.0
+BUILDLINK_PKGSRCDIR.flann-lib?=        ../../wip/flann-lib
+
+.include "../../devel/hdf5-c++/buildlink3.mk"
+
+.endif # FLANN_LIB_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -flann-lib
Index: pkgsrc/math/flann-lib/distinfo
diff -u /dev/null pkgsrc/math/flann-lib/distinfo:1.1
--- /dev/null   Tue Apr 27 15:16:46 2021
+++ pkgsrc/math/flann-lib/distinfo      Tue Apr 27 15:16:46 2021
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2021/04/27 15:16:46 thor Exp $
+
+SHA1 (flann/1.9.1.tar.gz) = ca3aee5670297f1db2eff122679ed9e87a70d830
+RMD160 (flann/1.9.1.tar.gz) = d84e5c61ef84ea9474f4917f68fadcff6e0d93b7
+SHA512 (flann/1.9.1.tar.gz) = 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
+Size (flann/1.9.1.tar.gz) = 485391 bytes
+SHA1 (patch-src_cpp_CMAkeLists.txt) = 34c5367c8e8a01b701b3e90251d6c0aefe20ba4d

Index: pkgsrc/math/flann-lib/patches/patch-src_cpp_CMAkeLists.txt
diff -u /dev/null pkgsrc/math/flann-lib/patches/patch-src_cpp_CMAkeLists.txt:1.1
--- /dev/null   Tue Apr 27 15:16:46 2021
+++ pkgsrc/math/flann-lib/patches/patch-src_cpp_CMAkeLists.txt  Tue Apr 27 15:16:46 2021
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_cpp_CMAkeLists.txt,v 1.1 2021/04/27 15:16:46 thor Exp $
+
+See https://github.com/mariusmuja/flann/issues/443 .
+
+--- src/cpp/CMakeLists.txt.orig        2016-08-05 01:20:50.000000000 +0200
++++ src/cpp/CMakeLists.txt     2020-04-15 21:19:33.106219724 +0200
+@@ -29,7 +29,7 @@
+ endif()
+ 
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
+-    add_library(flann_cpp SHARED "")
++    add_library(flann_cpp SHARED "empty.cpp")
+     set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX)
+     target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
+ 
+@@ -83,7 +83,7 @@
+     set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
+ 
+     if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
+-        add_library(flann SHARED "")
++        add_library(flann SHARED "empty.cpp")
+         set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
+         target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
+     else()
+--- src/cpp/empty.cpp  1970-01-01 01:00:00.000000000 +0100
++++ src/cpp/empty.cpp  2020-04-15 21:46:36.507084559 +0200
+@@ -0,0 +1 @@
++// This is just a dummy to fix the build system.

Prev by Date: CVS commit: pkgsrc/graphics/vtk
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/graphics/vtk
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index