From e091d45b0660adf8b6614f16c8ddff1254720889 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 7 Sep 2023 16:23:14 -0700 Subject: [PATCH 01/10] ignition-physics5: revision bump dartsim patch --- Formula/ignition-physics5.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Formula/ignition-physics5.rb b/Formula/ignition-physics5.rb index b2e6265d8..e1973bece 100644 --- a/Formula/ignition-physics5.rb +++ b/Formula/ignition-physics5.rb @@ -4,6 +4,7 @@ class IgnitionPhysics5 < Formula url "https://osrf-distributions.s3.amazonaws.com/ign-physics/releases/ignition-physics5-5.3.2.tar.bz2" sha256 "4262512fbb6952712234c5cbeed69cdabca338931bb6c587a1ef7d487a5f262b" license "Apache-2.0" + revision 1 head "https://github.com/gazebosim/gz-physics.git", branch: "ign-physics5" @@ -28,6 +29,12 @@ class IgnitionPhysics5 < Formula depends_on "pkg-config" depends_on "sdformat12" + patch do + # Fix for unregistering dartsim collision detector + url "https://github.com/gazebosim/gz-physics/commit/2c238fe87b7c5ebd3d1ba37784db39ce93a6f143.patch?full_index=1" + sha256 "396557d48ae665c9a99ea0d9f60308a9ebb08198098df88a7f8497619ffb15d2" + end + def install cmake_args = std_cmake_args cmake_args << "-DBUILD_TESTING=OFF" From f467c1f918690fc591ab3bf896b1edfe95336fb0 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 11 Sep 2023 22:16:05 -0700 Subject: [PATCH 02/10] gz-sim6: enable monterey test Signed-off-by: Steve Peters --- Formula/ignition-gazebo6.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Formula/ignition-gazebo6.rb b/Formula/ignition-gazebo6.rb index 324a7ff44..14190c4f1 100644 --- a/Formula/ignition-gazebo6.rb +++ b/Formula/ignition-gazebo6.rb @@ -45,13 +45,10 @@ def install end test do - # Disable failing test on Monterey - if MacOS.version != :monterey - ENV["IGN_CONFIG_PATH"] = "#{opt_share}/ignition" - system Formula["ruby"].opt_bin/"ruby", - Formula["ignition-tools"].opt_bin/"ign", - "gazebo", "-s", "--iterations", "5", "-r", "-v", "4" - end + ENV["IGN_CONFIG_PATH"] = "#{opt_share}/ignition" + system Formula["ruby"].opt_bin/"ruby", + Formula["ignition-tools"].opt_bin/"ign", + "gazebo", "-s", "--iterations", "5", "-r", "-v", "4" (testpath/"test.cpp").write <<-EOS #include #include From 122fc8082ccf168712a51ed2cb52119bb9636fdd Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 11 Sep 2023 22:17:15 -0700 Subject: [PATCH 03/10] ignition-fuel-tools7: revision bump rebuild for protobuf --- Formula/ignition-fuel-tools7.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/ignition-fuel-tools7.rb b/Formula/ignition-fuel-tools7.rb index 44b094bed..f13941265 100644 --- a/Formula/ignition-fuel-tools7.rb +++ b/Formula/ignition-fuel-tools7.rb @@ -4,7 +4,7 @@ class IgnitionFuelTools7 < Formula url "https://osrf-distributions.s3.amazonaws.com/ign-fuel-tools/releases/ignition-fuel-tools7-7.3.0.tar.bz2" sha256 "59d06f23a054742e1f97c1f0f709e2a38c341ce96f560d6e09b3dba011dd79a5" license "Apache-2.0" - revision 8 + revision 9 head "https://github.com/gazebosim/gz-fuel-tools.git", branch: "ign-fuel-tools7" From 7fc6219352feac988a7d20d0a913408fdc892657 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 11 Sep 2023 22:17:24 -0700 Subject: [PATCH 04/10] ignition-gazebo6: revision bump rebuild for protobuf --- Formula/ignition-gazebo6.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/ignition-gazebo6.rb b/Formula/ignition-gazebo6.rb index 14190c4f1..dd2824b6e 100644 --- a/Formula/ignition-gazebo6.rb +++ b/Formula/ignition-gazebo6.rb @@ -4,7 +4,7 @@ class IgnitionGazebo6 < Formula url "https://osrf-distributions.s3.amazonaws.com/ign-gazebo/releases/ignition-gazebo6-6.15.0.tar.bz2" sha256 "897c8823054d504272dd8312509fb09baa6f042a131d348de2020ebd80bbf780" license "Apache-2.0" - revision 3 + revision 4 head "https://github.com/gazebosim/gz-sim.git", branch: "ign-gazebo6" From 7a198b83317df3643b1d694376d0d971c4e824ea Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 11 Sep 2023 22:17:29 -0700 Subject: [PATCH 05/10] ignition-gui6: revision bump rebuild for protobuf --- Formula/ignition-gui6.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/ignition-gui6.rb b/Formula/ignition-gui6.rb index 51e54a0a0..268cd19fe 100644 --- a/Formula/ignition-gui6.rb +++ b/Formula/ignition-gui6.rb @@ -4,7 +4,7 @@ class IgnitionGui6 < Formula url "https://osrf-distributions.s3.amazonaws.com/ign-gui/releases/ignition-gui6-6.8.0.tar.bz2" sha256 "dd4f26100f4d1343f068ba36f2b8394a0cddb337efde7b4a21c1b0f66ce496c9" license "Apache-2.0" - revision 10 + revision 11 head "https://github.com/gazebosim/gz-gui.git", branch: "ign-gui6" From ce7aa934c200b1cd3b93b8285e331d890d955cae Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 11 Sep 2023 22:17:36 -0700 Subject: [PATCH 06/10] ignition-launch5: revision bump rebuild for protobuf --- Formula/ignition-launch5.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/ignition-launch5.rb b/Formula/ignition-launch5.rb index 1951fb048..c8194c466 100644 --- a/Formula/ignition-launch5.rb +++ b/Formula/ignition-launch5.rb @@ -4,7 +4,7 @@ class IgnitionLaunch5 < Formula url "https://osrf-distributions.s3.amazonaws.com/ign-launch/releases/ignition-launch5-5.3.0.tar.bz2" sha256 "84d356b9c85609da1bb7feda2f90ae6d1a1fd2d6713b284799d5605de42e2613" license "Apache-2.0" - revision 7 + revision 8 head "https://github.com/gazebosim/gz-launch.git", branch: "ign-launch5" From 2b8d11e9a4c6e6848aa7ef26f42a61bc71d825db Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 11 Sep 2023 22:17:44 -0700 Subject: [PATCH 07/10] ignition-msgs8: revision bump rebuild for protobuf --- Formula/ignition-msgs8.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/ignition-msgs8.rb b/Formula/ignition-msgs8.rb index 4de78fd5b..89b824bde 100644 --- a/Formula/ignition-msgs8.rb +++ b/Formula/ignition-msgs8.rb @@ -4,7 +4,7 @@ class IgnitionMsgs8 < Formula url "https://osrf-distributions.s3.amazonaws.com/ign-msgs/releases/ignition-msgs8-8.7.0.tar.bz2" sha256 "b17a8e16fe56a84891bd0654a2ac09427e9a567b9cd2255bb2cfa830f8e1af45" license "Apache-2.0" - revision 10 + revision 11 head "https://github.com/gazebosim/gz-msgs.git", branch: "ign-msgs8" From 24ef72757da3df3485822182c1fb8535eecb3e38 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 11 Sep 2023 22:17:50 -0700 Subject: [PATCH 08/10] ignition-sensors6: revision bump rebuild for protobuf --- Formula/ignition-sensors6.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/ignition-sensors6.rb b/Formula/ignition-sensors6.rb index 922030bb1..30e719926 100644 --- a/Formula/ignition-sensors6.rb +++ b/Formula/ignition-sensors6.rb @@ -4,7 +4,7 @@ class IgnitionSensors6 < Formula url "https://osrf-distributions.s3.amazonaws.com/ign-sensors/releases/ignition-sensors6-6.7.1.tar.bz2" sha256 "5b01cb99ff8b1effc0bdaa0309f4378894ace2640644ee3f2b96d44ff3aa10f0" license "Apache-2.0" - revision 2 + revision 3 head "https://github.com/gazebosim/gz-sensors.git", branch: "ign-sensors6" From 6200b6c765961cead0da9dbf6d95122f40b508a5 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 12 Sep 2023 21:34:48 -0700 Subject: [PATCH 09/10] ignition-transport11: revision bump rebuild for protobuf --- Formula/ignition-transport11.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/ignition-transport11.rb b/Formula/ignition-transport11.rb index 5aaea88b6..cc6faf524 100644 --- a/Formula/ignition-transport11.rb +++ b/Formula/ignition-transport11.rb @@ -4,7 +4,7 @@ class IgnitionTransport11 < Formula url "https://osrf-distributions.s3.amazonaws.com/ign-transport/releases/ignition-transport11-11.4.1.tar.bz2" sha256 "f18501cbd5c78b584b3db1960a3049d6ae416bab7f0289af64eadda13d1c5da5" license "Apache-2.0" - revision 2 + revision 3 version_scheme 1 head "https://github.com/gazebosim/gz-transport.git", branch: "ign-transport11" From 35653d1ce9c48a4116055304bfa082fd70a25062 Mon Sep 17 00:00:00 2001 From: OSRF Build Bot Date: Wed, 13 Sep 2023 22:50:45 +0000 Subject: [PATCH 10/10] update bottle. --- Formula/ignition-fuel-tools7.rb | 7 +++++++ Formula/ignition-gazebo6.rb | 7 +++++++ Formula/ignition-gui6.rb | 7 +++++++ Formula/ignition-launch5.rb | 7 +++++++ Formula/ignition-msgs8.rb | 7 +++++++ Formula/ignition-physics5.rb | 6 +++--- Formula/ignition-sensors6.rb | 7 +++++++ Formula/ignition-transport11.rb | 7 +++++++ 8 files changed, 52 insertions(+), 3 deletions(-) diff --git a/Formula/ignition-fuel-tools7.rb b/Formula/ignition-fuel-tools7.rb index f13941265..f254ac08e 100644 --- a/Formula/ignition-fuel-tools7.rb +++ b/Formula/ignition-fuel-tools7.rb @@ -8,6 +8,13 @@ class IgnitionFuelTools7 < Formula head "https://github.com/gazebosim/gz-fuel-tools.git", branch: "ign-fuel-tools7" + bottle do + root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 cellar: :any, ventura: "6dc71ce7889abe2687571c8c052bad075f1475daee509615980703722f868c57" + sha256 cellar: :any, monterey: "396ca1c1965695afa6eff10e6c200f2a869d2c642abee09e18046172102ad6a4" + sha256 cellar: :any, big_sur: "5a06ac35eb8ff173459765c0af68399a2858b4e874ca5ffa173937954aba0b49" + end + depends_on "cmake" depends_on "ignition-cmake2" depends_on "ignition-common4" diff --git a/Formula/ignition-gazebo6.rb b/Formula/ignition-gazebo6.rb index dd2824b6e..acd7ed118 100644 --- a/Formula/ignition-gazebo6.rb +++ b/Formula/ignition-gazebo6.rb @@ -8,6 +8,13 @@ class IgnitionGazebo6 < Formula head "https://github.com/gazebosim/gz-sim.git", branch: "ign-gazebo6" + bottle do + root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 ventura: "002c11ac8c1f52766fa803f25a0feb7a37a6ae9789a87015e6ce9617b6cfa81d" + sha256 monterey: "f474d4ef4f3881b114f78084f36e78352246212febfce504060ce1b950bd8363" + sha256 big_sur: "609a698024fc6ef4533f04b3ecec1d3bf873adf6d3a1202b51ab866eb885c38d" + end + depends_on "cmake" => :build depends_on "pybind11" => :build depends_on "ffmpeg" diff --git a/Formula/ignition-gui6.rb b/Formula/ignition-gui6.rb index 268cd19fe..9927a4635 100644 --- a/Formula/ignition-gui6.rb +++ b/Formula/ignition-gui6.rb @@ -8,6 +8,13 @@ class IgnitionGui6 < Formula head "https://github.com/gazebosim/gz-gui.git", branch: "ign-gui6" + bottle do + root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 ventura: "12ad1a1ea711a87226d9ff85a8c93a8331e7168cbf638fdd05eca528bf3ac49a" + sha256 monterey: "20443a073acc7141680e277f1e0ace5fbcb507be782f53161c6aa5f1415d0e67" + sha256 big_sur: "9b36c3972a32ef7eaca19ef7106283f8cc39ca33f67a59b9d649e3ad4ef7a8d2" + end + depends_on "cmake" => [:build, :test] depends_on "pkg-config" => [:build, :test] depends_on "ignition-cmake2" diff --git a/Formula/ignition-launch5.rb b/Formula/ignition-launch5.rb index c8194c466..d3fc099a1 100644 --- a/Formula/ignition-launch5.rb +++ b/Formula/ignition-launch5.rb @@ -8,6 +8,13 @@ class IgnitionLaunch5 < Formula head "https://github.com/gazebosim/gz-launch.git", branch: "ign-launch5" + bottle do + root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 ventura: "03009f4bbecb8ca07df777c329fa4f1fad915ec27f28df82698941641d4a81ad" + sha256 monterey: "3579468be3c929957bd0b250a490e5eaebb9780ada8d20e90943c29759d1caa7" + sha256 big_sur: "6b72248e6f4e0d8a7400a7455d16a09bf9eb3a8b9d38f0a2a32f0a4f40df9313" + end + depends_on "cmake" => :build depends_on "pkg-config" => :build diff --git a/Formula/ignition-msgs8.rb b/Formula/ignition-msgs8.rb index 89b824bde..36992e899 100644 --- a/Formula/ignition-msgs8.rb +++ b/Formula/ignition-msgs8.rb @@ -8,6 +8,13 @@ class IgnitionMsgs8 < Formula head "https://github.com/gazebosim/gz-msgs.git", branch: "ign-msgs8" + bottle do + root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 cellar: :any, ventura: "68e6f6521410d727f6008619115833b9aee487aa2eb013afd523cc82271cdf68" + sha256 cellar: :any, monterey: "28e220efab0b050c38e974a404c76947ba0b9f772f45adaa1cdee9df443f0c53" + sha256 cellar: :any, big_sur: "85fb663e902773b0375c2ab58cdbc7c90485aad186f456bae2e0b9d2bf99885c" + end + depends_on "cmake" depends_on "ignition-cmake2" depends_on "ignition-math6" diff --git a/Formula/ignition-physics5.rb b/Formula/ignition-physics5.rb index e1973bece..f6b747bdd 100644 --- a/Formula/ignition-physics5.rb +++ b/Formula/ignition-physics5.rb @@ -10,9 +10,9 @@ class IgnitionPhysics5 < Formula bottle do root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" - sha256 cellar: :any, ventura: "3a7d33dfa15c5efeababcb7624020b2b81d41ddac2605e18bede38259cbf0720" - sha256 cellar: :any, monterey: "c851366911cecb5e466c8c4db15a0b9b927b84aff5824b8a8094222573bf861c" - sha256 cellar: :any, big_sur: "21c3de8c60cb2ca1bdefbfb7306f26cffa1acf91583d0053fcf42c6ed7e30e19" + sha256 cellar: :any, ventura: "3493a87d1120ffbf9214263f3bf2db615f932b72a75984d2d95011860e81cb8d" + sha256 cellar: :any, monterey: "58beb1a2a04067bd51db1f412ca0e02360ad7f1ed737aab980d5441f2c0b9db1" + sha256 cellar: :any, big_sur: "c9b119681bdf174676192cfdc86a7bc628f3a1b55e97546ed4c58d6a1c2048b3" end depends_on "cmake" => :build diff --git a/Formula/ignition-sensors6.rb b/Formula/ignition-sensors6.rb index 30e719926..5a526aeb7 100644 --- a/Formula/ignition-sensors6.rb +++ b/Formula/ignition-sensors6.rb @@ -8,6 +8,13 @@ class IgnitionSensors6 < Formula head "https://github.com/gazebosim/gz-sensors.git", branch: "ign-sensors6" + bottle do + root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 cellar: :any, ventura: "3cb3f517a81f7d940acfe9cce5c5ed9b15a62910b2d6dcaad3d3dafcde75050e" + sha256 cellar: :any, monterey: "a87069731b930e5367eab005b26d4c3159487e91ffe588fb58c2c0c3efadd604" + sha256 cellar: :any, big_sur: "fe5bd6851d365c28b1f9dbcb6859995082483758cdb995339ae7b5ab3254aaa5" + end + depends_on "cmake" => [:build, :test] depends_on "pkg-config" => [:build, :test] diff --git a/Formula/ignition-transport11.rb b/Formula/ignition-transport11.rb index cc6faf524..ab7cb997c 100644 --- a/Formula/ignition-transport11.rb +++ b/Formula/ignition-transport11.rb @@ -9,6 +9,13 @@ class IgnitionTransport11 < Formula head "https://github.com/gazebosim/gz-transport.git", branch: "ign-transport11" + bottle do + root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 ventura: "b53196b78408ba553eeb7daa2474e9607d57417cbb8cb842b13f42d4a97c2c4a" + sha256 monterey: "0cb5f2a96834eb7eb40c718038864e29ea70618aaac56af82f79e9f8c2ee490c" + sha256 big_sur: "cd33798169761ad6a6750bb6f5003c12b361c25ddba3a91412671e1f802f6f3c" + end + depends_on "doxygen" => [:build, :optional] depends_on "cmake"