svn commit: r546770 - in head/math/flann: . files
Yuri Victorovich
yuri at FreeBSD.org
Fri Aug 28 17:49:52 UTC 2020
Author: yuri
Date: Fri Aug 28 17:49:50 2020
New Revision: 546770
URL: https://svnweb.freebsd.org/changeset/ports/546770
Log:
math/flann: Update 1.9.1-19 -> 1.9.1-29
Modified:
head/math/flann/Makefile
head/math/flann/distinfo
head/math/flann/files/patch-examples_CMakeLists.txt
head/math/flann/files/patch-src_cpp_CMakeLists.txt
head/math/flann/pkg-descr
head/math/flann/pkg-plist
Modified: head/math/flann/Makefile
==============================================================================
--- head/math/flann/Makefile Fri Aug 28 17:43:23 2020 (r546769)
+++ head/math/flann/Makefile Fri Aug 28 17:49:50 2020 (r546770)
@@ -1,9 +1,8 @@
# $FreeBSD$
PORTNAME= flann
-DISTVERSION= 1.9.1-19
-DISTVERSIONSUFFIX= -gf3a17cd
-PORTREVISION= 2
+DISTVERSION= 1.9.1-29
+DISTVERSIONSUFFIX= -g1d04523
CATEGORIES= math
MAINTAINER= yuri at FreeBSD.org
@@ -13,14 +12,13 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libhdf5.so:science/hdf5 \
+ liblz4.so:archivers/liblz4 \
libsz.so:science/szip
-USES= cmake
+USES= cmake localbase:ldflags pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= mariusmuja
USE_LDCONFIG= yes
-
-PLIST_SUB= SHL3=${DISTVERSION:C/-.*//} SHL2=${DISTVERSION:R}
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
Modified: head/math/flann/distinfo
==============================================================================
--- head/math/flann/distinfo Fri Aug 28 17:43:23 2020 (r546769)
+++ head/math/flann/distinfo Fri Aug 28 17:49:50 2020 (r546770)
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1598635410
+SHA256 (mariusmuja-flann-1.9.1-29-g1d04523_GH0.tar.gz) = 0a2764b4dfecf0cacc2d6b94055b7dbfa1f37430f60a273bdb8a75aa2166aedd
+SIZE (mariusmuja-flann-1.9.1-29-g1d04523_GH0.tar.gz) = 463622
Modified: head/math/flann/files/patch-examples_CMakeLists.txt
==============================================================================
--- head/math/flann/files/patch-examples_CMakeLists.txt Fri Aug 28 17:43:23 2020 (r546769)
+++ head/math/flann/files/patch-examples_CMakeLists.txt Fri Aug 28 17:49:50 2020 (r546770)
@@ -1,6 +1,6 @@
---- examples/CMakeLists.txt.orig 2013-01-16 06:38:32 UTC
+--- examples/CMakeLists.txt.orig 2019-04-07 03:21:23 UTC
+++ examples/CMakeLists.txt
-@@ -7,7 +7,7 @@ if (BUILD_C_BINDINGS)
+@@ -8,7 +8,7 @@ if (BUILD_C_BINDINGS)
set_target_properties(flann_example_c PROPERTIES COMPILE_FLAGS -std=c99)
add_dependencies(examples flann_example_c)
@@ -9,7 +9,7 @@
endif()
if (HDF5_FOUND)
-@@ -20,7 +20,7 @@ if (HDF5_FOUND)
+@@ -22,7 +22,7 @@ if (HDF5_FOUND)
endif()
add_dependencies(examples flann_example_cpp)
@@ -18,7 +18,7 @@
if (USE_MPI AND HDF5_IS_PARALLEL)
-@@ -28,7 +28,7 @@ if (HDF5_FOUND)
+@@ -31,7 +31,7 @@ if (HDF5_FOUND)
target_link_libraries(flann_example_mpi flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES})
add_dependencies(examples flann_example_mpi)
Modified: head/math/flann/files/patch-src_cpp_CMakeLists.txt
==============================================================================
--- head/math/flann/files/patch-src_cpp_CMakeLists.txt Fri Aug 28 17:43:23 2020 (r546769)
+++ head/math/flann/files/patch-src_cpp_CMakeLists.txt Fri Aug 28 17:49:50 2020 (r546770)
@@ -1,29 +1,16 @@
---- src/cpp/CMakeLists.txt.orig 2013-01-16 06:38:32 UTC
+--- src/cpp/CMakeLists.txt.orig 2019-04-07 03:21:23 UTC
+++ src/cpp/CMakeLists.txt
-@@ -8,7 +8,7 @@ file(GLOB_RECURSE C_SOURCES flann.cpp)
- file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp)
- file(GLOB_RECURSE CU_SOURCES *.cu)
-
--add_library(flann_cpp_s STATIC ${CPP_SOURCES})
-+add_library(flann_cpp_s SHARED ${CPP_SOURCES})
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
- set_target_properties(flann_cpp_s PROPERTIES COMPILE_FLAGS -fPIC)
- endif()
-@@ -24,7 +24,7 @@ if (BUILD_CUDA_LIB)
+@@ -25,11 +25,11 @@ if (BUILD_CUDA_LIB)
else()
- set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-arch=sm_13" )
+ set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};" )
endif()
- cuda_add_library(flann_cuda_s STATIC ${CU_SOURCES})
+ cuda_add_library(flann_cuda_s SHARED ${CU_SOURCES})
set_property(TARGET flann_cuda_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
endif()
-@@ -76,7 +76,7 @@ endif()
-
-
- if (BUILD_C_BINDINGS)
-- add_library(flann_s STATIC ${C_SOURCES})
-+ add_library(flann_s SHARED ${C_SOURCES})
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
- set_target_properties(flann_s PROPERTIES COMPILE_FLAGS -fPIC)
- endif()
+-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
++if(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|DragonFly" AND CMAKE_COMPILER_IS_GNUCC)
+ add_library(flann_cpp SHARED "")
+ set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX)
+ target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
Modified: head/math/flann/pkg-descr
==============================================================================
--- head/math/flann/pkg-descr Fri Aug 28 17:43:23 2020 (r546769)
+++ head/math/flann/pkg-descr Fri Aug 28 17:49:50 2020 (r546770)
@@ -6,4 +6,4 @@ the best algorithm and optimum parameters depending on
FLANN is written in C++ and contains bindings for the following languages: C,
MATLAB and Python.
-WWW: https://www.cs.ubc.ca/research/flann
+WWW: https://www.cs.ubc.ca/research/flann/
Modified: head/math/flann/pkg-plist
==============================================================================
--- head/math/flann/pkg-plist Fri Aug 28 17:43:23 2020 (r546769)
+++ head/math/flann/pkg-plist Fri Aug 28 17:49:50 2020 (r546770)
@@ -14,8 +14,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
@@ -51,11 +49,11 @@ 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%%
+lib/libflann.so.1.9
+lib/libflann.so.1.9.1
lib/libflann_cpp.so
-lib/libflann_cpp.so.%%SHL2%%
-lib/libflann_cpp.so.%%SHL3%%
-lib/libflann_cpp_s.so
-lib/libflann_s.so
+lib/libflann_cpp.so.1.9
+lib/libflann_cpp.so.1.9.1
+lib/libflann_cpp_s.a
+lib/libflann_s.a
libdata/pkgconfig/flann.pc
More information about the svn-ports-head
mailing list