From 9ba13bcab5457c13eb59f5b24394b595317ed55b Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 12 Sep 2023 20:23:09 -0700 Subject: [PATCH 1/5] gz-plugin2: test executable in libexec (#2402) Signed-off-by: Steve Peters --- Formula/gz-plugin2.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/gz-plugin2.rb b/Formula/gz-plugin2.rb index c01f40d01..df4674d6a 100644 --- a/Formula/gz-plugin2.rb +++ b/Formula/gz-plugin2.rb @@ -35,6 +35,7 @@ def install end test do + system "#{libexec}/gz/plugin2/gz-plugin" (testpath/"test.cpp").write <<-EOS #include int main() { From 1758da8018db30a39c381c97262512a81e5f7f24 Mon Sep 17 00:00:00 2001 From: osrfbuild Date: Wed, 13 Sep 2023 13:49:39 -0700 Subject: [PATCH 2/5] gz-rendering8 8.0.0~pre2 (#2401) * update bottle. Co-authored-by: Steve Peters --- Formula/gz-rendering8.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Formula/gz-rendering8.rb b/Formula/gz-rendering8.rb index f36f2d230..2bf8d27b9 100644 --- a/Formula/gz-rendering8.rb +++ b/Formula/gz-rendering8.rb @@ -1,18 +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.0.0~pre1.tar.bz2" - version "8.0.0~pre1" - sha256 "575745d51ad51b2df23750d26b492752a581e7391f3daadb116745f25d112b01" + url "https://osrf-distributions.s3.amazonaws.com/gz-rendering/releases/gz-rendering-8.0.0~pre2.tar.bz2" + version "8.0.0~pre2" + sha256 "45b94d4c30501672dfa8fccb20cb863c655b326e63085efb427f4b40eff12184" license "Apache-2.0" head "https://github.com/gazebosim/gz-rendering.git", branch: "main" bottle do root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" - sha256 ventura: "4b94123e4f6215a68ce729d2348657996ea05f9e974128a0918ab6d49a3dfef8" - sha256 monterey: "98483becf55e02e942535b54252e5253ce5a980f01caefab82e9c7aad2153f5f" - sha256 big_sur: "0400cadf553f92ba271f1423752b9d1e955d71148cdb932c5432e44032e33684" + sha256 ventura: "81f3c692236e1fc13e4c07879f9b32dd2c0435f098d4113e1a0ffd384bc45dfb" + sha256 monterey: "ccfd3d17b447223460edf896977317745a9a6babd6fcfd167ccb5d3c7dc6e92a" + sha256 big_sur: "c36c019be012b3553226db1f8ba5aae05a35559ad66a0e45cef4c43742ea2f62" end depends_on "cmake" => [:build, :test] From 3fd37adad7e4cb39e615f755b4573ec70f3564e8 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 13 Sep 2023 18:01:14 -0700 Subject: [PATCH 3/5] Fortress: patch physics and rebuild bottles (#2400) * ignition-physics5: revision bump dartsim patch * gz-sim6: enable monterey test * ignition-fuel-tools7: revision bump rebuild for protobuf * ignition-gazebo6: revision bump rebuild for protobuf * ignition-gui6: revision bump rebuild for protobuf * ignition-launch5: revision bump rebuild for protobuf * ignition-msgs8: revision bump rebuild for protobuf * ignition-sensors6: revision bump rebuild for protobuf * ignition-transport11: revision bump rebuild for protobuf * update bottle. Signed-off-by: Steve Peters Co-authored-by: OSRF Build Bot --- Formula/ignition-fuel-tools7.rb | 9 ++++++++- Formula/ignition-gazebo6.rb | 20 ++++++++++++-------- Formula/ignition-gui6.rb | 9 ++++++++- Formula/ignition-launch5.rb | 9 ++++++++- Formula/ignition-msgs8.rb | 9 ++++++++- Formula/ignition-physics5.rb | 13 ++++++++++--- Formula/ignition-sensors6.rb | 9 ++++++++- Formula/ignition-transport11.rb | 9 ++++++++- 8 files changed, 70 insertions(+), 17 deletions(-) diff --git a/Formula/ignition-fuel-tools7.rb b/Formula/ignition-fuel-tools7.rb index 44b094bed..f254ac08e 100644 --- a/Formula/ignition-fuel-tools7.rb +++ b/Formula/ignition-fuel-tools7.rb @@ -4,10 +4,17 @@ 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" + 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 324a7ff44..acd7ed118 100644 --- a/Formula/ignition-gazebo6.rb +++ b/Formula/ignition-gazebo6.rb @@ -4,10 +4,17 @@ 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" + 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" @@ -45,13 +52,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 diff --git a/Formula/ignition-gui6.rb b/Formula/ignition-gui6.rb index 51e54a0a0..9927a4635 100644 --- a/Formula/ignition-gui6.rb +++ b/Formula/ignition-gui6.rb @@ -4,10 +4,17 @@ 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" + 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 1951fb048..d3fc099a1 100644 --- a/Formula/ignition-launch5.rb +++ b/Formula/ignition-launch5.rb @@ -4,10 +4,17 @@ 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" + 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 4de78fd5b..36992e899 100644 --- a/Formula/ignition-msgs8.rb +++ b/Formula/ignition-msgs8.rb @@ -4,10 +4,17 @@ 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" + 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 b2e6265d8..f6b747bdd 100644 --- a/Formula/ignition-physics5.rb +++ b/Formula/ignition-physics5.rb @@ -4,14 +4,15 @@ 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" 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 @@ -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" diff --git a/Formula/ignition-sensors6.rb b/Formula/ignition-sensors6.rb index 922030bb1..5a526aeb7 100644 --- a/Formula/ignition-sensors6.rb +++ b/Formula/ignition-sensors6.rb @@ -4,10 +4,17 @@ 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" + 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 5aaea88b6..ab7cb997c 100644 --- a/Formula/ignition-transport11.rb +++ b/Formula/ignition-transport11.rb @@ -4,11 +4,18 @@ 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" + 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" From 8f0f00fd72a7d574e47f95c90dda52e729497ec6 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 13 Sep 2023 19:34:52 -0700 Subject: [PATCH 4/5] gz-plugin: fix rpath for libexec/gz/plugin2 (#2404) Add an rpath entry with a relative path from the libexec subfolder containing the CLI executable to lib. * gz-plugin2: bump revision * update bottle. Signed-off-by: Steve Peters Co-authored-by: OSRF Build Bot --- Formula/gz-plugin2.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Formula/gz-plugin2.rb b/Formula/gz-plugin2.rb index df4674d6a..b0d6ef227 100644 --- a/Formula/gz-plugin2.rb +++ b/Formula/gz-plugin2.rb @@ -4,15 +4,15 @@ class GzPlugin2 < Formula url "https://osrf-distributions.s3.amazonaws.com/gz-plugin/releases/gz-plugin-2.0.1.tar.bz2" sha256 "92b5c9a99b611887b40c271bf47300b4e8a5d006aa80902bd705d36f1d8508f5" license "Apache-2.0" + revision 1 head "https://github.com/gazebosim/gz-math.git", branch: "gz-math7" bottle do root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" - sha256 cellar: :any, ventura: "0cccfc4e784821706358e8e91655d231c5378fa950ee02775d2917522f9da41f" - sha256 cellar: :any, monterey: "f5a33572b7400a2948ae1c988be41ee08f9c3f0a4217e7361fcca263b8290ed0" - sha256 cellar: :any, big_sur: "696b7c7ed4768f14eb5ba56fa393f087571f238873c4681caac6ac6c711169d5" - sha256 cellar: :any, catalina: "c7faa3c09ae61b955b32e2c959a586fd61fb73a03f90282f5d3f29a2e8af71b1" + sha256 cellar: :any, ventura: "657a4ddc17e9b96a49b3abfc74a12e2d1cc32cb9157d1db3698f74abe3c013aa" + sha256 cellar: :any, monterey: "80a2063bba46c16fb1a7137176c97709503402d82bbcac6de4f2937a71bdba43" + sha256 cellar: :any, big_sur: "46ef3900833388ac27a78cacf6e063807429b7600933bf8ed5f2e7c5ae4c6cec" end depends_on "cmake" @@ -23,9 +23,13 @@ class GzPlugin2 < Formula depends_on "pkg-config" def install + rpaths = [ + rpath, + rpath(source: libexec/"gz/plugin2", target: lib), + ] cmake_args = std_cmake_args cmake_args << "-DBUILD_TESTING=OFF" - cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpath}" + cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpaths.join(";")}" # Use build folder mkdir "build" do From aa530632daee077c657dce0ec4dd76087ddc1fb5 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 13 Sep 2023 19:35:17 -0700 Subject: [PATCH 5/5] ignition-fortress: build ventura bottle (#2405) * update bottle. Co-authored-by: OSRF Build Bot --- Formula/ignition-fortress.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Formula/ignition-fortress.rb b/Formula/ignition-fortress.rb index 5e871ca56..8089664d1 100644 --- a/Formula/ignition-fortress.rb +++ b/Formula/ignition-fortress.rb @@ -13,6 +13,7 @@ class IgnitionFortress < Formula bottle do root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 cellar: :any, ventura: "62324f2e3a3cb45386447e9e9b6ff4158f98cf908b09039e26d56f34bcc3bd87" sha256 cellar: :any, monterey: "ce7adf2c9fea64c9ca1a307e0787c2ccdb9387032959b8b899866778f8e42406" sha256 cellar: :any, big_sur: "a745f123d272e680227ca493c830638ef74cfb38603cdd6e3af51a36778cc35a" end @@ -49,6 +50,7 @@ def install system "make", "install" end + # install vcstool so it can be used in the test venv = virtualenv_create(libexec, Formula["python@3.11"].opt_libexec/"bin/python") %w[PyYAML vcstool].each do |pkg| venv.pip_install pkg