[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: a46fb07e56cbf99cc3fd82c562f579d761628342 Author: Sam James gentoo org> AuthorDate: Tue Apr 23 20:29:39 2024 + Commit: Sam James gentoo org> CommitDate: Tue Apr 23 20:33:26 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a46fb07e sci-libs/flann: add subslot dep on sci-libs/hdf5 Signed-off-by: Sam James gentoo.org> sci-libs/flann/{flann-1.9.1-r5.ebuild => flann-1.9.1-r6.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-libs/flann/flann-1.9.1-r5.ebuild b/sci-libs/flann/flann-1.9.1-r6.ebuild similarity index 97% rename from sci-libs/flann/flann-1.9.1-r5.ebuild rename to sci-libs/flann/flann-1.9.1-r6.ebuild index 6f4b7099f0e9..8f253ff0802e 100644 --- a/sci-libs/flann/flann-1.9.1-r5.ebuild +++ b/sci-libs/flann/flann-1.9.1-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,7 @@ DEPEND=" cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( dev-libs/boost:=[mpi] - sci-libs/hdf5[mpi] + sci-libs/hdf5:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1:= )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 319cfc9e74ce46a1d52a6cc37a6ca094ebcf05b1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 19 08:47:35 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 19 14:44:59 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=319cfc9e sci-libs/flann: drop 1.9.1-r4 Closes: https://bugs.gentoo.org/886643 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/flann/flann-1.9.1-r4.ebuild | 95 1 file changed, 95 deletions(-) diff --git a/sci-libs/flann/flann-1.9.1-r4.ebuild b/sci-libs/flann/flann-1.9.1-r4.ebuild deleted file mode 100644 index 299876df8ad3.. --- a/sci-libs/flann/flann-1.9.1-r4.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake cuda flag-o-matic toolchain-funcs - -DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="https://github.com/mariusmuja/flann"; -SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="cuda doc examples mpi octave openmp" - -BDEPEND=" - app-arch/unzip - doc? ( dev-tex/latex2html ) -" -DEPEND=" - app-arch/lz4:= - cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) - mpi? ( - dev-libs/boost:=[mpi] - sci-libs/hdf5[mpi] - ) - !mpi? ( !sci-libs/hdf5[mpi] ) - octave? ( >=sci-mathematics/octave-3.6.4-r1 ) -" -RDEPEND="${DEPEND}" -# TODO: -# readd dependencies for test suite, -# requires multiple ruby dependencies - -PATCHES=( - "${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030 - "${FILESDIR}"/${P}-cuda-9.patch - "${FILESDIR}"/${P}-system-lz4.patch # bug 681898 - "${FILESDIR}"/${P}-system-lz4-pkgconfig.patch # bug 827263 -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - # bug #302621 - use mpi && export CXX=mpicxx - # produce pure octave files - # octave gentoo installation for .m files respected - sed -i \ - -e 's/--mex//' \ - -e 's/\.mex/\.oct/' \ - -e '/FILES/s/${MEX_FILE}//' \ - -e 's:share/flann/octave:share/octave/site/m:' \ - -e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \ - src/matlab/CMakeLists.txt || die - use cuda && cuda_src_prepare - - cmake_src_prepare -} - -src_configure() { - append-cxxflags -std=c++11 - - # python bindings are split off into dev-python/pyflann - local mycmakeargs=( - -DBUILD_C_BINDINGS=ON - -DBUILD_PYTHON_BINDINGS=OFF - -DPYTHON_EXECUTABLE= - -DBUILD_CUDA_LIB=$(usex cuda) - -DBUILD_EXAMPLES=$(usex examples) - -DBUILD_DOC=$(usex doc) - -DBUILD_TESTS=OFF - -DBUILD_MATLAB_BINDINGS=$(usex octave) - -DUSE_MPI=$(usex mpi) - -DUSE_OPENMP=$(usex openmp) - ) - use cuda && mycmakeargs+=( - -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" - ) - use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - find "${D}" -name 'lib*.a' -delete || die -}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 2949418714bd5dc4e8592e76e81d9114b15b7b99 Author: Sam James gentoo org> AuthorDate: Sun Dec 18 11:29:31 2022 + Commit: Sam James gentoo org> CommitDate: Sun Dec 18 11:29:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29494187 sci-libs/flann: Stabilize 1.9.1-r5 x86, #886643 Signed-off-by: Sam James gentoo.org> sci-libs/flann/flann-1.9.1-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/flann/flann-1.9.1-r5.ebuild b/sci-libs/flann/flann-1.9.1-r5.ebuild index d8f4e02ab620..8c97f094cc69 100644 --- a/sci-libs/flann/flann-1.9.1-r5.ebuild +++ b/sci-libs/flann/flann-1.9.1-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples mpi octave openmp" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 469f3c378af339b0dfdebf03980a5b38552ad697 Author: Sam James gentoo org> AuthorDate: Sun Dec 18 11:01:30 2022 + Commit: Sam James gentoo org> CommitDate: Sun Dec 18 11:01:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=469f3c37 sci-libs/flann: Stabilize 1.9.1-r5 arm64, #886643 Signed-off-by: Sam James gentoo.org> sci-libs/flann/flann-1.9.1-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/flann/flann-1.9.1-r5.ebuild b/sci-libs/flann/flann-1.9.1-r5.ebuild index 788c2733be10..d8f4e02ab620 100644 --- a/sci-libs/flann/flann-1.9.1-r5.ebuild +++ b/sci-libs/flann/flann-1.9.1-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples mpi octave openmp" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 01f352b1649fc560c6cea09b91e72e56b49f6f68 Author: Alexander Golubev gmail com> AuthorDate: Wed Feb 16 22:13:25 2022 + Commit: Sam James gentoo org> CommitDate: Fri Feb 18 03:05:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f352b1 sci-libs/flann: fix RUNPATH with MPI Bug: https://bugs.gentoo.org/795828 Signed-off-by: Alexander Golubev gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24221 Signed-off-by: Sam James gentoo.org> sci-libs/flann/flann-1.9.1-r5.ebuild | 6 ++ 1 file changed, 6 insertions(+) diff --git a/sci-libs/flann/flann-1.9.1-r5.ebuild b/sci-libs/flann/flann-1.9.1-r5.ebuild index 716c7a4fec72..788c2733be10 100644 --- a/sci-libs/flann/flann-1.9.1-r5.ebuild +++ b/sci-libs/flann/flann-1.9.1-r5.ebuild @@ -17,6 +17,7 @@ IUSE="cuda doc examples mpi octave openmp" BDEPEND=" app-arch/unzip doc? ( dev-tex/latex2html ) + mpi? ( app-admin/chrpath ) " DEPEND=" app-arch/lz4:= @@ -85,4 +86,9 @@ src_configure() { src_install() { cmake_src_install find "${D}" -name 'lib*.a' -delete || die + + # bug 795828; mpicc volunterely adds some runpaths + if use mpi; then + chrpath -d "${ED}"/usr/bin/flann_mpi_{client,server} || die + fi }
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/files/, sci-libs/flann/
commit: 7e0b5dc2646707633bf113215c122a8f045476b1 Author: Alexander Golubev gmail com> AuthorDate: Wed Feb 16 22:05:23 2022 + Commit: Sam James gentoo org> CommitDate: Fri Feb 18 03:05:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e0b5dc2 sci-libs/flann: revbump to fix MATLAB support + Avoid sed'ing cmake files + Install octave files to a more opropriate locationa Bug: https://bugs.gentoo.org/830424 Signed-off-by: Alexander Golubev gmail.com> Signed-off-by: Sam James gentoo.org> ...uild-oct-rather-than-mex-files-for-octave.patch | 81 sci-libs/flann/flann-1.9.1-r5.ebuild | 88 ++ 2 files changed, 169 insertions(+) diff --git a/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch b/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch new file mode 100644 index ..f29aef41977c --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch @@ -0,0 +1,81 @@ +From 85d2acc120b0640d02d189089bf113d351c14bba Mon Sep 17 00:00:00 2001 +From: Alexander Golubev +Date: Wed, 16 Feb 2022 21:37:55 +0300 +Subject: [PATCH] build *.oct rather than *.mex files for octave + + * build .oct filse rather than *.mex + * install the file to a sane location obtained from octave-config + * fix a build issue with a recent cmake doesn't like querying target + LOCATION + +Signed-off-by: Alexander Golubev +--- + src/matlab/CMakeLists.txt | 28 ++-- + 1 file changed, 18 insertions(+), 10 deletions(-) + +diff --git a/src/matlab/CMakeLists.txt b/src/matlab/CMakeLists.txt +index a89b6b8..ebacaea 100755 +--- a/src/matlab/CMakeLists.txt b/src/matlab/CMakeLists.txt +@@ -16,9 +16,6 @@ endif() + + find_program(OCT_CMD mkoctfile) + +-get_property(FLANN_LIB_LOCATION TARGET flann_s PROPERTY LOCATION) +-get_filename_component(FLANN_LIB_PATH ${FLANN_LIB_LOCATION} PATH) +- + if(MEX_CMD AND MEXEXT_CMD) + + get_filename_component(MEX_REAL_CMD ${MEX_CMD} ABSOLUTE) +@@ -48,7 +45,7 @@ if(MEX_CMD AND MEXEXT_CMD) + ADD_CUSTOM_COMMAND( + OUTPUT ${MEX_FILE} + COMMAND ${MEX_REAL_CMD} +-ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp -I${PROJECT_SOURCE_DIR}/src/cpp -L${FLANN_LIB_PATH} -lflann_s ${MEX_BUILD_FLAGS} ++ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp -I${PROJECT_SOURCE_DIR}/src/cpp -L${PROJECT_BINARY_DIR}/lib -lflann_s ${MEX_BUILD_FLAGS} + DEPENDS flann_s ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp + COMMENT "Building MEX extension ${MEX_FILE}" + ) +@@ -66,11 +63,11 @@ if(MEX_CMD AND MEXEXT_CMD) + set(BUILD_MATLAB_BINDINGS OFF) + endif() + elseif(OCT_CMD) +- SET(MEX_FILE ${CMAKE_CURRENT_BINARY_DIR}/${MEX_NAME}.mex) ++ SET(MEX_FILE ${CMAKE_CURRENT_BINARY_DIR}/${MEX_NAME}.oct) + ADD_CUSTOM_COMMAND( + OUTPUT ${MEX_FILE} + COMMAND ${OCT_CMD} +-ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp -I${PROJECT_SOURCE_DIR}/src/cpp -L${FLANN_LIB_PATH} -DFLANN_STATIC -lflann_s -lgomp --mex ++ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp -I${PROJECT_SOURCE_DIR}/src/cpp -L${PROJECT_BINARY_DIR}/lib -DFLANN_STATIC -lflann_s -lgomp + DEPENDS flann_s ${CMAKE_CURRENT_SOURCE_DIR}/${MEX_NAME}.cpp + COMMENT "Building MEX extension ${MEX_FILE}" + ) +@@ -79,10 +76,21 @@ elseif(OCT_CMD) + + FILE(GLOB MATLAB_SOURCES *.m) + +- INSTALL ( +-FILES ${MEX_FILE} ${MATLAB_SOURCES} +-DESTINATION share/flann/octave +-) ++ find_program(OCTAVE_CONFIG_EXECUTABLE NAMES octave-config) ++ ++ if (OCTAVE_CONFIG_EXECUTABLE) ++execute_process (COMMAND ${OCTAVE_CONFIG_EXECUTABLE} --m-site-dir ++ OUTPUT_VARIABLE OCTAVE_M_SITE_DIR ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ ++execute_process (COMMAND ${OCTAVE_CONFIG_EXECUTABLE} --oct-site-dir ++ OUTPUT_VARIABLE OCTAVE_OCT_SITE_DIR ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ ++ endif() ++ ++ INSTALL (FILES ${MEX_FILE} DESTINATION ${OCTAVE_OCT_SITE_DIR}) ++ INSTALL (FILES ${MATLAB_SOURCES} DESTINATION ${OCTAVE_M_SITE_DIR}) + else() + message(WARNING "Cannot find MATLAB or Octave instalation. Make sure that the 'bin' directory from the MATLAB instalation or that mkoctfile is in PATH") + set(BUILD_MATLAB_BINDINGS OFF) +-- +2.34.1 + diff --git a/sci-libs/flann/flann-1.9.1-r5.ebuild b/sci-libs/flann/flann-1.9.1-r5.ebuild new file mode 100644 index ..716c7a4fec72 --- /dev/null +++ b/sci-libs/flann/flann-1.9.1-r5.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake cuda flag-o-matic toolchain-funcs + +DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" +HOMEPAGE="https://github.com/mariusmuja/fl
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 3db33dc972b14fd6fe3c944f5376597b720ec5e2 Author: Sam James gentoo org> AuthorDate: Sun Dec 26 03:07:35 2021 + Commit: Sam James gentoo org> CommitDate: Sun Dec 26 03:07:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db33dc9 sci-libs/flann: adjust patch reference Bug: https://bugs.gentoo.org/827263 Signed-off-by: Sam James gentoo.org> sci-libs/flann/flann-1.9.1-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/flann/flann-1.9.1-r4.ebuild b/sci-libs/flann/flann-1.9.1-r4.ebuild index 49a8a1c514e2..299876df8ad3 100644 --- a/sci-libs/flann/flann-1.9.1-r4.ebuild +++ b/sci-libs/flann/flann-1.9.1-r4.ebuild @@ -37,7 +37,7 @@ PATCHES=( "${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030 "${FILESDIR}"/${P}-cuda-9.patch "${FILESDIR}"/${P}-system-lz4.patch # bug 681898 - "${FILESDIR}"/flann-1.9.1-system-lz4-pkgconfig.patch + "${FILESDIR}"/${P}-system-lz4-pkgconfig.patch # bug 827263 ) pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/, sci-libs/flann/files/
commit: 65f96213bd1cc2f77a9c5c5fb5665c91d8279909 Author: Sam James gentoo org> AuthorDate: Sun Dec 26 03:02:27 2021 + Commit: Sam James gentoo org> CommitDate: Sun Dec 26 03:03:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f96213 sci-libs/flann: fix pkgconfig file format (no semicolons) Not sure why but a semicolon seems to have started appearing more recently, probably with a newer CMake version. Anyway, a problem from the past resurfaced (in a slightly different way, but same outcome). flann's malformed pkgconfig file was causing consumers to be underlinked against lz4 and libflann* (and usually fail to build). Closes: https://bugs.gentoo.org/827263 Closes: https://bugs.gentoo.org/829398 Bug: https://bugs.gentoo.org/681898 Signed-off-by: Sam James gentoo.org> .../files/flann-1.9.1-system-lz4-pkgconfig.patch | 38 ++ ...flann-1.9.1-r3.ebuild => flann-1.9.1-r4.ebuild} | 3 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/sci-libs/flann/files/flann-1.9.1-system-lz4-pkgconfig.patch b/sci-libs/flann/files/flann-1.9.1-system-lz4-pkgconfig.patch new file mode 100644 index ..35ea0d0e9841 --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.1-system-lz4-pkgconfig.patch @@ -0,0 +1,38 @@ +https://github.com/flann-lib/flann/pull/480 + +https://bugs.gentoo.org/827263 +https://bugs.gentoo.org/829398 +https://bugs.gentoo.org/681898 + +From 25eb56ec78472bd419a121c6905095a793cf8992 Mon Sep 17 00:00:00 2001 +From: Mike Purvis +Date: Fri, 9 Jul 2021 15:53:06 + +Subject: [PATCH] Use string(JOIN) to avoid semicolons in pc file. + +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.12) + + if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) +@@ -148,6 +148,7 @@ endif(BUILD_CUDA_LIB) + + find_package(PkgConfig REQUIRED) + pkg_check_modules(LZ4 REQUIRED liblz4) ++string(JOIN " " LZ4_STATIC_LDFLAGS_STR ${LZ4_STATIC_LDFLAGS}) + + #set the C/C++ include path to the "include" directory + include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp) +--- a/cmake/flann.pc.in b/cmake/flann.pc.in +@@ -8,6 +8,6 @@ Name: @PROJECT_NAME@ + Description: @PKG_DESC@ + Version: @FLANN_VERSION@ + Requires: @PKG_EXTERNAL_DEPS@ +-Libs: -L${libdir} @LZ4_STATIC_LDFLAGS@ -lflann -lflann_cpp ++Libs: -L${libdir} @LZ4_STATIC_LDFLAGS_STR@ -lflann -lflann_cpp + Cflags: -I${includedir} + + diff --git a/sci-libs/flann/flann-1.9.1-r3.ebuild b/sci-libs/flann/flann-1.9.1-r4.ebuild similarity index 96% rename from sci-libs/flann/flann-1.9.1-r3.ebuild rename to sci-libs/flann/flann-1.9.1-r4.ebuild index e53d428ee73c..49a8a1c514e2 100644 --- a/sci-libs/flann/flann-1.9.1-r3.ebuild +++ b/sci-libs/flann/flann-1.9.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,6 +37,7 @@ PATCHES=( "${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030 "${FILESDIR}"/${P}-cuda-9.patch "${FILESDIR}"/${P}-system-lz4.patch # bug 681898 + "${FILESDIR}"/flann-1.9.1-system-lz4-pkgconfig.patch ) pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 535129904c2663195386eb41bd676ed3100fc0bd Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 7 12:17:17 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 7 15:41:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53512990 sci-libs/flann: Drop unmaintained ebuild Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/flann/flann-.ebuild | 92 1 file changed, 92 deletions(-) diff --git a/sci-libs/flann/flann-.ebuild b/sci-libs/flann/flann-.ebuild deleted file mode 100644 index 04b6a5770ac..000 --- a/sci-libs/flann/flann-.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils cuda flag-o-matic git-r3 toolchain-funcs - -DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="https://www.cs.ubc.ca/research/flann/"; -EGIT_REPO_URI="https://github.com/mariusmuja/flann.git"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="cuda doc examples mpi openmp octave static-libs" - -BDEPEND=" - doc? ( dev-tex/latex2html ) -" -DEPEND=" - app-arch/lz4:= - cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) - mpi? ( - sci-libs/hdf5[mpi] - dev-libs/boost:=[mpi] - ) - !mpi? ( !sci-libs/hdf5[mpi] ) - octave? ( >=sci-mathematics/octave-3.6.4-r1 ) -" -RDEPEND="${DEPEND}" -# TODO: -# readd dependencies for test suite, -# requires multiple ruby dependencies - -PATCHES=( "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - # bug #302621 - use mpi && export CXX=mpicxx - # produce pure octave files - # octave gentoo installation for .m files respected - sed -i \ - -e 's/--mex//' \ - -e 's/\.mex/\.oct/' \ - -e '/FILES/s/${MEX_FILE}//' \ - -e 's:share/flann/octave:share/octave/site/m:' \ - -e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \ - src/matlab/CMakeLists.txt || die - use cuda && cuda_src_prepare - - cmake-utils_src_prepare -} - -src_configure() { - append-cxxflags -std=c++11 - - # python bindings are split - # off into dev-python/pyflann - local mycmakeargs=( - -DBUILD_C_BINDINGS=ON - -DBUILD_PYTHON_BINDINGS=OFF - -DPYTHON_EXECUTABLE= - -DBUILD_CUDA_LIB=$(usex cuda) - -DBUILD_EXAMPLES=$(usex examples) - -DBUILD_DOC=$(usex doc) - -DBUILD_TESTS=OFF - -DBUILD_MATLAB_BINDINGS=$(usex octave) - -DUSE_MPI=$(usex mpi) - -DUSE_OPENMP=$(usex openmp) - ) - use cuda && mycmakeargs+=( - -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" - ) - use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if ! use static-libs; then - find "${D}" -name 'lib*.a' -delete || die - fi -}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 5b0a118d58dcc3e38b542f4c4e9aa53dd3c9d9a9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 23 09:44:41 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 23 10:52:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b0a118d sci-libs/flann: Drop 1.9.1-r2 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/flann/flann-1.9.1-r2.ebuild | 95 1 file changed, 95 deletions(-) diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild deleted file mode 100644 index f6ffdd259b2..000 --- a/sci-libs/flann/flann-1.9.1-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils cuda flag-o-matic toolchain-funcs - -DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="https://www.cs.ubc.ca/research/flann/"; -SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="cuda doc examples mpi openmp octave static-libs" - -BDEPEND=" - app-arch/unzip - doc? ( dev-tex/latex2html ) -" -DEPEND=" - cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) - mpi? ( - sci-libs/hdf5[mpi] - dev-libs/boost:=[mpi] - ) - !mpi? ( !sci-libs/hdf5[mpi] ) - octave? ( >=sci-mathematics/octave-3.6.4-r1 ) -" -RDEPEND="${DEPEND}" -# TODO: -# readd dependencies for test suite, -# requires multiple ruby dependencies - -PATCHES=( - "${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030 - "${FILESDIR}"/${P}-cuda-9.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - # bug #302621 - use mpi && export CXX=mpicxx - # produce pure octave files - # octave gentoo installation for .m files respected - sed -i \ - -e 's/--mex//' \ - -e 's/\.mex/\.oct/' \ - -e '/FILES/s/${MEX_FILE}//' \ - -e 's:share/flann/octave:share/octave/site/m:' \ - -e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \ - src/matlab/CMakeLists.txt || die - use cuda && cuda_src_prepare - - cmake-utils_src_prepare -} - -src_configure() { - append-cxxflags -std=c++11 - - # python bindings are split - # off into dev-python/pyflann - local mycmakeargs=( - -DBUILD_C_BINDINGS=ON - -DBUILD_PYTHON_BINDINGS=OFF - -DPYTHON_EXECUTABLE= - -DBUILD_CUDA_LIB=$(usex cuda) - -DBUILD_EXAMPLES=$(usex examples) - -DBUILD_DOC=$(usex doc) - -DBUILD_TESTS=OFF - -DBUILD_MATLAB_BINDINGS=$(usex octave) - -DUSE_MPI=$(usex mpi) - -DUSE_OPENMP=$(usex openmp) - ) - use cuda && mycmakeargs+=( - -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" - ) - use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if ! use static-libs; then - find "${D}" -name 'lib*.a' -delete || die - fi -}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 67970b58a844a1604acf62765810abb7f7cc3658 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 23 09:44:17 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 23 10:52:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67970b58 sci-libs/flann: Fix HOMEPAGE, old one was dead Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/flann/flann-1.9.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/flann/flann-1.9.1-r3.ebuild b/sci-libs/flann/flann-1.9.1-r3.ebuild index b34a54471dc..e53d428ee73 100644 --- a/sci-libs/flann/flann-1.9.1-r3.ebuild +++ b/sci-libs/flann/flann-1.9.1-r3.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit cmake cuda flag-o-matic toolchain-funcs DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="https://www.cs.ubc.ca/research/flann/"; +HOMEPAGE="https://github.com/mariusmuja/flann"; SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/, sci-libs/flann/files/
commit: 2951aa020dc9973598a0ed83c1a92c512fbe19b9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 23 09:38:04 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 23 10:52:50 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2951aa02 sci-libs/flann: Use system-lz4 and fix underlinking Closes: https://bugs.gentoo.org/681898 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/flann/files/flann-1.9.1-system-lz4.patch | 125 ++ sci-libs/flann/flann-1.9.1-r3.ebuild | 94 2 files changed, 219 insertions(+) diff --git a/sci-libs/flann/files/flann-1.9.1-system-lz4.patch b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch new file mode 100644 index 000..dcc9fedd4a9 --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch @@ -0,0 +1,125 @@ +From: Jochen Sprickerhof +Date: Sun, 14 Oct 2018 00:25:05 +0200 +Subject: Use system version of liblz4 + +Also make sure that flann_cpp is linked against LZ4. +--- + CMakeLists.txt | 3 +++ + cmake/flann.pc.in | 2 +- + examples/CMakeLists.txt| 3 +++ + src/cpp/CMakeLists.txt | 8 ++-- + src/cpp/flann/util/serialization.h | 4 ++-- + 5 files changed, 15 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a01fb7a..995e54e 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -142,6 +142,9 @@ if (BUILD_CUDA_LIB) + endif(CUDA_FOUND) + endif(BUILD_CUDA_LIB) + ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(LZ4 REQUIRED liblz4) ++ + #set the C/C++ include path to the "include" directory + include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp) + +diff --git a/cmake/flann.pc.in b/cmake/flann.pc.in +index 82eee5e..07b8d64 100644 +--- a/cmake/flann.pc.in b/cmake/flann.pc.in +@@ -8,6 +8,6 @@ Name: @PROJECT_NAME@ + Description: @PKG_DESC@ + Version: @FLANN_VERSION@ + Requires: @PKG_EXTERNAL_DEPS@ +-Libs: -L${libdir} -lflann -lflann_cpp ++Libs: -L${libdir} @LZ4_STATIC_LDFLAGS@ -lflann -lflann_cpp + Cflags: -I${includedir} + +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index e9fef04..2b2bb9d 100644 +--- a/examples/CMakeLists.txt b/examples/CMakeLists.txt +@@ -3,6 +3,7 @@ add_custom_target(examples ALL) + + if (BUILD_C_BINDINGS) + add_executable(flann_example_c flann_example.c) ++target_link_libraries(flann_example_c -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) + target_link_libraries(flann_example_c flann) + set_target_properties(flann_example_c PROPERTIES COMPILE_FLAGS -std=c99) + +@@ -14,6 +15,7 @@ if (HDF5_FOUND) + include_directories(${HDF5_INCLUDE_DIRS}) + + add_executable(flann_example_cpp flann_example.cpp) ++target_link_libraries(flann_example_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) + target_link_libraries(flann_example_cpp ${HDF5_LIBRARIES} flann_cpp) + if (HDF5_IS_PARALLEL) + target_link_libraries(flann_example_cpp ${MPI_LIBRARIES}) +@@ -25,6 +27,7 @@ if (HDF5_FOUND) + + if (USE_MPI AND HDF5_IS_PARALLEL) + add_executable(flann_example_mpi flann_example_mpi.cpp) ++target_link_libraries(flann_example_mpi -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) + target_link_libraries(flann_example_mpi flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) + + add_dependencies(examples flann_example_mpi) +diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt +index b453b27..5c4f693 100644 +--- a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt +@@ -4,11 +4,12 @@ add_definitions(-D_FLANN_VERSION=${FLANN_VERSION}) + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h) + +-file(GLOB_RECURSE C_SOURCES flann.cpp lz4.c lz4hc.c) +-file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp lz4.c lz4hc.c) ++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}) ++target_link_libraries(flann_cpp_s ${LZ4_LIBRARIES}) + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) + set_target_properties(flann_cpp_s PROPERTIES COMPILE_FLAGS -fPIC) + endif() +@@ -42,6 +43,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) + endif() + else() + add_library(flann_cpp SHARED ${CPP_SOURCES}) ++target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) + if (BUILD_CUDA_LIB) + cuda_add_library(flann_cuda SHARED ${CPP_SOURCES}) + set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) +@@ -77,6 +79,7 @@ endif() + + if (BUILD_C_BINDINGS) + add_library(flann_s STATIC ${C_SOURCES}) ++target_link_libraries(flann_cpp -Wl,-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 321856d6883957afab0b3243b7eb3fc5bdfd9ea4 Author: Aaron Bauman gentoo org> AuthorDate: Mon May 20 17:07:50 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Mon May 20 17:22:18 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321856d6 sci-libs/flann: arm64 stable Signed-off-by: Aaron Bauman gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.12 RepoMan-Options: --include-arches="arm64" sci-libs/flann/flann-1.9.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild index 8d3a7477b4b..f6ffdd259b2 100644 --- a/sci-libs/flann/flann-1.9.1-r2.ebuild +++ b/sci-libs/flann/flann-1.9.1-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples mpi openmp octave static-libs" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 3368d93400098b40cc0b8cef7a3d7b19d99e5b81 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 19 21:40:32 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 19 21:42:26 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3368d934 sci-libs/flann: Really 1.9.1-r2 amd64 stable We got mail so we assume it was done. Closes: https://bugs.gentoo.org/652594 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/flann/flann-1.9.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild index 4b72bf9fbe2..8d3a7477b4b 100644 --- a/sci-libs/flann/flann-1.9.1-r2.ebuild +++ b/sci-libs/flann/flann-1.9.1-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples mpi openmp octave static-libs" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: b2e14fba0824139e7c8ba8052278ec59df85b2da Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 19 21:08:38 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 19 21:08:38 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e14fba sci-libs/flann: Drop old Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/flann/flann-1.9.1-r1.ebuild | 90 sci-libs/flann/flann-1.9.1.ebuild| 86 -- 2 files changed, 176 deletions(-) diff --git a/sci-libs/flann/flann-1.9.1-r1.ebuild b/sci-libs/flann/flann-1.9.1-r1.ebuild deleted file mode 100644 index fcb4ef999df..000 --- a/sci-libs/flann/flann-1.9.1-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils cuda flag-o-matic toolchain-funcs - -DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="http://www.cs.ubc.ca/research/flann/"; -SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="cuda doc examples mpi openmp octave static-libs" - -RDEPEND=" - cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) - mpi? ( - sci-libs/hdf5[mpi] - dev-libs/boost:=[mpi] - ) - !mpi? ( !sci-libs/hdf5[mpi] ) - octave? ( >=sci-mathematics/octave-3.6.4-r1 )" -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( dev-tex/latex2html )" -# TODO: -# readd dependencies for test suite, -# requires multiple ruby dependencies - -PATCHES=( - "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { - # bug #302621 - use mpi && export CXX=mpicxx - # produce pure octave files - # octave gentoo installation for .m files respected - sed -i \ - -e 's/--mex//' \ - -e 's/\.mex/\.oct/' \ - -e '/FILES/s/${MEX_FILE}//' \ - -e 's:share/flann/octave:share/octave/site/m:' \ - -e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \ - src/matlab/CMakeLists.txt || die - use cuda && cuda_src_prepare - - cmake-utils_src_prepare -} - -src_configure() { - append-cxxflags -std=c++11 - - # python bindings are split - # off into dev-python/pyflann - local mycmakeargs=( - -DBUILD_C_BINDINGS=ON - -DBUILD_PYTHON_BINDINGS=OFF - -DPYTHON_EXECUTABLE= - -DDOCDIR=share/doc/${PF} - -DBUILD_CUDA_LIB=$(usex cuda) - -DBUILD_EXAMPLES=$(usex examples) - -DBUILD_DOC=$(usex doc) - -DBUILD_TESTS=OFF - -DBUILD_MATLAB_BINDINGS=$(usex octave) - -DUSE_MPI=$(usex mpi) - -DUSE_OPENMP=$(usex openmp) - ) - use cuda && mycmakeargs+=( - -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if ! use static-libs; then - find "${D}" -name 'lib*.a' -delete || die - fi -} diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild deleted file mode 100644 index 98e3f17c9fd..000 --- a/sci-libs/flann/flann-1.9.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils cuda flag-o-matic toolchain-funcs - -DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="http://www.cs.ubc.ca/research/flann/"; -SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="cuda doc examples mpi openmp octave static-libs" - -RDEPEND=" - cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) - mpi? ( - sci-libs/hdf5[mpi] - dev-libs/boost:=[mpi] - ) - !mpi? ( !sci-libs/hdf5[mpi] ) - octave? ( >=sci-mathematics/octave-3.6.4-r1 )" -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( dev-tex/latex2html )" -# TODO: -# readd dependencies for test suite, -# requires multiple ruby dependencies - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_prepare() { -
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/files/, sci-libs/flann/
commit: 9a4be0df9bfd7588f37b0721568571e614608a8f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 19 21:18:08 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 19 21:18:08 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a4be0df sci-libs/flann: Add another fix for >=cmake-3.11 with cuda Thanks-to: LE GARREC Vincent le-garrec.fr> Closes: https://bugs.gentoo.org/678030 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch | 11 +++ sci-libs/flann/flann-1.9.1-r2.ebuild| 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch new file mode 100644 index 000..4cf8f3a990f --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch @@ -0,0 +1,11 @@ +--- a/src/cpp/CMakeLists.txt 2019-02-14 21:58:41.567625108 +0100 b/src/cpp/CMakeLists.txt 2019-02-14 21:59:04.017920926 +0100 +@@ -34,7 +34,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AN + target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) + + if (BUILD_CUDA_LIB) +- cuda_add_library(flann_cuda SHARED "") ++ cuda_add_library(flann_cuda SHARED "empty.cpp") + set_target_properties(flann_cuda PROPERTIES LINKER_LANGUAGE CXX) + target_link_libraries(flann_cuda -Wl,-whole-archive flann_cuda_s -Wl,-no-whole-archive) + set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild index b628b93c4ce..4b72bf9fbe2 100644 --- a/sci-libs/flann/flann-1.9.1-r2.ebuild +++ b/sci-libs/flann/flann-1.9.1-r2.ebuild @@ -33,7 +33,7 @@ RDEPEND="${DEPEND}" # requires multiple ruby dependencies PATCHES=( - "${FILESDIR}"/${P}-cmake-3.11.patch + "${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030 "${FILESDIR}"/${P}-cuda-9.patch )
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: ebb6563218b0bf2a66a580a5c560e2f2f483033d Author: Thomas Deutschmann gentoo org> AuthorDate: Mon May 13 01:32:50 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon May 13 01:40:55 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb65632 sci-libs/flann: x86 stable (bug #652594) Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> sci-libs/flann/flann-1.9.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild index c240ca1dcf1..b628b93c4ce 100644 --- a/sci-libs/flann/flann-1.9.1-r2.ebuild +++ b/sci-libs/flann/flann-1.9.1-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples mpi openmp octave static-libs" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 6026d536aa292b0589c2b29cdd2b6a93ba490eb2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 17 12:24:01 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 17 12:39:00 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6026d536 sci-libs/flann: EAPI-7 bump, fix unused cmake var Closes: https://bugs.gentoo.org/659756 Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../{flann-.ebuild => flann-1.9.1-r2.ebuild} | 32 -- sci-libs/flann/flann-.ebuild | 26 ++ 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/sci-libs/flann/flann-.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild similarity index 77% copy from sci-libs/flann/flann-.ebuild copy to sci-libs/flann/flann-1.9.1-r2.ebuild index e8b80e9f855..73e6a60c52b 100644 --- a/sci-libs/flann/flann-.ebuild +++ b/sci-libs/flann/flann-1.9.1-r2.ebuild @@ -1,37 +1,38 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils cuda flag-o-matic git-r3 toolchain-funcs +inherit cmake-utils cuda flag-o-matic toolchain-funcs DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="http://www.cs.ubc.ca/research/flann/"; -EGIT_REPO_URI="https://github.com/mariusmuja/flann.git"; +HOMEPAGE="https://www.cs.ubc.ca/research/flann/"; +SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples mpi openmp octave static-libs" -RDEPEND=" +BDEPEND=" + app-arch/unzip + doc? ( dev-tex/latex2html ) +" +DEPEND=" cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) - octave? ( >=sci-mathematics/octave-3.6.4-r1 )" -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( dev-tex/latex2html )" + octave? ( >=sci-mathematics/octave-3.6.4-r1 ) +" +RDEPEND="${DEPEND}" # TODO: # readd dependencies for test suite, # requires multiple ruby dependencies -PATCHES=( - "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch -) +PATCHES=( "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch ) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -67,7 +68,6 @@ src_configure() { -DBUILD_C_BINDINGS=ON -DBUILD_PYTHON_BINDINGS=OFF -DPYTHON_EXECUTABLE= - -DDOCDIR=share/doc/${PF} -DBUILD_CUDA_LIB=$(usex cuda) -DBUILD_EXAMPLES=$(usex examples) -DBUILD_DOC=$(usex doc) @@ -79,6 +79,8 @@ src_configure() { use cuda && mycmakeargs+=( -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" ) + use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} ) + cmake-utils_src_configure } diff --git a/sci-libs/flann/flann-.ebuild b/sci-libs/flann/flann-.ebuild index e8b80e9f855..04b6a5770ac 100644 --- a/sci-libs/flann/flann-.ebuild +++ b/sci-libs/flann/flann-.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-utils cuda flag-o-matic git-r3 toolchain-funcs DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="http://www.cs.ubc.ca/research/flann/"; +HOMEPAGE="https://www.cs.ubc.ca/research/flann/"; EGIT_REPO_URI="https://github.com/mariusmuja/flann.git"; LICENSE="BSD" @@ -14,24 +14,25 @@ SLOT="0" KEYWORDS="" IUSE="cuda doc examples mpi openmp octave static-libs" -RDEPEND=" +BDEPEND=" + doc? ( dev-tex/latex2html ) +" +DEPEND=" + app-arch/lz4:= cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) - octave? ( >=sci-mathematics/octave-3.6.4-r1 )" -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( dev-tex/latex2html )" + octave? ( >=sci-mathematics/octave-3.6.4-r1 ) +" +RDEPEND="${DEPEND}" # TODO: # readd dependencies for test suite, # requires multiple ruby dependencies -PATCHES=( - "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch -) +PATCHES=( "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch ) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -67,7 +68,6 @@ src_configure() { -DBUILD_C_BINDINGS=ON -DBUILD_PYTHON_BINDINGS=OFF -DPYTHON_EXECUTABLE= - -DDOCDIR=share/doc/${PF}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/files/, sci-libs/flann/
commit: 10670e7e6bcefd2e396297bd4ea36e884af28198 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 17 12:26:59 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 17 12:39:00 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10670e7e sci-libs/flann: Fix build with CUDA > 9.0 Supposedly. Closes: https://bugs.gentoo.org/678030 Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-libs/flann/files/flann-1.9.1-cuda-9.patch | 22 ++ sci-libs/flann/flann-1.9.1-r2.ebuild | 5 - 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch new file mode 100644 index 000..561c379af9a --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch @@ -0,0 +1,22 @@ +From b9dd074526c18e7423085853518b58d602cb0b57 Mon Sep 17 00:00:00 2001 +From: "Petr A. Ermolaev" +Date: Fri, 4 May 2018 07:50:24 + +Subject: [PATCH] fix compilation via gcc and cuda 9.1 add missing #include + to kdtree_cuda_3d_index.cu + +--- + src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu +index e9b05080..8465322e 100644 +--- a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu +@@ -32,6 +32,7 @@ + #include + // #define THRUST_DEBUG 1 + #include ++#include + #include + #include + #include diff --git a/sci-libs/flann/flann-1.9.1-r2.ebuild b/sci-libs/flann/flann-1.9.1-r2.ebuild index 73e6a60c52b..c240ca1dcf1 100644 --- a/sci-libs/flann/flann-1.9.1-r2.ebuild +++ b/sci-libs/flann/flann-1.9.1-r2.ebuild @@ -32,7 +32,10 @@ RDEPEND="${DEPEND}" # readd dependencies for test suite, # requires multiple ruby dependencies -PATCHES=( "${FILESDIR}"/flann-1.9.1-cmake-3.11.patch ) +PATCHES=( + "${FILESDIR}"/${P}-cmake-3.11.patch + "${FILESDIR}"/${P}-cuda-9.patch +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: c34b94be492903fc956651080b37ab7ba270e1dd Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Jul 9 01:19:16 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Jul 9 01:28:52 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c34b94be sci-libs/flann: x86 stable (bug #652654) Package-Manager: Portage-2.3.41, Repoman-2.3.9 sci-libs/flann/flann-1.9.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild index 48b07167075..98e3f17c9fd 100644 --- a/sci-libs/flann/flann-1.9.1.ebuild +++ b/sci-libs/flann/flann-1.9.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples mpi openmp octave static-libs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/, sci-libs/flann/files/
commit: 9140856244cc5799ca2c9d3196ec3d381414a2ab Author: Maxim Koltsov gentoo org> AuthorDate: Sun Jul 1 10:10:55 2018 + Commit: Maxim Koltsov gentoo org> CommitDate: Sun Jul 1 10:10:55 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91408562 sci-libs/flann: fix build with >cmake-3.10 Took patch from Buildroot project, see https://github.com/buildroot/buildroot/commit/0c469478f64d0ddaf72c0622a1830d855306d51c Closes: https://bugs.gentoo.org/652594 Closes: https://bugs.gentoo.org/657470 Package-Manager: Portage-2.3.41, Repoman-2.3.9 sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch | 80 ++ .../{flann-.ebuild => flann-1.9.1-r1.ebuild} | 10 ++- sci-libs/flann/flann-.ebuild | 4 ++ 3 files changed, 91 insertions(+), 3 deletions(-) diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch new file mode 100644 index 000..b37bedcf6d5 --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch @@ -0,0 +1,80 @@ +From fa5ec96a94646492a3f908e12905b3e48a8e800b Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 18 Apr 2018 20:24:13 +0200 +Subject: [PATCH] src/cpp: fix cmake >= 3.11 build + +CMake < 3.11 doesn't support add_library() without any source file +(i.e add_library(foo SHARED)). But flann CMake use a trick that use +an empty string "" as source list (i.e add_library(foo SHARED "")). +This look like a bug in CMake < 3.11. + +With CMake >= 3.11, the new behaviour of add_library() break the +existing flann CMake code. + +From CMake Changelog [1]: +"add_library() and add_executable() commands can now be called without + any sources and will not complain as long as sources are added later + via the target_sources() command." + +Note: flann CMake code doesn't use target_sources() since no source file +are provided intentionally since the flann shared library is created by +linking with the flann_cpp_s static library with this line: + +target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) + +If you try to use "add_library(flann_cpp SHARED ${CPP_SOURCES})" (as it should +be normally done), the link fail due to already defined symbol. + +They are building the shared version using the static library "to speedup the +build time" [3] + +This issue is already reported upstream [2] with a proposed solution. + +Upstream status: Pending + +Fixes: +http://autobuild.buildroot.net/results/b2f/b2febfaf8c44ce477b3e4a5b9b976fd25e8d7454 + +[1] https://cmake.org/cmake/help/v3.11/release/3.11.html +[2] https://github.com/mariusmuja/flann/issues/369 +[3] https://github.com/mariusmuja/flann/commit/0fd62b43be2fbb0b8d791ee36290791224dc030c + +Signed-off-by: Romain Naour +--- + src/cpp/CMakeLists.txt | 4 ++-- + src/cpp/empty.cpp | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + create mode 100644 src/cpp/empty.cpp + +diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt +index b44a735..a816863 100644 +--- a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt +@@ -29,7 +29,7 @@ if (BUILD_CUDA_LIB) + 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) + +@@ -85,7 +85,7 @@ if (BUILD_C_BINDINGS) + 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() +diff --git a/src/cpp/empty.cpp b/src/cpp/empty.cpp +new file mode 100644 +index 000..40a8c17 +--- /dev/null b/src/cpp/empty.cpp +@@ -0,0 +1 @@ ++/* empty */ +-- +2.14.3 + diff --git a/sci-libs/flann/flann-.ebuild b/sci-libs/flann/flann-1.9.1-r1.ebuild similarity index 88% copy from sci-libs/flann/flann-.ebuild copy to sci-libs/flann/flann-1.9.1-r1.ebuild index 06d78eb963d..fcb4ef999df 100644 --- a/sci-libs/flann/flann-.ebuild +++ b/sci-libs/flann/flann-1.9.1-r1.ebuild @@ -3,15 +3,15 @@ EAPI=6 -inherit cmake-utils cuda flag-o-matic git-r3 toolchain-funcs +inherit cmake-utils cuda flag-o-matic toolchain-funcs DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" HOMEPAGE="http://www.cs.ubc.ca/research/flann/"; -EGIT_REPO_URI="https://github.com/mariusmuja/flann.git"; +SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: d7342d6d68c10e56c0fd15b1c0de3f8b5851a696 Author: Jason Zaman gentoo org> AuthorDate: Sun Jun 24 13:07:55 2018 + Commit: Jason Zaman gentoo org> CommitDate: Sun Jun 24 13:07:55 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7342d6d sci-libs/flann: amd64 stable Gentoo-bug: 652654 Package-Manager: Portage-2.3.40, Repoman-2.3.9 sci-libs/flann/flann-1.9.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild index af848293644..48b07167075 100644 --- a/sci-libs/flann/flann-1.9.1.ebuild +++ b/sci-libs/flann/flann-1.9.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples mpi openmp octave static-libs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/files/
commit: f09934d575ae6a8115687ec29a2fec96f6e98c26 Author: Michael Mair-Keimberger gmail com> AuthorDate: Wed Jun 13 17:55:17 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Wed Jun 13 21:15:00 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f09934d5 sci-libs/flann: remove unused patch(es) .../flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch | 16 -- sci-libs/flann/files/flann-1.8.4-cuda5.5.patch | 61 -- sci-libs/flann/files/flann-1.8.4-docdir.patch | 24 - sci-libs/flann/files/flann-1.8.4-examples.patch| 35 - sci-libs/flann/files/flann-1.8.4-multilib.patch| 15 -- sci-libs/flann/files/flann-1.8.4-options.patch | 41 --- 6 files changed, 192 deletions(-) diff --git a/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch b/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch deleted file mode 100644 index 1a068af2835..000 --- a/sci-libs/flann/files/flann-1.8.4-CUDA_NVCC_FLAGS.patch +++ /dev/null @@ -1,16 +0,0 @@ - src/cpp/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index 8e72409..a4b35b1 100644 a/src/cpp/CMakeLists.txt -+++ b/src/cpp/CMakeLists.txt -@@ -15,7 +15,7 @@ endif() - set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA) - - if (BUILD_CUDA_LIB) --SET(CUDA_NVCC_FLAGS -DFLANN_USE_CUDA) -+SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-DFLANN_USE_CUDA") - if(CMAKE_COMPILER_IS_GNUCC) - set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-Xcompiler;-fPIC;-arch=sm_13" ) - if (NVCC_COMPILER_BINDIR) diff --git a/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch b/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch deleted file mode 100644 index 046b3252c36..000 --- a/sci-libs/flann/files/flann-1.8.4-cuda5.5.patch +++ /dev/null @@ -1,61 +0,0 @@ - src/cpp/flann/util/cuda/result_set.h | 12 ++-- - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/cpp/flann/util/cuda/result_set.h b/src/cpp/flann/util/cuda/result_set.h -index 9ac8111..324ca1e 100644 a/src/cpp/flann/util/cuda/result_set.h -+++ b/src/cpp/flann/util/cuda/result_set.h -@@ -54,7 +54,7 @@ struct SingleResultSet - DistanceType bestDist; - const DistanceType epsError; - --__device__ -+__device__ __host__ - SingleResultSet( DistanceType eps ) : bestIndex(-1),bestDist(INFINITY), epsError(eps){ } - - __device__ -@@ -129,7 +129,7 @@ struct KnnResultSet - const DistanceType epsError; - - --__device__ -+__device__ __host__ - KnnResultSet(int knn, bool sortResults, DistanceType eps) : foundNeighbors(0),largestHeapDist(INFINITY),k(knn), sorted(sortResults), epsError(eps){ } - - // __host__ __device__ -@@ -229,7 +229,7 @@ struct CountingRadiusResultSet - DistanceType radius_sq_; - int max_neighbors_; - --__device__ -+__device__ __host__ - CountingRadiusResultSet(DistanceType radius, int max_neighbors) : count_(0),radius_sq_(radius), max_neighbors_(max_neighbors){ } - - __device__ -@@ -279,7 +279,7 @@ struct RadiusKnnResultSet - // int count_; - - --__device__ -+__device__ __host__ - RadiusKnnResultSet(DistanceType radius, int knn, int* segment_starts, bool sortResults) : foundNeighbors(0),largestHeapDist(radius),k(knn), sorted(sortResults), radius_sq_(radius),segment_starts_(segment_starts) { } - - // __host__ __device__ -@@ -381,7 +381,7 @@ struct KnnRadiusResultSet - const DistanceType radius_sq; - - --__device__ -+__device__ __host__ - KnnRadiusResultSet(int knn, bool sortResults, DistanceType eps, DistanceType radius) : foundNeighbors(0),largestHeapDist(radius),k(knn), sorted(sortResults), epsError(eps),radius_sq(radius){ } - - // __host__ __device__ -@@ -484,7 +484,7 @@ struct RadiusResultSet - int count_; - bool sorted_; - --__device__ -+__device__ __host__ - RadiusResultSet(DistanceType radius, int* segment_starts, bool sorted) : radius_sq_(radius), segment_starts_(segment_starts), count_(0), sorted_(sorted){ } - - __device__ diff --git a/sci-libs/flann/files/flann-1.8.4-docdir.patch b/sci-libs/flann/files/flann-1.8.4-docdir.patch deleted file mode 100644 index 4b16684de14..000 --- a/sci-libs/flann/files/flann-1.8.4-docdir.patch +++ /dev/null @@ -1,24 +0,0 @@ - doc/CMakeLists.txt | 6 +- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index 2d8eb24..aeac8ed 100644 a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -1,4 +1,8 @@ - find_package(LATEX) -+ -+if (NOT DOCDIR) -+ set(DOCDIR share/doc/flann) -+endif () - - if (EXISTS ${PDFLATEX_COMPILER} AND EXISTS ${BIBTEX_COMPILER}) - include(${PROJECT_SOURCE_DIR}/cmake/UseLATEX.cmake) -@@ -14,6 +18,6 @@ endif() - -
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: e20eb846570051b5a5aa2331fb4e3d2861050e15 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 3 12:30:02 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 6 14:54:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e20eb846 sci-libs/flann: Drop old Package-Manager: Portage-2.3.40, Repoman-2.3.9 sci-libs/flann/Manifest | 1 - sci-libs/flann/flann-1.8.4-r1.ebuild | 108 --- 2 files changed, 109 deletions(-) diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest index b7bd4a7ec5e..fc60a7b83e9 100644 --- a/sci-libs/flann/Manifest +++ b/sci-libs/flann/Manifest @@ -1,3 +1,2 @@ -DIST flann-1.8.4-src.zip 561057 BLAKE2B 0cd1cf7bc394501d878d848246f76919924e39dc950e49e82bd2c8dbf46d9626fc9749ba4578ce62aabd0313314969dd7f6883c42167545238bc89561ce028ce SHA512 47ac6be66e3ec7303d28febc5a4cea2f8d1b3d81c3b7081f27cf17936074e06e91e30123569b41269a2b97c9960274dc485a575d77c1a386e8f539a76a8d3a0a DIST flann-1.8.4-testdata.tar.xz 26744244 BLAKE2B eb8a5066d79dedd2ff4ec48f0e0969d6486417abfb2cc5c2e3e1e0f8dfef637f2cb290e8f1868b819ff7e4d71687daf2aaeb16c8197f5642125ea50ef775441f SHA512 f2bee5e2dfe2fbb42953df563f178b67639b62e26fc31be14e07c196ba3e84db21804e594af44991f7cf45ca5e10ff753093cf160abf33e90d19735a9a0b51cb DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 diff --git a/sci-libs/flann/flann-1.8.4-r1.ebuild b/sci-libs/flann/flann-1.8.4-r1.ebuild deleted file mode 100644 index 00be826a33e..000 --- a/sci-libs/flann/flann-1.8.4-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils cuda eutils multilib toolchain-funcs - -DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" -HOMEPAGE="http://www.cs.ubc.ca/research/flann/"; -SRC_URI=" - http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip - test? ( https://dev.gentoo.org/~bicatali/distfiles/${P}-testdata.tar.xz )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="cuda doc examples mpi openmp octave static-libs test" - -RDEPEND=" - cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) - mpi? ( - sci-libs/hdf5[mpi] - dev-libs/boost[mpi] - ) - !mpi? ( !sci-libs/hdf5[mpi] ) - octave? ( >=sci-mathematics/octave-3.6.4-r1 )" -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( dev-tex/latex2html ) - test? ( - dev-cpp/gtest - cuda? ( sci-libs/hdf5 ) - ) -" - -PATCHES=( - "${FILESDIR}"/${P}-examples.patch - "${FILESDIR}"/${P}-options.patch - "${FILESDIR}"/${P}-CUDA_NVCC_FLAGS.patch - "${FILESDIR}"/${P}-cuda5.5.patch - "${FILESDIR}"/${P}-multilib.patch - "${FILESDIR}"/${P}-docdir.patch -) - -S="${WORKDIR}"/${P}-src - -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - fi -} - -src_prepare() { - # bug #302621 - use mpi && export CXX=mpicxx - # produce pure octave files - # octave gentoo installation for .m files respected - sed -i \ - -e 's/--mex//' \ - -e 's/\.mex/\.oct/' \ - -e '/FILES/s/${MEX_FILE}//' \ - -e 's:share/flann/octave:share/octave/site/m:' \ - -e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \ - src/matlab/CMakeLists.txt || die - use cuda && cuda_src_prepare - - cmake-utils_src_prepare -} - -src_configure() { - # python bindings are split - local mycmakeargs=( - -DBUILD_C_BINDINGS=ON - -DBUILD_PYTHON_BINDINGS=OFF - -DPYTHON_EXECUTABLE= - -DDOCDIR=share/doc/${PF} - $(cmake-utils_use_build cuda CUDA_LIB) - $(cmake-utils_use_build examples) - $(cmake-utils_use_build doc) - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use_build octave MATLAB_BINDINGS) - $(cmake-utils_use_use mpi) - $(cmake-utils_use_use openmp) - ) - use cuda && \ - mycmakeargs+=( - -DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch" - ) - cmake-utils_src_configure -} - -src_test() { - ln -s "${WORKDIR}"/testdata/* test/ || die - # -j1 to avoid
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: a6639daf8bff5b5de398cfcf109a4a3385e96f0a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 3 12:38:45 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 6 14:54:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6639daf sci-libs/flann: Sync live with 1.9.1 updates Package-Manager: Portage-2.3.40, Repoman-2.3.9 sci-libs/flann/Manifest | 1 - sci-libs/flann/flann-.ebuild | 70 2 files changed, 27 insertions(+), 44 deletions(-) diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest index fc60a7b83e9..c8693334eee 100644 --- a/sci-libs/flann/Manifest +++ b/sci-libs/flann/Manifest @@ -1,2 +1 @@ -DIST flann-1.8.4-testdata.tar.xz 26744244 BLAKE2B eb8a5066d79dedd2ff4ec48f0e0969d6486417abfb2cc5c2e3e1e0f8dfef637f2cb290e8f1868b819ff7e4d71687daf2aaeb16c8197f5642125ea50ef775441f SHA512 f2bee5e2dfe2fbb42953df563f178b67639b62e26fc31be14e07c196ba3e84db21804e594af44991f7cf45ca5e10ff753093cf160abf33e90d19735a9a0b51cb DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 diff --git a/sci-libs/flann/flann-.ebuild b/sci-libs/flann/flann-.ebuild index 2f25498da1d..06d78eb963d 100644 --- a/sci-libs/flann/flann-.ebuild +++ b/sci-libs/flann/flann-.ebuild @@ -1,55 +1,45 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit cmake-utils cuda eutils git-r3 multilib toolchain-funcs +inherit cmake-utils cuda flag-o-matic git-r3 toolchain-funcs DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" HOMEPAGE="http://www.cs.ubc.ca/research/flann/"; -SRC_URI="test? ( https://dev.gentoo.org/~bicatali/distfiles/${PN}-1.8.4-testdata.tar.xz )" EGIT_REPO_URI="https://github.com/mariusmuja/flann.git"; LICENSE="BSD" SLOT="0" KEYWORDS="" -IUSE="cuda doc examples mpi openmp octave static-libs test" +IUSE="cuda doc examples mpi openmp octave static-libs" RDEPEND=" cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( sci-libs/hdf5[mpi] - dev-libs/boost[mpi] + dev-libs/boost:=[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 )" DEPEND="${RDEPEND} app-arch/unzip - doc? ( dev-tex/latex2html ) - test? ( - dev-cpp/gtest - cuda? ( sci-libs/hdf5 ) - ) -" + doc? ( dev-tex/latex2html )" +# TODO: +# readd dependencies for test suite, +# requires multiple ruby dependencies -pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - fi +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } -src_unpack() { - default - git-r3_src_unpack +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } src_prepare() { # bug #302621 use mpi && export CXX=mpicxx - # produce pure octave files # octave gentoo installation for .m files respected sed -i \ @@ -65,38 +55,32 @@ src_prepare() { } src_configure() { + append-cxxflags -std=c++11 + # python bindings are split + # off into dev-python/pyflann local mycmakeargs=( -DBUILD_C_BINDINGS=ON -DBUILD_PYTHON_BINDINGS=OFF -DPYTHON_EXECUTABLE= -DDOCDIR=share/doc/${PF} - $(cmake-utils_use_build cuda CUDA_LIB) - $(cmake-utils_use_build examples) - $(cmake-utils_use_build doc) - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use_build octave MATLAB_BINDINGS) - $(cmake-utils_use_use mpi) - $(cmake-utils_use_use openmp) + -DBUILD_CUDA_LIB=$(usex cuda) + -DBUILD_EXAMPLES=$(usex examples) + -DBUILD_DOC=$(usex doc) + -DBUILD_TESTS=OFF + -DBUILD_MATLAB_BINDINGS=$(usex octave) + -DUSE_MPI=$(usex mpi) + -DUSE_OPENMP=$(usex openmp) + ) + use cuda && mycmakeargs+=( + -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" ) - use cuda && \ - mycmakeargs+=( - -DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch" - ) cmake-utils_src_configure } -src_test() { - ln -s "$
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: a27be96554ff89124e27de08d56d34215428dd1d Author: Amy Liffey gentoo org> AuthorDate: Tue Feb 6 17:56:07 2018 + Commit: Amy Liffey gentoo org> CommitDate: Tue Feb 6 18:04:45 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a27be965 sci-libs/flann: fix cuda linking error Submitted-by: pa.lacaze gmail.com Closes: https://bugs.gentoo.org/607062 Package-Manager: Portage-2.3.13, Repoman-2.3.3 sci-libs/flann/flann-1.9.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild index cc7583379a9..af848293644 100644 --- a/sci-libs/flann/flann-1.9.1.ebuild +++ b/sci-libs/flann/flann-1.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -73,7 +73,7 @@ src_configure() { -DUSE_OPENMP=$(usex openmp) ) use cuda && mycmakeargs+=( - -DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch" + -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" ) cmake-utils_src_configure }
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: da0ccdb61002b260e0c2a8acf67b1646fc072ab0 Author: David Seifert gentoo org> AuthorDate: Fri Apr 21 21:33:13 2017 + Commit: David Seifert gentoo org> CommitDate: Fri Apr 21 21:34:00 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da0ccdb6 sci-libs/flann: Force C++11 Bug: https://bugs.gentoo.org/show_bug.cgi?id=614552 Package-Manager: Portage-2.3.5, Repoman-2.3.2 sci-libs/flann/flann-1.9.1.ebuild | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild index a625b8cdeed..cc7583379a9 100644 --- a/sci-libs/flann/flann-1.9.1.ebuild +++ b/sci-libs/flann/flann-1.9.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils cuda toolchain-funcs +inherit cmake-utils cuda flag-o-matic toolchain-funcs DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" HOMEPAGE="http://www.cs.ubc.ca/research/flann/"; @@ -29,13 +29,12 @@ DEPEND="${RDEPEND} # readd dependencies for test suite, # requires multiple ruby dependencies +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + pkg_setup() { - if use openmp; then - if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then - ewarn "OpenMP is not available in your current selected gcc" - die "need openmp capable gcc" - fi - fi + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } src_prepare() { @@ -56,6 +55,8 @@ src_prepare() { } src_configure() { + append-cxxflags -std=c++11 + # python bindings are split # off into dev-python/pyflann local mycmakeargs=(
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 8f509310510a3ab61ec169fc3bbb989c903581f6 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Jan 15 18:47:15 2017 + Commit: Andreas Hüttel gentoo org> CommitDate: Sun Jan 15 18:57:57 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f509310 sci-libs/flann: Drop to ~arch (no stable reverse deps) so bug 590244 can go ahead Package-Manager: Portage-2.3.3, Repoman-2.3.1 sci-libs/flann/flann-1.8.4-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-libs/flann/flann-1.8.4-r1.ebuild b/sci-libs/flann/flann-1.8.4-r1.ebuild index 24da6e7..a8bb0b8 100644 --- a/sci-libs/flann/flann-1.8.4-r1.ebuild +++ b/sci-libs/flann/flann-1.8.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples mpi openmp octave static-libs test" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 1ca3b429a59c04d4b77e1963540db544fa71ee64 Author: David Seifert gentoo org> AuthorDate: Thu Sep 15 20:39:37 2016 + Commit: David Seifert gentoo org> CommitDate: Thu Sep 15 21:24:55 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca3b429 sci-libs/flann: Version bump to 1.9.1 Gentoo-bug: 593856 * EAPI=6 * Removed src_test(), as flann now requires ruby for tests. Package-Manager: portage-2.3.0 sci-libs/flann/Manifest | 1 + sci-libs/flann/flann-1.9.1.ebuild | 86 +++ 2 files changed, 87 insertions(+) diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest index 39203fd..7b4a809 100644 --- a/sci-libs/flann/Manifest +++ b/sci-libs/flann/Manifest @@ -1,2 +1,3 @@ DIST flann-1.8.4-src.zip 561057 SHA256 dfbb9321b0d687626a644c70872a2c540b16200e7f4c7bd72f91ae032f445c08 SHA512 47ac6be66e3ec7303d28febc5a4cea2f8d1b3d81c3b7081f27cf17936074e06e91e30123569b41269a2b97c9960274dc485a575d77c1a386e8f539a76a8d3a0a WHIRLPOOL f7722d8c0a8482809920927353421ebb578464fe6746a4dba20a6c7b6f941715529d5be33aebd1726db36eae3b5d4080c6ae86b0f807e6e384af32b87735b83b DIST flann-1.8.4-testdata.tar.xz 26744244 SHA256 4eaecf3a221ea6611e841fa2f459a17b6a5fdd68bb5bc46c434e37667141 SHA512 f2bee5e2dfe2fbb42953df563f178b67639b62e26fc31be14e07c196ba3e84db21804e594af44991f7cf45ca5e10ff753093cf160abf33e90d19735a9a0b51cb WHIRLPOOL e49e5a594464955241ebc9bdfa908bac8b93b2fb465fc08ab73ec4d57194a8b71361ecb67985cdc641013fb8c3fb51ea2033769f41e558ab86e8f71e477b97da +DIST flann-1.9.1.tar.gz 485391 SHA256 b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3 SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 WHIRLPOOL 40c16b3b2d8ef458676c37a246ae1c0d45d14163a42a46172283cf20a377ee43971e7cacce9d575cc7ecfa0eab01377dbd5e592e3e7ae71e74334af18ebab836 diff --git a/sci-libs/flann/flann-1.9.1.ebuild b/sci-libs/flann/flann-1.9.1.ebuild new file mode 100644 index ..b4f868b --- /dev/null +++ b/sci-libs/flann/flann-1.9.1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit cmake-utils cuda toolchain-funcs + +DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" +HOMEPAGE="http://www.cs.ubc.ca/research/flann/"; +SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="cuda doc examples mpi openmp octave static-libs" + +RDEPEND=" + cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) + mpi? ( + sci-libs/hdf5[mpi] + dev-libs/boost:=[mpi] + ) + !mpi? ( !sci-libs/hdf5[mpi] ) + octave? ( >=sci-mathematics/octave-3.6.4-r1 )" +DEPEND="${RDEPEND} + app-arch/unzip + doc? ( dev-tex/latex2html )" +# TODO: +# readd dependencies for test suite, +# requires multiple ruby dependencies + +pkg_setup() { + if use openmp; then + if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then + ewarn "OpenMP is not available in your current selected gcc" + die "need openmp capable gcc" + fi + fi +} + +src_prepare() { + # bug #302621 + use mpi && export CXX=mpicxx + # produce pure octave files + # octave gentoo installation for .m files respected + sed -i \ + -e 's/--mex//' \ + -e 's/\.mex/\.oct/' \ + -e '/FILES/s/${MEX_FILE}//' \ + -e 's:share/flann/octave:share/octave/site/m:' \ + -e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \ + src/matlab/CMakeLists.txt || die + use cuda && cuda_src_prepare + + cmake-utils_src_prepare +} + +src_configure() { + # python bindings are split + # off into dev-python/pyflann + local mycmakeargs=( + -DBUILD_C_BINDINGS=ON + -DBUILD_PYTHON_BINDINGS=OFF + -DPYTHON_EXECUTABLE= + -DDOCDIR=share/doc/${PF} + -DBUILD_CUDA_LIB=$(usex cuda) + -DBUILD_EXAMPLES=$(usex examples) + -DBUILD_DOC=$(usex doc) + -DBUILD_TESTS=OFF + -DBUILD_MATLAB_BINDINGS=$(usex octave) + -DUSE_MPI=$(usex mpi) + -DUSE_OPENMP=$(usex openmp) + ) + use cuda && mycmakeargs+=( + -DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + if ! use static-libs; then + find "${D}" -name 'lib*.a' -delete || die + fi +}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 29fb908337297d83ef1a6ef6dd750fb7c8b5e5a4 Author: Justin Lecher gentoo org> AuthorDate: Thu Jan 7 19:23:46 2016 + Commit: Justin Lecher gentoo org> CommitDate: Thu Jan 7 19:23:46 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29fb9083 sci-libs/flann: Drop unnecesarry patches Package-Manager: portage-2.2.26 Signed-off-by: Justin Lecher gentoo.org> sci-libs/flann/flann-.ebuild | 10 +- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sci-libs/flann/flann-.ebuild b/sci-libs/flann/flann-.ebuild index 5a505d8..14e0996 100644 --- a/sci-libs/flann/flann-.ebuild +++ b/sci-libs/flann/flann-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -33,14 +33,6 @@ DEPEND="${RDEPEND} ) " -PATCHES=( - "${FILESDIR}"/${PN}-1.8.4-options.patch - "${FILESDIR}"/${PN}-1.8.4-CUDA_NVCC_FLAGS.patch - "${FILESDIR}"/${PN}-1.8.4-cuda5.5.patch - "${FILESDIR}"/${PN}-1.8.4-multilib.patch - "${FILESDIR}"/${PN}-1.8.4-docdir.patch -) - pkg_setup() { if use openmp; then if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
[gentoo-commits] repo/gentoo:master commit in: sci-libs/flann/
commit: 9b8aa4c0811ae9e6d7325dfc33edc962ce8cb0dc Author: Justin Lecher gentoo org> AuthorDate: Thu Jan 7 19:25:13 2016 + Commit: Justin Lecher gentoo org> CommitDate: Thu Jan 7 19:25:13 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b8aa4c0 sci-libs/flann: Chop DESCRIPTION to 80 chars Package-Manager: portage-2.2.26 Signed-off-by: Justin Lecher gentoo.org> sci-libs/flann/flann-1.8.4-r1.ebuild | 4 ++-- sci-libs/flann/flann-.ebuild | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sci-libs/flann/flann-1.8.4-r1.ebuild b/sci-libs/flann/flann-1.8.4-r1.ebuild index 550389a..24da6e7 100644 --- a/sci-libs/flann/flann-1.8.4-r1.ebuild +++ b/sci-libs/flann/flann-1.8.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit cmake-utils cuda eutils multilib toolchain-funcs -DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces" +DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" HOMEPAGE="http://www.cs.ubc.ca/research/flann/"; SRC_URI=" http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip diff --git a/sci-libs/flann/flann-.ebuild b/sci-libs/flann/flann-.ebuild index 14e0996..7c99bb0 100644 --- a/sci-libs/flann/flann-.ebuild +++ b/sci-libs/flann/flann-.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit cmake-utils cuda eutils git-r3 multilib toolchain-funcs -DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces" +DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" HOMEPAGE="http://www.cs.ubc.ca/research/flann/"; SRC_URI="test? ( https://dev.gentoo.org/~bicatali/distfiles/${PN}-1.8.4-testdata.tar.xz )" EGIT_REPO_URI="https://github.com/mariusmuja/flann.git";