From 266b72d9b8e1b2bd93fd022236124c508f34d773 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Sat, 26 Nov 2022 22:20:47 -0500 Subject: [PATCH] flann 1.9.2 * flann 1.9.2 * flann: drop Linux patch Signed-off-by: Rui Chen Co-authored-by: Michael Cho --- Formula/flann.rb | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/Formula/flann.rb b/Formula/flann.rb index dfea38070dc..603797fb943 100644 --- a/Formula/flann.rb +++ b/Formula/flann.rb @@ -1,10 +1,9 @@ class Flann < Formula desc "Fast Library for Approximate Nearest Neighbors" homepage "https://github.com/flann-lib/flann" - url "https://github.com/flann-lib/flann/archive/refs/tags/1.9.1.tar.gz" - sha256 "b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3" + url "https://github.com/flann-lib/flann/archive/refs/tags/1.9.2.tar.gz" + sha256 "e26829bb0017f317d9cc45ab83ddcb8b16d75ada1ae07157006c1e7d601c8824" license "BSD-3-Clause" - revision 13 bottle do sha256 cellar: :any, arm64_ventura: "c9820e001f854b3d5abe3b95b5e63c2b787bd4a7f85c4ba43c5a97300372a802" @@ -18,29 +17,25 @@ class Flann < Formula end depends_on "cmake" => :build + depends_on "pkg-config" => :build depends_on "hdf5" - resource("dataset") do + resource "homebrew-dataset" do url "https://github.com/flann-lib/flann/files/6518483/dataset.zip" sha256 "169442be3e9d8c862eb6ae4566306c31ff18406303d87b4d101f367bc5d17afa" end - # Fix for Linux build: https://bugs.gentoo.org/652594 - # Not yet fixed upstream: https://github.com/mariusmuja/flann/issues/369 - patch do - on_linux do - url "https://raw.githubusercontent.com/buildroot/buildroot/0c469478f64d0ddaf72c0622a1830d855306d51c/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch" - sha256 "aa181d0731d4e9a266f7fcaf5423e7a6b783f400cc040a3ef0fef77930ecf680" - end - end - def install - system "cmake", ".", *std_cmake_args, "-DBUILD_PYTHON_BINDINGS:BOOL=OFF", "-DBUILD_MATLAB_BINDINGS:BOOL=OFF" - system "make", "install" + system "cmake", "-S", ".", "-B", "build", + "-DBUILD_PYTHON_BINDINGS:BOOL=OFF", + "-DBUILD_MATLAB_BINDINGS:BOOL=OFF", + *std_cmake_args + system "cmake", "--build", "build" + system "cmake", "--install", "build" end test do - resource("dataset").stage testpath + resource("homebrew-dataset").stage testpath system "#{bin}/flann_example_c" system "#{bin}/flann_example_cpp" end