summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2016-08-20 17:08:48 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2016-09-11 09:51:30 +0200
commit9d60345d3c6f22ebef860019e44f1a199eae16d8 (patch)
treead504272deb7556b902f64dde00a6b54231b465d
parentcaa7dfec456029f4b31a087f220641012adabe9c (diff)
downloadscientific-9d60345d3c6f22ebef860019e44f1a199eae16d8.tar.gz
scientific-9d60345d3c6f22ebef860019e44f1a199eae16d8.tar.xz
flann: Version bump to 1.9.1
-rw-r--r--packages/sci-libs/flann/files/flann-1.8.4-Don-t-run-pyunit-tests-if-python-bindings-are-not-bu.patch30
-rw-r--r--packages/sci-libs/flann/files/flann-1.8.4-Option-to-disable-example-building.patch37
-rw-r--r--packages/sci-libs/flann/flann-1.9.1.exheres-0 (renamed from packages/sci-libs/flann/flann-1.8.4.exheres-0)31
3 files changed, 8 insertions, 90 deletions
diff --git a/packages/sci-libs/flann/files/flann-1.8.4-Don-t-run-pyunit-tests-if-python-bindings-are-not-bu.patch b/packages/sci-libs/flann/files/flann-1.8.4-Don-t-run-pyunit-tests-if-python-bindings-are-not-bu.patch
deleted file mode 100644
index 146cd12..0000000
--- a/packages/sci-libs/flann/files/flann-1.8.4-Don-t-run-pyunit-tests-if-python-bindings-are-not-bu.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream: yes
-
-From a43cfd1081fa186bd3d45050596f000ede7c1f23 Mon Sep 17 00:00:00 2001
-From: Marius Muja <mariusm@cs.ubc.ca>
-Date: Mon, 10 Jun 2013 10:04:24 -0700
-Subject: [PATCH] Don't run pyunit tests if python bindings are not built
- (thanks Daniel Franke)
-
----
- test/CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 72187dd..454f393 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -64,8 +64,9 @@ if (GTEST_FOUND AND HDF5_FOUND AND BUILD_CUDA_LIB)
- target_link_libraries(flann_cuda_test flann_cpp ${HDF5_LIBRARIES} flann_cuda)
- endif()
-
-+
- #---------- pyunit tests --------------
--if (PYTHON_EXECUTABLE)
-+if (BUILD_PYTHON_BINDINGS)
- flann_add_pyunit(test_nn.py)
- flann_add_pyunit(test_nn_index.py)
- flann_add_pyunit(test_index_save.py)
---
-1.8.4.2
-
diff --git a/packages/sci-libs/flann/files/flann-1.8.4-Option-to-disable-example-building.patch b/packages/sci-libs/flann/files/flann-1.8.4-Option-to-disable-example-building.patch
deleted file mode 100644
index 4fbac38..0000000
--- a/packages/sci-libs/flann/files/flann-1.8.4-Option-to-disable-example-building.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream: yes
-
-From 3922081fbd6710f4b72421069f6bf24dc37d35a8 Mon Sep 17 00:00:00 2001
-From: Casey Goodlett <casey.goodlett@kitware.com>
-Date: Thu, 8 Aug 2013 18:42:45 -0400
-Subject: [PATCH] Option to disable example building
-
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b19367..410a8f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,6 +53,7 @@ option(BUILD_C_BINDINGS "Build C bindings" ON)
- option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON)
- option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON)
- option(BUILD_CUDA_LIB "Build CUDA library" OFF)
-+option(BUILD_EXAMPLES "Build examples" ON)
- option(USE_OPENMP "Use OpenMP multi-threading" ON)
- option(USE_MPI "Use MPI" OFF)
-
-@@ -154,7 +155,9 @@ endif()
-
- add_subdirectory( cmake )
- add_subdirectory( src )
--add_subdirectory( examples )
-+if (BUILD_EXAMPLES)
-+ add_subdirectory( examples )
-+endif(BUILD_EXAMPLES)
- add_subdirectory( test )
- add_subdirectory( doc )
-
---
-1.8.4.2
-
diff --git a/packages/sci-libs/flann/flann-1.8.4.exheres-0 b/packages/sci-libs/flann/flann-1.9.1.exheres-0
index e3370b7..de15fce 100644
--- a/packages/sci-libs/flann/flann-1.8.4.exheres-0
+++ b/packages/sci-libs/flann/flann-1.9.1.exheres-0
@@ -1,7 +1,7 @@
# Copyright 2013 Heiko Becker <heirecka@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require cmake [ api=2 ]
+require github [ user=mariusmuja ] cmake [ api=2 ]
SUMMARY="Fast library for approximate nearest neighbors"
DESCRIPTION="
@@ -12,8 +12,7 @@ the best algorithm and optimum parameters depending on the dataset.
FLANN is written in C++ and contains bindings for the following languages: C,
MATLAB and Python."
-HOMEPAGE="http://www.cs.ubc.ca/research/${PN}/"
-DOWNLOADS="${HOMEPAGE}uploads/FLANN/${PNV}-src.zip"
+HOMEPAGE+=" http://www.cs.ubc.ca/research/${PN}/"
LICENCES="BSD-3"
SLOT="0"
@@ -34,35 +33,21 @@ DEPENDENCIES="
sci-libs/hdf5
"
-CMAKE_SOURCE=${WORKBASE}/${PNV}-src
-
-DEFAULT_SRC_PREPARE_PATCHES+=(
- "${FILES}"/${PNV}-Don-t-run-pyunit-tests-if-python-bindings-are-not-bu.patch
- "${FILES}"/${PNV}-Option-to-disable-example-building.patch
-)
-
CMAKE_SRC_CONFIGURE_PARAMS=(
-DBUILD_C_BINDINGS:BOOL=true
-DBUILD_CUDA_LIB:BOOL=false
-DBUILD_MATLAB_BINDINGS:BOOL=false
# feel free to enable that if you need it
-DBUILD_PYTHON_BINDINGS:BOOL=false
+ -DDOCDIR="/usr/share/doc/${PNVR}"
-DUSE_MPI:BOOL=false
)
CMAKE_SRC_CONFIGURE_OPTIONS=( 'openmp USE_OPENMP' )
-CMAKE_SRC_CONFIGURE_OPTION_BUILDS=( EXAMPLES )
-
-src_prepare() {
- cmake_src_prepare
-
- if option doc ; then
- edo sed -e "s:DESTINATION share/doc/flann:DESTINATION share/doc/${PNVR}:" \
- -i doc/CMakeLists.txt
- else
- # CMAKE_SRC_CONFIGURE_OPTION_DISABLE_FINDS=( 'doc LATEX' ) doesn't work
- edo sed -e '/^add_subdirectory( doc )/d' -i CMakeLists.txt
- fi
-}
+CMAKE_SRC_CONFIGURE_OPTION_BUILDS=(
+ DOC
+ EXAMPLES
+)
+CMAKE_SRC_CONFIGURE_TESTS+=( '-DBUILD_TESTS:BOOL=TRUE -DBUILD_TESTS:BOOL=FALSE' )
src_install() {
default