Skip to content

Commit

Permalink
Merge branch 'master' into ignition-math6_6.15.0
Browse files Browse the repository at this point in the history
  • Loading branch information
scpeters authored Sep 1, 2023
2 parents 71b7f29 + b1dc63b commit c2bada7
Show file tree
Hide file tree
Showing 11 changed files with 68 additions and 16 deletions.
8 changes: 7 additions & 1 deletion Formula/gazebo11.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ class Gazebo11 < Formula
url "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.13.0.tar.bz2"
sha256 "2f65b98fe652a574e01b7cae6cf12e14a9dd29343fde99e066ac5193a8d03e71"
license "Apache-2.0"
revision 7
revision 8

head "https://github.com/osrf/gazebo.git", branch: "gazebo11"

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 monterey: "7c4dad34e889053bac46ceff36794864b3c233419616b61337aa9dceb6f4d92b"
sha256 big_sur: "e3ce6a0828781255a152068176bcf0281a5bddc5422d18d45adb7824a342fb7e"
end

depends_on "cmake" => :build
depends_on "pkg-config" => :build

Expand Down
2 changes: 2 additions & 0 deletions Formula/ignition-citadel.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class IgnitionCitadel < Formula

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 cellar: :any, ventura: "9d36689233cee3bb6016793002ab5fa0574a986d3787ef46c8c2d6c76d7b53a7"
sha256 cellar: :any, monterey: "39c496abc944d0ecf30f10489095d0beafa7cb794e4f88d2436c2c4fccd00deb"
sha256 cellar: :any, big_sur: "dfc3b855fc80378130a975dc3a05783ed5efd4e1e8a89a14cbec9d970182e544"
end
Expand Down Expand Up @@ -51,6 +52,7 @@ def install
system "make", "install"
end

# install vcstool so it can be used in the test
venv = virtualenv_create(libexec, Formula["[email protected]"].opt_libexec/"bin/python")
%w[PyYAML vcstool].each do |pkg|
venv.pip_install pkg
Expand Down
9 changes: 8 additions & 1 deletion Formula/ignition-fuel-tools7.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 5
revision 6

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: "7c6c366caccba1f104a357924c5c0558544e8b8052018c80da2161ea640bfc2e"
sha256 cellar: :any, monterey: "f809cd9fbc51a6441b85c730cee20edb12499ac713112bfdc20023710692c65a"
sha256 cellar: :any, big_sur: "4fc7ef1d0ea353fbdba6bc7645c4686aa4e37389a997a09c1c64d4f9d38e624f"
end

depends_on "cmake"
depends_on "ignition-cmake2"
depends_on "ignition-common4"
Expand Down
2 changes: 2 additions & 0 deletions Formula/ignition-gazebo3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class IgnitionGazebo3 < Formula

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 ventura: "8d9a4f7e8268322e00427b6111927c0ab8a87df8205b6647d4c33f71c7a8e6a0"
sha256 monterey: "eb3ac3b71e6d1fd411862a73a5ab544f03cb78de5a15e9cec2d27c2e7eceb0b3"
sha256 big_sur: "63d61c5255395ecbdbd30b4960ffc9a0f5326e2a53accff7e6e92520ed66faf2"
end
Expand Down Expand Up @@ -50,6 +51,7 @@ def install
cmake_args << "-DBUILD_TESTING=OFF"
cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpath}"

# Use build folder
mkdir "build" do
system "cmake", "..", *cmake_args
system "make", "install"
Expand Down
8 changes: 7 additions & 1 deletion Formula/ignition-gazebo6.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ 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 1
revision 2

head "https://github.com/gazebosim/gz-sim.git", branch: "ign-gazebo6"

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 monterey: "2d7e8a0494311f607cf3b8e25c57c62c68003ddc788a659fd678bff07b21dd70"
sha256 big_sur: "7c7b9e05a4a177f59cb0d1ba5dd42f67a612805413ca705ba6baf3d7881380fa"
end

depends_on "cmake" => :build
depends_on "pybind11" => :build
depends_on "ffmpeg"
Expand Down
9 changes: 8 additions & 1 deletion Formula/ignition-gui6.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 7
revision 8

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: "1bef655a4ea29104c429d13701d15e812cfdae3d7222e448182a34d2d5f72035"
sha256 monterey: "a7f9fc111ea72fa296306595f66aa2a187c4ed18138ad2d687a2c37297f7ead8"
sha256 big_sur: "48237abefba3e5c571b954cc45955451de46503c5b05a3cfaefa59702c9e7f32"
end

depends_on "cmake" => [:build, :test]
depends_on "pkg-config" => [:build, :test]
depends_on "ignition-cmake2"
Expand Down
2 changes: 2 additions & 0 deletions Formula/ignition-launch2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ class IgnitionLaunch2 < Formula

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 ventura: "6453289a1875d0ae1c0c198332af439de2edb7188b36c149f2f79c305d5c1fc9"
sha256 monterey: "ef282a967162e73efc83c7700ce7f0ae15951a3a7ae800b2c81e3771490bb77c"
sha256 big_sur: "2518981af53f198a85273f435e33f8b46fdcf66be250ba8cd3077030a9ed283f"
end
Expand All @@ -36,6 +37,7 @@ def install
cmake_args << "-DBUILD_TESTING=OFF"
cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpath}"

# Use build folder
mkdir "build" do
system "cmake", "..", *cmake_args
system "make", "install"
Expand Down
8 changes: 7 additions & 1 deletion Formula/ignition-launch5.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ 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 5
revision 6

head "https://github.com/gazebosim/gz-launch.git", branch: "ign-launch5"

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 monterey: "5d65721224a29a27dacf6952d271e1323d13ffb6a08ee4071947c54eb2445125"
sha256 big_sur: "caa33c0402713a52c1b8b38080c6c897792d9f00158335be8a8535727d240663"
end

depends_on "cmake" => :build
depends_on "pkg-config" => :build

Expand Down
9 changes: 8 additions & 1 deletion Formula/ignition-msgs8.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 7
revision 8

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: "6ca3097a95cddcdf77002b92fbe33059c00510bca5e18c33d2a8374f84e08ff0"
sha256 cellar: :any, monterey: "2656f6eb7b895d5bac6672d643ab65d661b6956d5cf7dfdd0b9d40ad545954df"
sha256 cellar: :any, big_sur: "96ed224b521cc771c166bb7bb23d331f4c8604d6dd2202702d17059e1d791449"
end

depends_on "cmake"
depends_on "ignition-cmake2"
depends_on "ignition-math6"
Expand Down
9 changes: 8 additions & 1 deletion Formula/ignition-sensors6.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@ class IgnitionSensors6 < Formula
url "https://osrf-distributions.s3.amazonaws.com/ign-sensors/releases/ignition-sensors6-6.7.0.tar.bz2"
sha256 "c53a5f077dbf59b1ecc1d0527f54f2a5690ab1cc7f23fdc690aaa6bdd6c67c4c"
license "Apache-2.0"
revision 7
revision 8

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: "08df276b4e821ec482ec86668d39c33768f6d90929b182ccab65d8f46c2d4eb8"
sha256 cellar: :any, monterey: "3e0dfc1941ec4efa11cdf493b388ed0d60a42fe0fbcb6e8fe622629d582bb280"
sha256 cellar: :any, big_sur: "05e9a26b96ebf5b78a7b4a0c0361ad4ea40f3c76d7b5947b3af56795b2eb5da2"
end

depends_on "cmake" => [:build, :test]
depends_on "pkg-config" => [:build, :test]

Expand Down
18 changes: 9 additions & 9 deletions Formula/ignition-transport11.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
class IgnitionTransport11 < Formula
desc "Transport middleware for robotics"
homepage "https://ignitionrobotics.org"
url "https://osrf-distributions.s3.amazonaws.com/ign-transport/releases/ignition-transport11-11.4.0.tar.bz2"
sha256 "504310cec3c097abb8d9a45e694924a70fadbf785c9e679545f85cb72cfdc434"
url "https://osrf-distributions.s3.amazonaws.com/ign-transport/releases/ignition-transport11-11.4.1.tar.bz2"
sha256 "f18501cbd5c78b584b3db1960a3049d6ae416bab7f0289af64eadda13d1c5da5"
license "Apache-2.0"
revision 7
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: "3e0deec86eabdd234f3dda0aac516206f93686cd7c64d2ed4a3d14a9f8acdc4c"
sha256 monterey: "19f8c76983e08f6e0831e95233ac6b5488691f90ce4a82a68cee2b9d1324071b"
sha256 big_sur: "90f073207898bcdd413e85312ce396ee7f4ad6f22de568d2db97cc32a26b9782"
end

depends_on "doxygen" => [:build, :optional]

depends_on "cmake"
Expand All @@ -23,12 +29,6 @@ class IgnitionTransport11 < Formula
depends_on "protobuf"
depends_on "zeromq"

patch do
# Fix for compatibility with protobuf 23.2
url "https://github.com/gazebosim/gz-transport/commit/e35a697b619dbcecec0ae0c8b8f0a644d368abf3.patch?full_index=1"
sha256 "6bbc6da4245b57f12112695914f58160f093691967c3bbe2fbc9b75eafc0886a"
end

def install
cmake_args = std_cmake_args
cmake_args << "-DBUILD_TESTING=Off"
Expand Down

0 comments on commit c2bada7

Please sign in to comment.