Skip to content

Commit

Permalink
Merge branch 'master' into sdformat13_13.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
scpeters authored Sep 14, 2023
2 parents 5f99a3d + 2e51529 commit 26567e8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
15 changes: 14 additions & 1 deletion Formula/gazebo11.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@ 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 9
revision 10

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

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 ventura: "0e8dc76027a24af5abe12e7ccff9d5ce54e8b1bfb73b844d9129708ef156a9ba"
sha256 monterey: "919c1c1a409b364ad9e7339f95e4203b83918444adf1e0b4310fccf8ac485a05"
sha256 big_sur: "36b520e1b998fd1801ae0ec9e4812e926bfc54133275a56336c3d49d06d83518"
end

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

Expand Down Expand Up @@ -43,6 +50,12 @@ class Gazebo11 < Formula
conflicts_with "gazebo9", because: "differing version of the same formula"
conflicts_with "gz-tools2", because: "both install bin/gz"

patch do
# Fix for compatibility with graphviz 9.0
url "https://github.com/gazebosim/gazebo-classic/commit/ba2cbd532a8ba47972cf9f0c3dbc32a5757cab2a.patch?full_index=1"
sha256 "a9cca7d59663fd45bab74e044c817600d24028e80ad2871107a34e8a3bebab2a"
end

patch do
# Fix for compatibility with protobuf 23.2
url "https://github.com/gazebosim/gazebo-classic/commit/17e09f574a4f39caff279cd70364cd1a3ea46f70.patch?full_index=1"
Expand Down
2 changes: 1 addition & 1 deletion Formula/gz-rendering8.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class GzRendering8 < Formula
homepage "https://gazebosim.org"
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"
sha256 "2e828c5c0754d082d97a01b5ef6f47d3baae2749f7c638b18259c4673c11be7b"
license "Apache-2.0"

head "https://github.com/gazebosim/gz-rendering.git", branch: "main"
Expand Down

0 comments on commit 26567e8

Please sign in to comment.