Merge branch 'master' into scpeters/rebuild_citadel_protobuf

osrf · Nov 9, 2024 · 5d7234c · 5d7234c
2 parents be6abff + 05f4109
commit 5d7234c
Show file tree

Hide file tree

Showing 24 changed files with 192 additions and 46 deletions.
diff --git a/Formula/gz-cmake4.rb b/Formula/gz-cmake4.rb
@@ -1,16 +1,16 @@
 class GzCmake4 < Formula
   desc "CMake helper functions for building robotic applications"
   homepage "https://gazebosim.org"
-  url "https://osrf-distributions.s3.amazonaws.com/gz-cmake/releases/gz-cmake-4.0.0.tar.bz2"
-  sha256 "4bcb44c47a3de730c9acc97abdd9cec2f17129d3be28bacaab27f85b603fc790"
+  url "https://osrf-distributions.s3.amazonaws.com/gz-cmake/releases/gz-cmake-4.1.0.tar.bz2"
+  sha256 "0164fbf56ef890ffbbe00f21f7bfcd110064338a783d4a2a944857cc76761f60"
   license "Apache-2.0"
 
   head "https://github.com/gazebosim/gz-cmake.git", branch: "gz-cmake4"
 
   bottle do
     root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
-    sha256 cellar: :any_skip_relocation, sonoma:  "59d1ed788a310a8b2975dfd15cc1730d1108231da8806c8efafa59548f8c7813"
-    sha256 cellar: :any_skip_relocation, ventura: "f2d1c746e2d18bf9e33f92749f441e6dc08ed278c46485eb0426a765247d2e19"
+    sha256 cellar: :any_skip_relocation, sonoma:  "9815364927e8c55b44071ea2db5b7b858ee7a9f758879a7ebbde2361d389a0dc"
+    sha256 cellar: :any_skip_relocation, ventura: "d65216df29ada0798a8fb7e819ba8c34f942a54927c9b9dd018189bae4f38680"
   end
 
   depends_on "cmake"

diff --git a/Formula/gz-common5.rb b/Formula/gz-common5.rb
@@ -4,10 +4,16 @@ class GzCommon5 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gz-common/releases/gz-common-5.6.0.tar.bz2"
   sha256 "c2e0b3ca2c945d7ada377d780f1dbfc23338b169213e91814529ec6ac45dc70a"
   license "Apache-2.0"
-  revision 4
+  revision 5
 
   head "https://github.com/gazebosim/gz-common.git", branch: "gz-common5"
 
+  bottle do
+    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
+    sha256 cellar: :any, sonoma:  "e173a021b9dcf71f49de5bb38afbe94dbe06c72fbbc822c64c9820b81e560b9e"
+    sha256 cellar: :any, ventura: "fd47e5bf6497e07849d83c8018b0eac7147a539f7b57ffbc502fed14450bd036"
+  end
+
   depends_on "assimp"
   depends_on "cmake"
   depends_on "ffmpeg"

diff --git a/Formula/gz-common6.rb b/Formula/gz-common6.rb
@@ -4,10 +4,16 @@ class GzCommon6 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gz-common/releases/gz-common-6.0.0.tar.bz2"
   sha256 "55ea0e8b51e8c7ba9eb7e0f9a516f0d54b6d48d8d29a961a838e7bdc2531c517"
   license "Apache-2.0"
-  revision 1
+  revision 2
 
   head "https://github.com/gazebosim/gz-common.git", branch: "gz-common6"
 
+  bottle do
+    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
+    sha256 cellar: :any, sonoma:  "f097f0d1bdde0a50b7da6629ef8ecdda8a96f5f716ba6e07ca50b7ba791cec58"
+    sha256 cellar: :any, ventura: "4bce6465326ada3f0b18b3bd1bb957272f1c5f38b81dbc97dadabb0fe57af476"
+  end
+
   depends_on "assimp"
   depends_on "cmake"
   depends_on "ffmpeg"

diff --git a/Formula/gz-fuel-tools10.rb b/Formula/gz-fuel-tools10.rb
@@ -4,10 +4,16 @@ class GzFuelTools10 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gz-fuel-tools/releases/gz-fuel_tools-10.0.0.tar.bz2"
   sha256 "dce4fb51a6af8d15d3ebdd98ecff4baf47c02ffb4d6aed48b284a7ce9188778e"
   license "Apache-2.0"
-  revision 1
+  revision 2
 
   head "https://github.com/gazebosim/gz-fuel-tools.git", branch: "gz-fuel-tools10"
 
+  bottle do
+    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
+    sha256 cellar: :any, sonoma:  "a7d71656a8aa86b3c2ec85fc9b0088339a410cb6128f43b4844a365bd6151d51"
+    sha256 cellar: :any, ventura: "192e87564eb20da9ae78ce96962572d8124dfe66364a02b2c60fd8c118eca028"
+  end
+
   depends_on "abseil"
   depends_on "cmake"
   depends_on "gz-cmake4"

diff --git a/Formula/gz-fuel-tools8.rb b/Formula/gz-fuel-tools8.rb
@@ -4,10 +4,16 @@ class GzFuelTools8 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gz-fuel-tools/releases/gz-fuel_tools-8.2.0.tar.bz2"
   sha256 "ce224a4de6c63b573514d2fa3c96f0063d5d427b7b8ea05561d19a876afccea2"
   license "Apache-2.0"
-  revision 1
+  revision 2
 
   head "https://github.com/gazebosim/gz-fuel-tools.git", branch: "gz-fuel-tools8"
 
+  bottle do
+    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
+    sha256 cellar: :any, sonoma:  "fb090305d07614b8835c4648f02506883bf183af821253706b4bcfc4b480b4cf"
+    sha256 cellar: :any, ventura: "4ffeff348c03815791216b3f8fcfd78a33a5d53a6793079a9a9b2f73185314ad"
+  end
+
   depends_on "abseil"
   depends_on "cmake"
   depends_on "gz-cmake3"

diff --git a/Formula/gz-gui7.rb b/Formula/gz-gui7.rb
@@ -4,10 +4,16 @@ class GzGui7 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gz-gui/releases/gz-gui-7.2.2.tar.bz2"
   sha256 "dbfdfbb5e588d0bc6e163c554b1b5dc5397c85dda0a696ffaa79052420eb5dc0"
   license "Apache-2.0"
-  revision 11
+  revision 12
 
   head "https://github.com/gazebosim/gz-gui.git", branch: "gz-gui7"
 
+  bottle do
+    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
+    sha256 sonoma:  "bff6037284f9a25b544e050c27292cfa192b6687ab277a1f65fff802563fe463"
+    sha256 ventura: "5eb0be518dcddc659c2694bc8209eb39f2ecd831c757dc0126df1d7571a73799"
+  end
+
   depends_on "cmake" => [:build, :test]
   depends_on "pkg-config" => [:build, :test]
   depends_on "abseil"

diff --git a/Formula/gz-launch6.rb b/Formula/gz-launch6.rb
@@ -4,10 +4,16 @@ class GzLaunch6 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gz-launch/releases/gz-launch-6.1.0.tar.bz2"
   sha256 "7c789c85ffb422ebbc4adb6f93c9b2aa7fdd7eccd521b7895297a6b8c525acc1"
   license "Apache-2.0"
-  revision 32
+  revision 34
 
   head "https://github.com/gazebosim/gz-launch.git", branch: "gz-launch6"
 
+  bottle do
+    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
+    sha256 sonoma:  "49350400df3254d59ef321b220e14378a3a3bd42619b0e788ee52df773f9e267"
+    sha256 ventura: "21c7e35f6b240e5bd62281511245fe4da876a8c358a82b588b3743ebd84594fd"
+  end
+
   depends_on "cmake" => :build
   depends_on "pkg-config" => :build
 

diff --git a/Formula/gz-physics6.rb b/Formula/gz-physics6.rb
@@ -4,10 +4,16 @@ class GzPhysics6 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gz-physics/releases/gz-physics-6.6.0.tar.bz2"
   sha256 "de870ef09753188a8c4a7b0ed449eb2357bd537e0b90f8a474f334e3e7a95a0f"
   license "Apache-2.0"
-  revision 5
+  revision 6
 
   head "https://github.com/gazebosim/gz-physics.git", branch: "gz-physics6"
 
+  bottle do
+    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
+    sha256 sonoma:  "85be1f988ec9b4d6e419c0dd5fce9fd11af3623ffd406db309de7b6daf1c5867"
+    sha256 ventura: "6a56eb340e549d2b2c3d600ba31d45a5e51490d119626c503ebccef72a0422a6"
+  end
+
   depends_on "cmake" => [:build, :test]
 
   depends_on "bullet"

diff --git a/Formula/gz-physics8.rb b/Formula/gz-physics8.rb
@@ -4,10 +4,16 @@ class GzPhysics8 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gz-physics/releases/gz-physics-8.0.0.tar.bz2"
   sha256 "f842ea942ccb27b6f0854eedc1314c3e0bdd415cdac000ce4320d209ff3a42ee"
   license "Apache-2.0"
-  revision 1
+  revision 2
 
   head "https://github.com/gazebosim/gz-physics.git", branch: "gz-physics8"
 
+  bottle do
+    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
+    sha256 sonoma:  "bb52e2f7b7a86f64dafc64351fda00d67d9c04e6b41cd65507511fa1a3f6abf3"
+    sha256 ventura: "156f5c7716447ebb80f1d5e1830f477463d4f9a625a263fbf72c3f52c2633a15"
+  end
+
   depends_on "cmake" => [:build, :test]
 
   depends_on "bullet"

diff --git a/Formula/gz-rendering7.rb b/Formula/gz-rendering7.rb
@@ -4,10 +4,16 @@ class GzRendering7 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gz-rendering/releases/gz-rendering-7.4.2.tar.bz2"
   sha256 "81101ddb26c630dd0292c34a83d7736596d8ee1ac5d7b8ec4980f485de8ba87d"
   license "Apache-2.0"
-  revision 6
+  revision 7
 
   head "https://github.com/gazebosim/gz-rendering.git", branch: "gz-rendering7"
 
+  bottle do
+    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
+    sha256 sonoma:  "b731152eca5dd829d1c327f968face29909fb099e2a062579592cc6f518e5f5f"
+    sha256 ventura: "ef13733bd1a35b4841c2d55f8f512987edeae9f3d26bf40a1b93a80e0db4084f"
+  end
+
   depends_on "cmake" => [:build, :test]
   depends_on "pkg-config" => [:build, :test]
 

diff --git a/Formula/gz-rendering8.rb b/Formula/gz-rendering8.rb
@@ -1,13 +1,18 @@
 class GzRendering8 < Formula
   desc "Rendering library for robotics applications"
   homepage "https://gazebosim.org"
-  url "https://osrf-distributions.s3.amazonaws.com/gz-rendering/releases/gz-rendering-8.2.0.tar.bz2"
-  sha256 "0ccf502558522ff5f9fe882c3f5a381c789acc5a0521dc6ec7a08ea0fa05afce"
+  url "https://osrf-distributions.s3.amazonaws.com/gz-rendering/releases/gz-rendering-8.2.1.tar.bz2"
+  sha256 "a7cfed1d41d7db00f30f81df1b6ff73e867fbeeeb4a073d412cbf6791fb2360c"
   license "Apache-2.0"
-  revision 1
 
   head "https://github.com/gazebosim/gz-rendering.git", branch: "gz-rendering8"
 
+  bottle do
+    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
+    sha256 sonoma:  "286371a3f1258e1d1ce4f4b24fb5d653417cfb9b289c8d1cf3c0dae6d3633e0d"
+    sha256 ventura: "3a65e1616f214f2590d3946e909f03eb96967807e69eb91d9709a2e11a14f6c1"
+  end
+
   depends_on "cmake" => [:build, :test]
   depends_on "pkg-config" => [:build, :test]
 

diff --git a/Formula/gz-rendering9.rb b/Formula/gz-rendering9.rb
@@ -4,10 +4,16 @@ class GzRendering9 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gz-rendering/releases/gz-rendering-9.0.0.tar.bz2"
   sha256 "3b761f62d86db395aa989881e5bdaaff845f7d55c57962a919851c7287f48a42"
   license "Apache-2.0"
-  revision 1
+  revision 2
 
   head "https://github.com/gazebosim/gz-rendering.git", branch: "gz-rendering9"
 
+  bottle do
+    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
+    sha256 sonoma:  "9c7525e47e85a0bb2204c282a04cc25ae5907fe5d77308b1427b36f715715cff"
+    sha256 ventura: "bcfb7fb850c9bd7d4b24b9ec15ab7b358e1014154aca18b83a52c50e71cc6818"
+  end
+
   depends_on "cmake" => [:build, :test]
   depends_on "pkg-config" => [:build, :test]
 

diff --git a/Formula/gz-sensors7.rb b/Formula/gz-sensors7.rb
@@ -4,10 +4,16 @@ class GzSensors7 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gz-sensors/releases/gz-sensors-7.3.0.tar.bz2"
   sha256 "92b9e0bf4707bdbf318142b0a17c1cd1ca8c94bfee9f8911bcd0b3a7c6cbd169"
   license "Apache-2.0"
-  revision 32
+  revision 33
 
   head "https://github.com/gazebosim/gz-sensors.git", branch: "gz-sensors7"
 
+  bottle do
+    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
+    sha256 cellar: :any, sonoma:  "c2d9774032b4fe79184dc9e947771886cc26e6d2af7b034261c29ee268dc3a8e"
+    sha256 cellar: :any, ventura: "4fb2ea86babef7b29855ec3cd76e2503034fbf1e9905dd184b5205fe80d312be"
+  end
+
   depends_on "cmake" => [:build, :test]
   depends_on "pkg-config" => [:build, :test]
 

diff --git a/Formula/gz-sensors8.rb b/Formula/gz-sensors8.rb
@@ -1,10 +1,9 @@
 class GzSensors8 < Formula
   desc "Sensors library for robotics applications"
   homepage "https://github.com/gazebosim/gz-sensors"
-  url "https://osrf-distributions.s3.amazonaws.com/gz-sensors/releases/gz-sensors-8.2.0.tar.bz2"
-  sha256 "d3e041205d08ce29e5755a4afe1e5933c54cc11c6b07c78c8f34a1607d57f091"
+  url "https://osrf-distributions.s3.amazonaws.com/gz-sensors/releases/gz-sensors-8.2.1.tar.bz2"
+  sha256 "a651f8970e07055d7abdc32734e638ebf5904a99ab87b6ad1091ab65974cf6a9"
   license "Apache-2.0"
-  revision 10
 
   head "https://github.com/gazebosim/gz-sensors.git", branch: "gz-sensors8"
 

diff --git a/Formula/gz-sim7.rb b/Formula/gz-sim7.rb
@@ -4,10 +4,16 @@ class GzSim7 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gz-sim/releases/gz-sim-7.9.0.tar.bz2"
   sha256 "b8a506112d1287efce144b5a1264ab5754cacc436370fe2f1035b35cdd0d29a4"
   license "Apache-2.0"
-  revision 5
+  revision 7
 
   head "https://github.com/gazebosim/gz-sim.git", branch: "gz-sim7"
 
+  bottle do
+    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
+    sha256 sonoma:  "99a76a7478f66f68dc328047af379dd545957d7426d588c7cdd788317478a408"
+    sha256 ventura: "154f23ac5d7f0c18dc7ca1f80add3bc683756421e41cfd79ac6116b80290bb25"
+  end
+
   depends_on "cmake" => :build
   depends_on "pybind11" => :build
   depends_on "abseil"
@@ -30,14 +36,14 @@ class GzSim7 < Formula
   depends_on macos: :mojave # c++17
   depends_on "pkg-config"
   depends_on "protobuf"
-  depends_on "python@3.12"
+  depends_on "python@3.13"
   depends_on "qt@5"
   depends_on "ruby"
   depends_on "sdformat13"
   depends_on "tinyxml2"
 
   def python_cmake_arg
-    "-DPython3_EXECUTABLE=#{which("python3")}"
+    "-DPython3_EXECUTABLE=#{Formula["[email protected]"].opt_libexec}/bin/python}"
   end
 
   def install
@@ -57,7 +63,7 @@ def install
       system "make", "install"
     end
 
-    (lib/"python3.12/site-packages").install Dir[lib/"python/*"]
+    (lib/"python3.13/site-packages").install Dir[lib/"python/*"]
     rmdir prefix/"lib/python"
   end
 
@@ -148,6 +154,6 @@ def install
     cmd_not_grep_xcode = "! grep -rnI 'Applications[/]Xcode' #{prefix}"
     system cmd_not_grep_xcode
     # check python import
-    system Formula["python@3.12"].opt_libexec/"bin/python", "-c", "import gz.sim7"
+    system Formula["python@3.13"].opt_libexec/"bin/python", "-c", "import gz.sim7"
   end
 end
diff --git a/Formula/gz-sim8.rb b/Formula/gz-sim8.rb
@@ -1,10 +1,9 @@
 class GzSim8 < Formula
   desc "Gazebo Sim robot simulator"
   homepage "https://github.com/gazebosim/gz-sim"
-  url "https://osrf-distributions.s3.amazonaws.com/gz-sim/releases/gz-sim-8.6.0.tar.bz2"
-  sha256 "ceedc00bc884c6c1394d0cffa95bfc02303017835f02b438f205dd2f921f852a"
+  url "https://osrf-distributions.s3.amazonaws.com/gz-sim/releases/gz-sim-8.7.0.tar.bz2"
+  sha256 "4375643526a0009723b67ee74127432f94f730f67d6098d548e7e731d1e2e7e6"
   license "Apache-2.0"
-  revision 9
 
   head "https://github.com/gazebosim/gz-sim.git", branch: "gz-sim8"