From 36adf9b100eefe7cecc1850095bfba607398790b Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 27 Sep 2016 11:32:35 +0200 Subject: [PATCH] libflann: updating to 1.9.1 to compile with gcc6 Compiling libflann 1.8.4 with gcc6 fails with: ``` | /home/lukas/work/repositories/openembedded.org/openembedded-core/build/tmp-glibc/work/i586-oe-linux/libflann/1.8.4-r0/flann-1.8.4-src/src/cpp/flann/algorithms/kdtree_index.h:666:39: error: call of overloaded 'abs(flann::KDTreeIndex >::ElementType)' is ambiguous | ElementType span = abs(point[i]-leaf_point[i]); | ~~~^~~~~~~~~~~~~~~~~~~~~~~~ ``` This issue has been already addressed in the latest version 1.9.1, hence the commit simply updates the recipe to the version 1.9.1, which is available on github. Signed-off-by: Lukas Bulwahn --- recipes-extended/libflann/libflann_1.8.4.bb | 13 ------------- recipes-extended/libflann/libflann_1.9.1.bb | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 recipes-extended/libflann/libflann_1.8.4.bb create mode 100644 recipes-extended/libflann/libflann_1.9.1.bb diff --git a/recipes-extended/libflann/libflann_1.8.4.bb b/recipes-extended/libflann/libflann_1.8.4.bb deleted file mode 100644 index 6ab9824..0000000 --- a/recipes-extended/libflann/libflann_1.8.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "a library for performing fast approximate nearest neighbor searches in high dimensional spaces" -AUTHOR = "Marius Muja and David G. Lowe" -HOMEPAGE = "http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=040a44ba915aa6b3b099ea189c7b7e20" - -SRC_URI = "http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip" -SRC_URI[md5sum] = "a0ecd46be2ee11a68d2a7d9c6b4ce701" -SRC_URI[sha256sum] = "dfbb9321b0d687626a644c70872a2c540b16200e7f4c7bd72f91ae032f445c08" - -S = "${WORKDIR}/flann-${PV}-src" - -inherit cmake diff --git a/recipes-extended/libflann/libflann_1.9.1.bb b/recipes-extended/libflann/libflann_1.9.1.bb new file mode 100644 index 0000000..c190ba3 --- /dev/null +++ b/recipes-extended/libflann/libflann_1.9.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Fast Library for Approximate Nearest Neighbors" +AUTHOR = "Marius Muja and David G. Lowe" +HOMEPAGE = "http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=395adad2339bd9ce5fef13d564a9681c" + +SRC_URI = "https://github.com/mariusmuja/flann/archive/${PV}.tar.gz" +SRC_URI[md5sum] = "73adef1c7bf8e8b978987e7860926ea6" +SRC_URI[sha256sum] = "b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3" + +S = "${WORKDIR}/flann-${PV}" + +inherit cmake