Skip to content

Commit

Permalink
Merge branch 'master' into ignition-common3_3.17.0_1704499745
Browse files Browse the repository at this point in the history
  • Loading branch information
scpeters authored Jan 6, 2024
2 parents 9473129 + 961b26b commit c504ecd
Show file tree
Hide file tree
Showing 23 changed files with 77 additions and 19 deletions.
2 changes: 2 additions & 0 deletions Formula/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ class CmakeAT3214 < Formula

keg_only :versioned_formula

deprecate! date: "2023-01-25", because: "is past end-of-life date"

uses_from_macos "ncurses"

on_linux do
Expand Down
14 changes: 13 additions & 1 deletion Formula/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ class DartsimAT6100 < Formula
version "6.10.0~20211005~d2b6ee08a60d0dbf71b0f008cd8fed1f611f6e24"
sha256 "372af181024452418eec95f8a9cd723ceb1ada979208add66c9a4330b9c0fa32"
license "BSD-2-Clause"
revision 9
revision 10

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 ventura: "4ea3d00ac47c820f3f1c70bd7d1b0a012da5c3cc274461ed908d168c2729889f"
sha256 monterey: "ba9733a6eb299e9e9c940dbe73e97e97081debdf0e0fead45f1362aa353ee109"
end

keg_only "open robotics fork of dart HEAD + custom changes"

Expand All @@ -26,6 +32,12 @@ class DartsimAT6100 < Formula
depends_on "tinyxml2"
depends_on "urdfdom"

patch do
# Fix for compatibility with urdfdom 4.0.0
url "https://github.com/gazebo-forks/dart/commit/9a6297e1fcc6373ad8f86a41c7ceba30efa0e0c3.patch?full_index=1"
sha256 "30af5d493d53fdb5a92fe4eedd2e2cd62b904cd8bc36c7f5b88601e6dafdc31f"
end

patch do
# Fix for compatibility with ipopt 3.13
url "https://github.com/scpeters/dart/commit/d8500b7ee4d672ede22fbbbd72ef66c003aa2b6f.patch?full_index=1"
Expand Down
1 change: 1 addition & 0 deletions Formula/gazebo10.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class Gazebo10 < Formula

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

disable! date: "2024-01-24", because: "is past end-of-life date"
deprecate! date: "2021-01-24", because: "is past end-of-life date"

depends_on "cmake" => :build
Expand Down
1 change: 1 addition & 0 deletions Formula/gazebo7.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class Gazebo7 < Formula

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

disable! date: "2024-01-25", because: "is past end-of-life date"
deprecate! date: "2021-01-25", because: "is past end-of-life date"

depends_on "cmake" => [:build, :test]
Expand Down
2 changes: 2 additions & 0 deletions Formula/gazebo9.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ class Gazebo9 < Formula

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

deprecate! date: "2023-01-25", because: "is past end-of-life date"

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

Expand Down
8 changes: 7 additions & 1 deletion Formula/gz-physics7.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ class GzPhysics7 < Formula
url "https://osrf-distributions.s3.amazonaws.com/gz-physics/releases/gz-physics-7.0.0.tar.bz2"
sha256 "3bfd59d7d49e3ae9f0ef5737ba6b23919700ce93e15f20d1eff3281914e58f78"
license "Apache-2.0"
revision 1
revision 2

head "https://github.com/gazebosim/gz-physics.git", branch: "gz-physics7"

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 ventura: "12e71d517a4b926cfed888456461d04009c0cc66a0153cb1ffa7c59c0a06d15b"
sha256 monterey: "8fef7da5958d8a17dcdb92f3fc6df91e1a8ccb0c038291337b152bdbff11f7d0"
end

depends_on "cmake" => [:build, :test]

depends_on "bullet"
Expand Down
2 changes: 2 additions & 0 deletions Formula/haptix-comm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ class HaptixComm < Formula
license "Apache-2.0"
head "https://github.com/osrf/haptix-comm.git", branch: "master"

disable! date: "2024-01-24", because: "is past end-of-life date"

depends_on "cmake" => :build
depends_on "doxygen" => [:build, :optional]
depends_on "pkg-config" => :build
Expand Down
2 changes: 2 additions & 0 deletions Formula/ignition-cmake0.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ class IgnitionCmake0 < Formula
sha256 cellar: :any_skip_relocation, sierra: "051534970fe3657c173e89d566b134a7e0185cc13afdac722817949594757691"
end

deprecate! date: "2023-01-25", because: "is past end-of-life date"

depends_on "cmake"

def install
Expand Down
2 changes: 2 additions & 0 deletions Formula/ignition-common1.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ class IgnitionCommon1 < Formula
sha256 cellar: :any, catalina: "ffd94f0a4c2c7272f39a6f5e871cd72f67075c3cda408650496554ea0f99ea40"
end

deprecate! date: "2023-01-25", because: "is past end-of-life date"

depends_on "cmake"
depends_on "ffmpeg@4"
depends_on "freeimage"
Expand Down
2 changes: 2 additions & 0 deletions Formula/ignition-fuel-tools1.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ class IgnitionFuelTools1 < Formula
sha256 catalina: "8c56876ee6b0fd4f69a82e7c28e1c8b672ce228433128bf8630c4a2eb706fec9"
end

deprecate! date: "2023-01-25", because: "is past end-of-life date"

depends_on "cmake"
depends_on "ignition-cmake0"
depends_on "ignition-common1"
Expand Down
1 change: 1 addition & 0 deletions Formula/ignition-math2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class IgnitionMath2 < Formula
sha256 cellar: :any, yosemite: "401ecbcc6c53af2ba8161790115a0df3cefbe393cafa72358fd92441bccdb633"
end

disable! date: "2024-01-25", because: "is past end-of-life date"
deprecate! date: "2021-01-25", because: "is past end-of-life date"

depends_on "cmake" => :build
Expand Down
2 changes: 2 additions & 0 deletions Formula/ignition-math4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ class IgnitionMath4 < Formula
sha256 cellar: :any, el_capitan: "e7c3f313b025c4733bd79cb3a27f54846e910e11c34e12d78e1c054eb06bbd48"
end

deprecate! date: "2023-01-25", because: "is past end-of-life date"

depends_on "cmake" => :build
depends_on "doxygen" => :build
depends_on "ignition-cmake0"
Expand Down
9 changes: 4 additions & 5 deletions Formula/ignition-math6.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
class IgnitionMath6 < Formula
desc "Math API for robotic applications"
homepage "https://ignitionrobotics.org"
url "https://osrf-distributions.s3.amazonaws.com/ign-math/releases/ignition-math6-6.15.0.tar.bz2"
sha256 "f89ff9d592a73365fbfed49a96c66535953b66bd0178a29963b6de7c6dc346db"
url "https://osrf-distributions.s3.amazonaws.com/ign-math/releases/ignition-math6-6.15.1.tar.bz2"
sha256 "a9e96a4e28d7d92d4d054cdae7cef28f1d8397b72433398bfc68855956531170"
license "Apache-2.0"

head "https://github.com/gazebosim/gz-math.git", branch: "ign-math6"

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 cellar: :any, ventura: "687fe7b6a211f04f8ceb5f08f5c440501186489ddc1d3798757946fa94a46120"
sha256 cellar: :any, monterey: "bdace1b47103f54ff409ed6042d2fff1dbaf805a437a1a663c60e1f788557a32"
sha256 cellar: :any, big_sur: "b7509a791ba0931f7e4be7794546c277d6328a3dfc4a9f7cbd4a901b8d802c4b"
sha256 cellar: :any, ventura: "f04b2a2952cbc588a80d3b809c851410f89cb39ad24134be92662d4751bf3f0a"
sha256 cellar: :any, monterey: "a34fdd037896e72df9f0c4c20dc2dc4d953ffad9977ab14b7f6b1667bad1493e"
end

depends_on "cmake" => :build
Expand Down
2 changes: 2 additions & 0 deletions Formula/ignition-msgs1.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ class IgnitionMsgs1 < Formula

head "https://github.com/gazebosim/gz-msgs.git", branch: "ign-msgs1"

deprecate! date: "2023-01-25", because: "is past end-of-life date"

depends_on "protobuf-c" => :build
depends_on "cmake"
depends_on "ignition-cmake0"
Expand Down
8 changes: 7 additions & 1 deletion Formula/ignition-physics2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ class IgnitionPhysics2 < Formula
url "https://osrf-distributions.s3.amazonaws.com/ign-physics/releases/ignition-physics2-2.6.1.tar.bz2"
sha256 "036c2b4effec9eefcdc94ac4ae0c6caec15d802db2e20665d76fcf69b7934643"
license "Apache-2.0"
revision 3
revision 4

head "https://github.com/gazebosim/gz-physics.git", branch: "gz-physics2"

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 cellar: :any, ventura: "8ba3a02300aae3763d8bcfb489ef1c34b7b13e07b7d4b8156f502ca94fd969aa"
sha256 cellar: :any, monterey: "51615f6f7bc658527aaa8df623f292856ddab3cde4920451fc0207706390c101"
end

deprecate! date: "2024-12-31", because: "is past end-of-life date"

depends_on "cmake" => :build
Expand Down
2 changes: 2 additions & 0 deletions Formula/ignition-rndf0.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ class IgnitionRndf0 < Formula

head "https://github.com/gazebosim/gz-rndf.git", branch: "master"

disable! date: "2024-01-24", because: "is past end-of-life date"

depends_on "cmake" => :build
depends_on "ignition-cmake0"
depends_on "ignition-math3"
Expand Down
2 changes: 2 additions & 0 deletions Formula/ignition-transport.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ class IgnitionTransport < Formula

head "https://github.com/gazebosim/gz-transport.git", branch: "ign-transport1"

disable! date: "2024-01-24", because: "is past end-of-life date"

depends_on "cmake" => :build
depends_on "doxygen" => [:build, :optional]
depends_on "protobuf-c" => :build
Expand Down
2 changes: 2 additions & 0 deletions Formula/ignition-transport4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ class IgnitionTransport4 < Formula

head "https://github.com/gazebosim/gz-transport.git", branch: "ign-transport4"

deprecate! date: "2023-01-25", because: "is past end-of-life date"

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

depends_on "cmake"
Expand Down
8 changes: 7 additions & 1 deletion Formula/sdformat14.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ class Sdformat14 < Formula
url "https://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-14.0.0.tar.bz2"
sha256 "88c0858a23ef4a4f36a9b3162e4b438878ae8670608af73d1797d67a3aaa4246"
license "Apache-2.0"
revision 1
revision 2

head "https://github.com/gazebosim/sdformat.git", branch: "main"

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 ventura: "e9210be6515fa2a59d8dc0d2e426699099c813889ee5f560180bd349efbf84c4"
sha256 monterey: "07e2abfcb12659ac4412a095312372301c02b3b5324a54dc61c75d8412f1c047"
end

depends_on "cmake" => [:build, :test]
depends_on "pkg-config" => [:build, :test]
depends_on "pybind11" => :build
Expand Down
2 changes: 2 additions & 0 deletions Formula/sdformat6.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ class Sdformat6 < Formula
sha256 catalina: "06b6bf07eca09d4fdfff48e006747adc6d9f7f50d075f551322ead27513c6e9b"
end

deprecate! date: "2023-01-25", because: "is past end-of-life date"

depends_on "cmake" => :build

depends_on "boost"
Expand Down
18 changes: 8 additions & 10 deletions Formula/sdformat9.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
class Sdformat9 < Formula
desc "Simulation Description Format"
homepage "http://sdformat.org"
url "https://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-9.10.0.tar.bz2"
sha256 "5660d4d1547f4e4039e3ad64830b29d2ebfc6aab2aa86ed86d8d8305ee4eb3c2"
url "https://osrf-distributions.s3.amazonaws.com/sdformat/releases/sdformat-9.10.1.tar.bz2"
sha256 "0b6af9955a94a22b077eb915f2b61b35f55963c12d0f1aecb5fbe5b51347a50d"
license "Apache-2.0"
revision 1

head "https://github.com/gazebosim/sdformat.git", branch: "sdf9"

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 ventura: "b18bfdf2040a3a5f443d69f5700ba9cdbede7665e2dac4b69b27dbcef5cda3e5"
sha256 monterey: "5539ec2b47bb260af07920e22c0fd506e9f9f8527b8609b200bddfcac14c4ceb"
end

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

Expand All @@ -18,13 +23,6 @@ class Sdformat9 < Formula
depends_on "tinyxml"
depends_on "urdfdom"

patch do
# Fix ruby syntax
# Remove with next release
url "https://github.com/gazebosim/sdformat/commit/6890d65de952b37a6d8935c0f6d823d26ff8aa86.patch?full_index=1"
sha256 "f0524bbc4d40de81024a9ac804fdb43683d974919dfe46cb583f920640a8da3a"
end

def install
cmake_args = std_cmake_args
cmake_args << "-DBUILD_TESTING=OFF"
Expand Down
2 changes: 2 additions & 0 deletions Formula/tbb@2020_u3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ class TbbAT2020U3 < Formula

keg_only :versioned_formula

deprecate! date: "2023-01-25", because: "is past end-of-life date"

depends_on "cmake" => :build
depends_on "swig" => :build
depends_on "[email protected]"
Expand Down
2 changes: 2 additions & 0 deletions Formula/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ class Tinyxml2AT620 < Formula

keg_only "temporary version until tinyxml2.pc is fixed"

disable! date: "2024-01-25", because: "is no longer needed"

depends_on "cmake" => :build

def install
Expand Down

0 comments on commit c504ecd

Please sign in to comment.