Skip to content

Commit fc884c7

Browse files
scpetersscpeters
authored
Merge branch 'master' into scpeters/install_unversioned
2 parents e66151e + aa8ce79 commit fc884c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+147
-256
lines changed

‎Aliases/gz-tools3

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Formula/gazebo11.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class Gazebo11 < Formula
4949
# depends on "player"
5050

5151
conflicts_with "gz-tools2", because: "both install bin/gz"
52+
conflicts_with "gz-tools3", because: "both install bin/gz"
5253

5354
patch do
5455
# Fix build when homebrew python is installed

‎Formula/gz-common5.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@ class GzCommon5 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-common/releases/gz-common-5.7.1.tar.bz2"
55
sha256 "802a0a95bf52e10ec02b7531db1d577e2f477e5d326f0998f0b6ba323eb0396b"
66
license "Apache-2.0"
7-
revision 6
7+
revision 9
88

99
head "https://github.com/gazebosim/gz-common.git", branch: "gz-common5"
1010

11-
bottle do
12-
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13-
sha256 cellar: :any, sonoma: "3676210f32e47df90e980582198e3d29beecc8dc45fc1409bd6b01ec39de5eef"
14-
sha256 cellar: :any, ventura: "67b21d7e9c742f3a987990432260817d19527817862a20a802298c1528849677"
15-
end
16-
1711
depends_on "assimp"
1812
depends_on "cmake"
1913
depends_on "ffmpeg"

‎Formula/gz-common6.rb

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
class GzCommon6 < Formula
22
desc "Common libraries for robotics applications"
33
homepage "https://gazebosim.org"
4-
url "https://osrf-distributions.s3.amazonaws.com/gz-common/releases/gz-common-6.0.2.tar.bz2"
5-
sha256 "d87f805c5b79b06d610c50f4ed3123afcc6018d2e12759a18ca4131f7d4a6921"
4+
url "https://osrf-distributions.s3.amazonaws.com/gz-common/releases/gz-common-6.1.0.tar.bz2"
5+
sha256 "e79eacbce58f6d0bc5d34f58ed363c44cf89f61562b0a7d4ea1b586441e10b65"
66
license "Apache-2.0"
7-
revision 6
7+
revision 3
88

99
head "https://github.com/gazebosim/gz-common.git", branch: "gz-common6"
1010

11-
bottle do
12-
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13-
sha256 cellar: :any, sonoma: "af81e1a4c0bce2a42df34f17c8064d196d0f0db23bbfa3007a9d16ded957b60a"
14-
sha256 cellar: :any, ventura: "e240b53163c9e8257d07f34ca5b41fb82f064559249629cc7ccc19c0f0f5ba22"
15-
end
16-
1711
depends_on "assimp"
1812
depends_on "cmake"
1913
depends_on "ffmpeg"

‎Formula/gz-fuel-tools10.rb

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
class GzFuelTools10 < Formula
22
desc "Tools for using Fuel API to download robot models"
33
homepage "https://gazebosim.org"
4-
url "https://osrf-distributions.s3.amazonaws.com/gz-fuel-tools/releases/gz-fuel_tools-10.0.1.tar.bz2"
5-
sha256 "ca858f88bbfdebbe0a6b8ea94be3668e62862039397c6e08d41d646435d57fdc"
4+
url "https://osrf-distributions.s3.amazonaws.com/gz-fuel-tools/releases/gz-fuel_tools-10.1.0.tar.bz2"
5+
sha256 "37ae351be9a9b281d078e36068422dd096f59f46c72c4ef490800dfeb7653e1d"
66
license "Apache-2.0"
7-
revision 6
7+
revision 3
88

99
head "https://github.com/gazebosim/gz-fuel-tools.git", branch: "gz-fuel-tools10"
1010

11-
bottle do
12-
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13-
sha256 cellar: :any, sonoma: "961e3c2b83ddcc2b080154664a0db21bde8a67988bc9ca5a05be6ca100f99f22"
14-
sha256 cellar: :any, ventura: "eac76a67df7de6d0379bfc655bbe5788de7126f0564c9f2af6a285ffd4f3ffda"
15-
end
16-
1711
depends_on "abseil"
1812
depends_on "cmake"
1913
depends_on "gz-cmake4"

‎Formula/gz-fuel-tools9.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@ class GzFuelTools9 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-fuel-tools/releases/gz-fuel_tools-9.1.1.tar.bz2"
55
sha256 "3189166d4b0078c0b9d98de178e5496a1cc28b88fbd1124603376181b5a053f5"
66
license "Apache-2.0"
7-
revision 6
7+
revision 9
88

99
head "https://github.com/gazebosim/gz-fuel-tools.git", branch: "gz-fuel-tools9"
1010

11-
bottle do
12-
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13-
sha256 cellar: :any, sonoma: "231236e3638b8150a69d7a26b1957c153006f4b800e5ebd2c39d27323ce9a77c"
14-
sha256 cellar: :any, ventura: "9ad906444408e0d1545a03193e1bfbf1cb60577c02b3440cf8bddfa3391e3c5f"
15-
end
16-
1711
depends_on "abseil"
1812
depends_on "cmake"
1913
depends_on "gz-cmake3"

‎Formula/gz-gui8.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@ class GzGui8 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-gui/releases/gz-gui-8.4.0.tar.bz2"
55
sha256 "1731b01a134afb11b1b3e049fc65e74fa7b5c50532406d3d68366d54016d5498"
66
license "Apache-2.0"
7-
revision 6
7+
revision 9
88

99
head "https://github.com/gazebosim/gz-gui.git", branch: "gz-gui8"
1010

11-
bottle do
12-
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13-
sha256 sonoma: "3913d79d7952babb01f1ff7f521fed59983060fce64f64d8fa571ec2c4454de2"
14-
sha256 ventura: "fb9d5cbc510c9a2c6c20c0944ec74eecb31cecb34794a99b13df052d0e82c6ac"
15-
end
16-
1711
depends_on "cmake" => [:build, :test]
1812
depends_on "pkgconf" => [:build, :test]
1913
depends_on "abseil"

‎Formula/gz-gui9.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@ class GzGui9 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-gui/releases/gz-gui-9.0.1.tar.bz2"
55
sha256 "873d9950b1aa577b5b7f864caa4c3f759e29d5b67b81c4d69ab7d37043c4f96d"
66
license "Apache-2.0"
7-
revision 6
7+
revision 9
88

99
head "https://github.com/gazebosim/gz-gui.git", branch: "gz-gui9"
1010

11-
bottle do
12-
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13-
sha256 sonoma: "f6d1b2cc3ce7d7021952908761ce12d7b272c3e94f12da8a1324e082c3e79c96"
14-
sha256 ventura: "0432555d6717b402f76593fbb0aad91305cb5a50fb8df5204b986e1fb77afbed"
15-
end
16-
1711
depends_on "cmake" => [:build, :test]
1812
depends_on "pkgconf" => [:build, :test]
1913
depends_on "abseil"

‎Formula/gz-launch7.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@ class GzLaunch7 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-launch/releases/gz-launch-7.1.1.tar.bz2"
55
sha256 "e29f8b4663474cfed1364c45afa3aee8b44d816ffe1679c26c699f7c805cdffd"
66
license "Apache-2.0"
7-
revision 6
7+
revision 9
88

99
head "https://github.com/gazebosim/gz-launch.git", branch: "gz-launch7"
1010

11-
bottle do
12-
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13-
sha256 sonoma: "7b8c2586d7d6a1c63f05d357ace78cc13f3c17a8286cecbad19d5f1e3b0843c0"
14-
sha256 ventura: "259a1cf285627a4aae1bc7f053b25de51c930a944410ab5cdab6343dc945fa14"
15-
end
16-
1711
depends_on "cmake" => :build
1812
depends_on "pkgconf" => :build
1913

‎Formula/gz-launch8.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@ class GzLaunch8 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-launch/releases/gz-launch-8.0.1.tar.bz2"
55
sha256 "ce89cfe1554bf64ea63bbbcd7ce9624dd488a72a688cd620f97cabab776245a7"
66
license "Apache-2.0"
7-
revision 6
7+
revision 9
88

99
head "https://github.com/gazebosim/gz-launch.git", branch: "gz-launch8"
1010

11-
bottle do
12-
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13-
sha256 sonoma: "43d13b4a1c877625fee6712340149744547731e9dcb199ea37ef5050f38615a6"
14-
sha256 ventura: "afe44e69dfa2f61bb2c2b32122f887bd42b4f4c9f53c53bc46c7c664e378b8b1"
15-
end
16-
1711
depends_on "cmake" => :build
1812
depends_on "pkgconf" => :build
1913

0 commit comments

Comments
 (0)