flann-lib: updated to 1.9.2

Version 1.9.2
* Removed redundant assignment
* Removed unnecessary null checks before delete
* Reverted PR 424 due to lack of portability
* fscanf fix
* Out of bounds check
* Fixed MacOS build
* Fixed build system with dummy.c hack
* Fixed misleading indentation in util/any.h
* Included datasets in repo
* Correct typo in definition
* Fix typos
* CMakefile CUDA sources fix
* Documentation fix
* Scoping issue fix
* Documentation fixes
* Changed return value
* Fixed CUDA crash - guarantee prealloc > 0
* Fixed wrong variable use
* Fixed RNG initialization
* Updated link to PDF

5 files changed, 18 insertions, 45 deletions

diff --git a/math/flann-lib/Makefile b/math/flann-lib/Makefile
index 60b1de0c1f4..b4fe4bcdca0 100644
--- a/math/flann-lib/Makefile
+++ b/math/flann-lib/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.2 2021/05/03 09:26:42 thor Exp $
+# $NetBSD: Makefile,v 1.3 2022/11/01 21:29:07 adam Exp $
 
-DISTNAME=	flann-1.9.1
+DISTNAME=	flann-1.9.2
 PKGNAME=	${DISTNAME:S/-/-lib-/}
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mariusmuja/}
 GITHUB_PROJECT=	flann
 
 MAINTAINER=	thomas.orgis@uni-hamburg.de
-HOMEPAGE=	https://github.com/mariusmuja/flann/
+HOMEPAGE=	https://github.com/mariusmuja/flann
 COMMENT=	Fast Library for Approximate Nearest Neighbors
 LICENSE=	modified-bsd
 
 USE_CMAKE=	yes
-USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
+USE_TOOLS+=	pkg-config
 
 CMAKE_ARGS+=	-DBUILD_DOC=OFF
 CMAKE_ARGS+=	-DBUILD_PYTHON_BINDINGS=OFF
@@ -25,6 +25,6 @@ CMAKE_ARGS+=	-DBUILD_CUDA_LIB=OFF
 
 PKGCONFIG_OVERRIDE+=	cmake/flann.pc.in
 
+.include "../../archivers/lz4/buildlink3.mk"
 .include "../../devel/hdf5-c++/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/flann-lib/PLIST b/math/flann-lib/PLIST
index d0484ea33ca..950380f278e 100644
--- a/math/flann-lib/PLIST
+++ b/math/flann-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/04/27 15:16:46 thor Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/11/01 21:29:07 adam Exp $
 bin/flann_example_c
 bin/flann_example_cpp
 include/flann/algorithms/all_indices.h
@@ -17,8 +17,6 @@ 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
@@ -49,12 +47,16 @@ 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-relwithdebinfo.cmake
+lib/cmake/flann/flann-targets.cmake
 lib/libflann.so
-lib/libflann.so.1.9
 lib/libflann.so.${PKGVERSION}
+lib/libflann.so.1.9
 lib/libflann_cpp.so
-lib/libflann_cpp.so.1.9
 lib/libflann_cpp.so.${PKGVERSION}
+lib/libflann_cpp.so.1.9
 lib/libflann_cpp_s.a
 lib/libflann_s.a
 lib/pkgconfig/flann.pc
diff --git a/math/flann-lib/buildlink3.mk b/math/flann-lib/buildlink3.mk
index 0f6e6ff98da..16bd46820f7 100644
--- a/math/flann-lib/buildlink3.mk
+++ b/math/flann-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2021/04/27 15:26:34 thor Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/11/01 21:29:07 adam Exp $
 
 BUILDLINK_TREE+=	flann-lib
 
@@ -7,7 +7,7 @@ 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?=	../../math/flann-lib
+BUILDLINK_PKGSRCDIR.flann-lib?=		../../math/flann-lib
 
 .include "../../devel/hdf5-c++/buildlink3.mk"
 
diff --git a/math/flann-lib/distinfo b/math/flann-lib/distinfo
index 1a6c409df67..0196dff4867 100644
--- a/math/flann-lib/distinfo
+++ b/math/flann-lib/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:55:40 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/11/01 21:29:07 adam Exp $
 
-BLAKE2s (flann-1.9.1.tar.gz) = 13e7f2db57bbc838864b8faad31c8c8cdd6ad1394c0f2308a9229cbc1a3e9128
-SHA512 (flann-1.9.1.tar.gz) = 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7
-Size (flann-1.9.1.tar.gz) = 485391 bytes
-SHA1 (patch-src_cpp_CMAkeLists.txt) = 34c5367c8e8a01b701b3e90251d6c0aefe20ba4d
+BLAKE2s (flann-1.9.2.tar.gz) = 629ba9ff8aaf860d90df1cd9d0809d5a27d1820f3356fb8e59dabeb4dc5bd110
+SHA512 (flann-1.9.2.tar.gz) = e1235383e4e3919607cd1417738220c1601342dcf908071a6f75039c45116bd558d9f0534be037b1a8ac5b4ba5b0be5b62bf1d96e44911f14b34f73d941addb2
+Size (flann-1.9.2.tar.gz) = 34641759 bytes
diff --git a/math/flann-lib/patches/patch-src_cpp_CMAkeLists.txt b/math/flann-lib/patches/patch-src_cpp_CMAkeLists.txt
deleted file mode 100644
index 0a5c3227a82..00000000000
--- a/math/flann-lib/patches/patch-src_cpp_CMAkeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-$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.