diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rw-r--r-- | system_lz4.patch | 21 |
3 files changed, 16 insertions, 15 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Jan 29 18:40:53 UTC 2018 +# Tue Mar 6 21:44:38 UTC 2018 pkgbase = flann pkgdesc = FLANN is a library for performing fast approximate nearest neighbor searches in high dimensional spaces pkgver = 1.9.1 - pkgrel = 1 + pkgrel = 2 url = http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN arch = i686 arch = x86_64 @@ -18,7 +18,7 @@ pkgbase = flann source = https://github.com/mariusmuja/flann/archive/1.9.1.tar.gz source = system_lz4.patch md5sums = 73adef1c7bf8e8b978987e7860926ea6 - md5sums = 67aef022b455bbbd5a08920f70eb589d + md5sums = af01e25f6b090c1c1f266797a03f4766 pkgname = flann @@ -6,7 +6,7 @@ pkgname=flann pkgver=1.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="FLANN is a library for performing fast approximate nearest neighbor searches in high dimensional spaces" arch=('i686' 'x86_64') url='http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN' @@ -17,7 +17,7 @@ optdepends=('python2: python bindings' 'cuda: cuda support') source=("https://github.com/mariusmuja/flann/archive/${pkgver}.tar.gz" "system_lz4.patch") md5sums=('73adef1c7bf8e8b978987e7860926ea6' - '67aef022b455bbbd5a08920f70eb589d') + 'af01e25f6b090c1c1f266797a03f4766') prepare() { cd "$srcdir/flann-${pkgver}" diff --git a/system_lz4.patch b/system_lz4.patch index 33eed02923f9..c3d535fb6538 100644 --- a/system_lz4.patch +++ b/system_lz4.patch @@ -1,6 +1,6 @@ diff -ura original/flann-1.9.1/src/cpp/CMakeLists.txt patched/flann-1.9.1/src/cpp/CMakeLists.txt ---- original/flann-1.9.1/src/cpp/CMakeLists.txt 2016-08-05 01:20:50.000000000 +0200 -+++ patched/flann-1.9.1/src/cpp/CMakeLists.txt 2018-01-10 21:04:55.071840885 +0100 +--- original/flann-1.9.1/src/cpp/CMakeLists.txt 2018-03-06 22:37:57.382075683 +0100 ++++ patched/flann-1.9.1/src/cpp/CMakeLists.txt 2018-03-06 22:39:23.750880552 +0100 @@ -4,8 +4,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h) @@ -18,28 +18,29 @@ diff -ura original/flann-1.9.1/src/cpp/CMakeLists.txt patched/flann-1.9.1/src/cp set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) + target_link_libraries(flann_cpp -+ lz4 + -Wl,-whole-archive + flann_cpp_s + -Wl,-no-whole-archive ++ lz4 + ) if (BUILD_CUDA_LIB) cuda_add_library(flann_cuda SHARED "") -@@ -85,7 +90,11 @@ +@@ -85,7 +90,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) add_library(flann SHARED "") set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive) + target_link_libraries(flann -+ lz4 + -Wl,-whole-archive + flann_s -+ -Wl,-no-whole-archive) ++ -Wl,-no-whole-archive ++ lz4 ++ ) else() add_library(flann SHARED ${C_SOURCES}) -@@ -112,7 +121,7 @@ +@@ -112,7 +122,7 @@ install ( @@ -48,7 +49,7 @@ diff -ura original/flann-1.9.1/src/cpp/CMakeLists.txt patched/flann-1.9.1/src/cp RUNTIME DESTINATION bin LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR} ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR} -@@ -129,7 +138,7 @@ +@@ -129,7 +139,7 @@ if (BUILD_C_BINDINGS) install ( @@ -58,8 +59,8 @@ diff -ura original/flann-1.9.1/src/cpp/CMakeLists.txt patched/flann-1.9.1/src/cp LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR} ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR} diff -ura original/flann-1.9.1/src/cpp/flann/util/serialization.h patched/flann-1.9.1/src/cpp/flann/util/serialization.h ---- original/flann-1.9.1/src/cpp/flann/util/serialization.h 2016-08-05 01:20:50.000000000 +0200 -+++ patched/flann-1.9.1/src/cpp/flann/util/serialization.h 2018-01-10 20:33:19.220139992 +0100 +--- original/flann-1.9.1/src/cpp/flann/util/serialization.h 2018-03-06 22:37:57.383075669 +0100 ++++ patched/flann-1.9.1/src/cpp/flann/util/serialization.h 2018-03-06 22:38:52.811308429 +0100 @@ -6,8 +6,8 @@ #include <cstdlib> #include <cstring> |