Skip to content

Commit e0bcd7f

Browse files
BrewTestBotBrewTestBot
authored
Merge pull request #227486 from Homebrew/bump-pdal-2.9.0
tiledb 2.28.0 (new formula) pdal 2.9.0
2 parents 5822b1a + b838f8e commit e0bcd7f

File tree

3 files changed

+98
-46
lines changed

3 files changed

+98
-46
lines changed

‎Formula/p/pdal.rb‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
class Pdal < Formula
22
desc "Point data abstraction library"
33
homepage "https://www.pdal.io/"
4-
url "https://github.com/PDAL/PDAL/releases/download/2.8.4/PDAL-2.8.4-src.tar.bz2"
5-
sha256 "c27dc79af0b26f9cb3209b694703e9d576f1b0c8c05b36206fd5e310494e75b5"
4+
url "https://github.com/PDAL/PDAL/releases/download/2.9.0/PDAL-2.9.0-src.tar.bz2"
5+
sha256 "f0be2f6575021d0c4751d5babd4c1096d4e5934f86f8461914e9f9c6dc63567d"
66
license "BSD-3-Clause"
7-
revision 1
87
head "https://github.com/PDAL/PDAL.git", branch: "master"
98

109
livecheck do
@@ -13,29 +12,35 @@ class Pdal < Formula
1312
end
1413

1514
bottle do
16-
sha256 cellar: :any, arm64_sequoia: "64bb0d0e90ce547231899e349d64126c75c9a89e4564e57ede59eeca6c654e5e"
17-
sha256 cellar: :any, arm64_sonoma: "6b051c39b6bb6c691cc76aca04fd53191515ac9ae64971185f601f5dfadbe32c"
18-
sha256 cellar: :any, arm64_ventura: "7b44dbcbfdfac6af9dcf1d59f2cc37182224638c5289fc16374c465aae0a415b"
19-
sha256 cellar: :any, sonoma: "4bc10dded0e56135067113caa32b25833dda96c80bb14673b840952b58e85f29"
20-
sha256 cellar: :any, ventura: "725b858faef46f66946bc1e29ae644bef8f42c71295196a070bec68ec6222de2"
21-
sha256 cellar: :any_skip_relocation, arm64_linux: "be97476fd1203ef225f9aa71469adac4aac70314af62aafe9abf8921e812f32c"
22-
sha256 cellar: :any_skip_relocation, x86_64_linux: "e28a8d44c02b9f638c76824ad8a17a90cbb9f806bf4b5aba66a49a29ee91738b"
15+
sha256 cellar: :any, arm64_sequoia: "df3625f29b78818e5612df608c7285c427d61a4f958a1bbc12f2c2acd6102a7d"
16+
sha256 cellar: :any, arm64_sonoma: "0deebb7f4aed87f93e8a8312bfbb7b345ddaab7b38976f977cdb9cfd5d144265"
17+
sha256 cellar: :any, arm64_ventura: "c16bb2d479d3012b3e68089d525679da0c033282cd4b8420f698e4e97c414c2e"
18+
sha256 cellar: :any, sonoma: "7a67735f291181d21846502f6e8fa6d132b148ec524a78445f24324ce6ed8535"
19+
sha256 cellar: :any, ventura: "a8c294bf0ac08b50c658d4a293ffc19960da1e17b360184c435607cf2e80a37f"
20+
sha256 cellar: :any_skip_relocation, arm64_linux: "5a3edab3708912af7677213c85466ef1ba09e2cf01b527db65e9dc241e0f2383"
21+
sha256 cellar: :any_skip_relocation, x86_64_linux: "135d54d4953876f23dcfa6dd5ce606cc29ffc8711ee549305aa1170bffcecfe2"
2322
end
2423

2524
depends_on "cmake" => :build
25+
depends_on "googletest" => :build
2626
depends_on "pkgconf" => :build
27+
28+
depends_on "apache-arrow"
29+
depends_on "curl"
30+
depends_on "draco"
2731
depends_on "gdal"
2832
depends_on "hdf5"
29-
depends_on "laszip"
3033
depends_on "libgeotiff"
3134
depends_on "libpq"
3235
depends_on "libxml2"
36+
depends_on "lz4"
3337
depends_on "numpy"
3438
depends_on "openssl@3"
3539
depends_on "proj"
40+
depends_on "tiledb"
41+
depends_on "xerces-c"
3642
depends_on "zstd"
3743

38-
uses_from_macos "curl"
3944
uses_from_macos "zlib"
4045

4146
on_linux do
@@ -44,12 +49,18 @@ class Pdal < Formula
4449

4550
def install
4651
args = %w[
47-
-DWITH_LASZIP=TRUE
48-
-DBUILD_PLUGIN_GREYHOUND=ON
52+
-DWITH_TESTS=OFF
53+
-DENABLE_CTEST=OFF
54+
-DBUILD_PLUGIN_ARROW=ON
55+
-DBUILD_PLUGIN_TILEDB=ON
4956
-DBUILD_PLUGIN_ICEBRIDGE=ON
57+
-DBUILD_PLUGIN_HDF=ON
5058
-DBUILD_PLUGIN_PGPOINTCLOUD=ON
51-
-DBUILD_PLUGIN_PYTHON=ON
52-
-DBUILD_PLUGIN_SQLITE=ON
59+
-DBUILD_PLUGIN_E57=ON
60+
-DBUILD_PLUGIN_DRACO=ON
61+
-DBUILD_PGPOINTCLOUD_TESTS=OFF
62+
-DWITH_ZSTD=ON
63+
-DWITH_ZLIB=ON
5364
]
5465
if OS.linux?
5566
libunwind = Formula["libunwind"]

‎Formula/r/rtabmap.rb‎

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
class Rtabmap < Formula
22
desc "Visual and LiDAR SLAM library and standalone application"
33
homepage "https://introlab.github.io/rtabmap"
4+
url "https://github.com/introlab/rtabmap/archive/refs/tags/0.21.4.tar.gz"
5+
sha256 "242f8da7c5d20f86a0399d6cfdd1a755e64e9117a9fa250ed591c12f38209157"
46
license "BSD-3-Clause"
5-
revision 10
7+
revision 11
68
head "https://github.com/introlab/rtabmap.git", branch: "master"
79

8-
stable do
9-
url "https://github.com/introlab/rtabmap/archive/refs/tags/0.21.4.tar.gz"
10-
sha256 "242f8da7c5d20f86a0399d6cfdd1a755e64e9117a9fa250ed591c12f38209157"
11-
12-
# Backport support for newer PCL
13-
# Ref: https://github.com/introlab/rtabmap/commit/cbd3995b600fc2acc4cb57b81f132288a6c91188
14-
patch :DATA
15-
end
16-
1710
# Upstream doesn't create releases for all tagged versions, so we use the
1811
# `GithubLatest` strategy.
1912
livecheck do
@@ -24,11 +17,11 @@ class Rtabmap < Formula
2417
no_autobump! because: :requires_manual_review
2518

2619
bottle do
27-
sha256 arm64_sonoma: "1d433bee617217b945cc97f14e98ef947b3966d804f884f047607fb51fb13852"
28-
sha256 arm64_ventura: "1e9747b0eb5689899563716f8956590a882545c2f0a9e73df82cd4148f1f198c"
29-
sha256 sonoma: "99d65d4e03958e697247bf67bbce34cd78356c48e06c119883252ab0eabc9f6f"
30-
sha256 ventura: "6d1567f28fac55c42410af8f0946efd7f5513a21c66bdce68a609f90918a47df"
31-
sha256 cellar: :any_skip_relocation, x86_64_linux: "78f9cf656952b8ca809bd8f68b6903727b9957aedb88f592e680de09ddbbbf37"
20+
sha256 arm64_sonoma: "fbf0965fd170b388c8fdd66a91b179cb9c7c3f3b3f7d2b68146766cb9c7e4710"
21+
sha256 arm64_ventura: "e03225f05160f3d002063c02fdf651a2eb9ee7ee35c6d375b69a43f428c42a9f"
22+
sha256 sonoma: "8354568d383a42537112a71c0ec7d8f9404138643a645c07c1209a79dbd63756"
23+
sha256 ventura: "1f1090acdf8d7aa10ae0e7c951b7d9f93c8c5d60973da1f85cc7ec1725f36e4b"
24+
sha256 cellar: :any_skip_relocation, x86_64_linux: "0d346715818367390b00615de1cb0b98a9f886ac9f4f61d2c42f07e5e129d2c3"
3225
end
3326

3427
depends_on "cmake" => [:build, :test]
@@ -57,6 +50,10 @@ class Rtabmap < Formula
5750
end
5851

5952
def install
53+
# Backport support for newer PCL
54+
# Ref: https://github.com/introlab/rtabmap/commit/cbd3995b600fc2acc4cb57b81f132288a6c91188
55+
inreplace "corelib/src/CameraThread.cpp", "pcl/io/io.h", "pcl/common/io.h" if build.stable?
56+
6057
system "cmake", "-S", ".", "-B", "build", "-DCMAKE_INSTALL_RPATH=#{rpath}", *std_cmake_args
6158
system "cmake", "--build", "build"
6259
system "cmake", "--install", "build"
@@ -115,18 +112,3 @@ def install
115112
assert_equal version.to_s, shell_output("./build/test").strip
116113
end
117114
end
118-
119-
__END__
120-
diff --git a/corelib/src/CameraThread.cpp b/corelib/src/CameraThread.cpp
121-
index a18fc2c1..d1486b20 100644
122-
--- a/corelib/src/CameraThread.cpp
123-
+++ b/corelib/src/CameraThread.cpp
124-
@@ -44,7 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
125-
#include <rtabmap/utilite/ULogger.h>
126-
#include <rtabmap/utilite/UStl.h>
127-
128-
-#include <pcl/io/io.h>
129-
+#include <pcl/common/io.h>
130-
131-
namespace rtabmap
132-
{

‎Formula/t/tiledb.rb‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
class Tiledb < Formula
2+
desc "Universal storage engine"
3+
homepage "https://tiledb.com/"
4+
url "https://github.com/TileDB-Inc/TileDB/archive/refs/tags/2.28.0.tar.gz"
5+
sha256 "de731cd0c8e82fe8cfca084b937dc0df41e451c8eb93071e4cc5aba7bbef854e"
6+
license "MIT"
7+
8+
bottle do
9+
sha256 cellar: :any, arm64_sequoia: "9468ff50f991980cd4a1f271157acda6c86180ade8ba9bb6d112c77a9376e791"
10+
sha256 cellar: :any, arm64_sonoma: "40161d0f697370e27e84f0c0a070936a9e1cf0f648d1b3797f85c36dc16d2525"
11+
sha256 cellar: :any, arm64_ventura: "a845576b2650eaa736ecc376f3870210930a90fc5a539cac056abeaa320ee2ef"
12+
sha256 cellar: :any, sonoma: "1b49eb9525ee4fd3c1fe79c02ab9b63d8ea2fbf4ea235de722850b82fc9b71a2"
13+
sha256 cellar: :any, ventura: "38d698425d8a9c8010c5fd6ea2db466979954f6c87ac1d07f2010cd7faa8cf1d"
14+
sha256 cellar: :any_skip_relocation, arm64_linux: "eeb80c36f1f88dafe9bcd4982ca9089cc55338df63d13cfb2aaa6692a6db9648"
15+
sha256 cellar: :any_skip_relocation, x86_64_linux: "367e2dddca418e1fcca9065fc02e3064cf3f6ade0586dde6d022016423895dec"
16+
end
17+
18+
depends_on "cmake" => :build
19+
20+
depends_on "fmt"
21+
depends_on "libmagic"
22+
depends_on "lz4"
23+
depends_on "openssl@3"
24+
depends_on "spdlog"
25+
depends_on "webp"
26+
depends_on "zstd"
27+
28+
uses_from_macos "bzip2"
29+
uses_from_macos "zlib"
30+
31+
def install
32+
args = %w[
33+
-DTILEDB_EXPERIMENTAL_FEATURES=OFF
34+
-DTILEDB_TESTS=OFF
35+
-DTILEDB_VERBOSE=ON
36+
-DTILEDB_WERROR=OFF
37+
-DTILEDB_DISABLE_AUTO_VCPKG=ON
38+
]
39+
40+
system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
41+
system "cmake", "--build", "build"
42+
system "cmake", "--install", "build"
43+
end
44+
45+
test do
46+
(testpath/"test.cpp").write <<~CPP
47+
#include <tiledb/tiledb>
48+
#include <iostream>
49+
50+
int main() {
51+
auto [major, minor, patch] = tiledb::version();
52+
std::cout << major << "." << minor << "." << patch << std::endl;
53+
return 0;
54+
}
55+
CPP
56+
system ENV.cxx, "test.cpp", "-std=c++17", "-I#{include}", "-L#{lib}", "-ltiledb", "-o", "test"
57+
assert_match version.to_s, shell_output("./test")
58+
end
59+
end

0 commit comments

Comments
 (0)