| 1 |
jlec 13/11/24 17:02:38 |
| 2 |
|
| 3 |
Modified: metadata.xml flann-1.8.4.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
sci-libs/flann: Make it multilib compatible |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 sci-libs/flann/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/metadata.xml?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/metadata.xml?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/metadata.xml?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/metadata.xml,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- metadata.xml 9 Jul 2013 23:11:10 -0000 1.5 |
| 23 |
+++ metadata.xml 24 Nov 2013 17:02:38 -0000 1.6 |
| 24 |
@@ -1,8 +1,8 @@ |
| 25 |
<?xml version="1.0" encoding="UTF-8"?> |
| 26 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 27 |
<pkgmetadata> |
| 28 |
-<herd>sci</herd> |
| 29 |
-<longdescription lang="en"> |
| 30 |
+ <herd>sci</herd> |
| 31 |
+ <longdescription lang="en"> |
| 32 |
FLANN is a library for performing fast approximate nearest neighbor |
| 33 |
searches in high dimensional spaces. It contains a collection of |
| 34 |
algorithms we found to work best for nearest neighbor search and a |
| 35 |
@@ -11,9 +11,9 @@ |
| 36 |
FLANN is written in C++ and contains bindings for the following |
| 37 |
languages: C, MATLAB and Python. |
| 38 |
</longdescription> |
| 39 |
-<use> |
| 40 |
- <flag name="octave">Add bindings for |
| 41 |
+ <use> |
| 42 |
+ <flag name="octave">Add bindings for |
| 43 |
<pkg>sci-mathematics/octave</pkg></flag> |
| 44 |
- <flag name="cuda">Enable support for nVidia CUDA</flag> |
| 45 |
-</use> |
| 46 |
+ <flag name="cuda">Enable support for nVidia CUDA</flag> |
| 47 |
+ </use> |
| 48 |
</pkgmetadata> |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.2 sci-libs/flann/flann-1.8.4.ebuild |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.8.4.ebuild?rev=1.2&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.8.4.ebuild?rev=1.2&content-type=text/plain |
| 56 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.8.4.ebuild?r1=1.1&r2=1.2 |
| 57 |
|
| 58 |
Index: flann-1.8.4.ebuild |
| 59 |
=================================================================== |
| 60 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.8.4.ebuild,v |
| 61 |
retrieving revision 1.1 |
| 62 |
retrieving revision 1.2 |
| 63 |
diff -u -r1.1 -r1.2 |
| 64 |
--- flann-1.8.4.ebuild 9 Jul 2013 23:11:10 -0000 1.1 |
| 65 |
+++ flann-1.8.4.ebuild 24 Nov 2013 17:02:38 -0000 1.2 |
| 66 |
@@ -1,14 +1,15 @@ |
| 67 |
# Copyright 1999-2013 Gentoo Foundation |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.8.4.ebuild,v 1.1 2013/07/09 23:11:10 bicatali Exp $ |
| 70 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.8.4.ebuild,v 1.2 2013/11/24 17:02:38 jlec Exp $ |
| 71 |
|
| 72 |
EAPI=5 |
| 73 |
|
| 74 |
-inherit cmake-utils eutils toolchain-funcs |
| 75 |
+inherit cmake-utils eutils multilib toolchain-funcs |
| 76 |
|
| 77 |
DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces" |
| 78 |
HOMEPAGE="http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN/" |
| 79 |
-SRC_URI="http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip |
| 80 |
+SRC_URI=" |
| 81 |
+ http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip |
| 82 |
test? ( http://dev.gentoo.org/~bicatali/distfiles/${P}-testdata.tar.xz )" |
| 83 |
|
| 84 |
LICENSE="BSD" |
| 85 |
@@ -61,6 +62,11 @@ |
| 86 |
# avoid automatic installation of pdf |
| 87 |
use doc || sed -i -e '/doc/d' CMakeLists.txt |
| 88 |
use cuda && cuda_src_prepare |
| 89 |
+ |
| 90 |
+ sed \ |
| 91 |
+ -e "/FLANN_LIB_INSTALL_DIR/s:lib:$(get_libdir):g" \ |
| 92 |
+ -i cmake/flann_utils.cmake || die |
| 93 |
+ cmake-utils_src_prepare |
| 94 |
} |
| 95 |
|
| 96 |
src_configure() { |
| 97 |
|
| 98 |
|
| 99 |
|
| 100 |
1.19 sci-libs/flann/ChangeLog |
| 101 |
|
| 102 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/ChangeLog?rev=1.19&view=markup |
| 103 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/ChangeLog?rev=1.19&content-type=text/plain |
| 104 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/ChangeLog?r1=1.18&r2=1.19 |
| 105 |
|
| 106 |
Index: ChangeLog |
| 107 |
=================================================================== |
| 108 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v |
| 109 |
retrieving revision 1.18 |
| 110 |
retrieving revision 1.19 |
| 111 |
diff -u -r1.18 -r1.19 |
| 112 |
--- ChangeLog 9 Jul 2013 23:11:10 -0000 1.18 |
| 113 |
+++ ChangeLog 24 Nov 2013 17:02:38 -0000 1.19 |
| 114 |
@@ -1,6 +1,10 @@ |
| 115 |
# ChangeLog for sci-libs/flann |
| 116 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 117 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.18 2013/07/09 23:11:10 bicatali Exp $ |
| 118 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.19 2013/11/24 17:02:38 jlec Exp $ |
| 119 |
+ |
| 120 |
+ 24 Nov 2013; Justin Lecher <jlec@g.o> flann-1.8.4.ebuild, |
| 121 |
+ metadata.xml: |
| 122 |
+ Make it multilib compatible |
| 123 |
|
| 124 |
*flann-1.8.4 (09 Jul 2013) |
Archives