From e47986291eaafbb7220e099830f31a4fd327f4da Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Fri, 5 Jan 2024 20:54:16 -0800 Subject: [PATCH 1/3] Rebuild harmonic bottles for urdfdom 4.0.0 (#2510) * gz-physics7: revision bump rebuild bottle * sdformat14: revision bump rebuild bottle * update bottle. Co-authored-by: OSRF Build Bot --- Formula/gz-physics7.rb | 8 +++++++- Formula/sdformat14.rb | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Formula/gz-physics7.rb b/Formula/gz-physics7.rb index 2fa672d2c..df48b34db 100644 --- a/Formula/gz-physics7.rb +++ b/Formula/gz-physics7.rb @@ -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" diff --git a/Formula/sdformat14.rb b/Formula/sdformat14.rb index e700cb4b4..baecbed5e 100644 --- a/Formula/sdformat14.rb +++ b/Formula/sdformat14.rb @@ -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 From e4a0b9ea217d2256ab5196442d4f6538e6c65f1e Mon Sep 17 00:00:00 2001 From: osrfbuild Date: Fri, 5 Jan 2024 22:12:33 -0800 Subject: [PATCH 2/3] sdformat9 9.10.1 (#2508) * sdformat9: update 9.10.1, remove patch * dartsim@6.10.0: revision bump build bottle * dartsim@6.10.0: patch for urdfdom 4.0.0 * ignition-physics2: revision bump build bottle * update bottle. Signed-off-by: Steve Peters Co-authored-by: Steve Peters --- Formula/dartsim@6.10.0.rb | 14 +++++++++++++- Formula/ignition-physics2.rb | 8 +++++++- Formula/sdformat9.rb | 18 ++++++++---------- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/Formula/dartsim@6.10.0.rb b/Formula/dartsim@6.10.0.rb index 048065e88..3ab3b56eb 100644 --- a/Formula/dartsim@6.10.0.rb +++ b/Formula/dartsim@6.10.0.rb @@ -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" @@ -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" diff --git a/Formula/ignition-physics2.rb b/Formula/ignition-physics2.rb index 07bdc3521..5aecad601 100644 --- a/Formula/ignition-physics2.rb +++ b/Formula/ignition-physics2.rb @@ -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 diff --git a/Formula/sdformat9.rb b/Formula/sdformat9.rb index 4b391fb75..ffc9ab244 100644 --- a/Formula/sdformat9.rb +++ b/Formula/sdformat9.rb @@ -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] @@ -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" From fc5714d440ead7bd4dbdc9e3f221af890f0bd5bc Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Fri, 5 Jan 2024 22:29:25 -0800 Subject: [PATCH 3/3] Disable / deprecate old formulae (#2521) * Disable gazebo7, gazebo10, haptix-comm, ignition-math2, ignition-rndf0, ignition-transport, tinyxml2@6.2.0 * Deprecate ignition-cmake0, ignition-fuel-tools1, ignition-common1, ignition-math4, ignition-msgs1, ignition-transport4, sdformat6, gazebo9, cmake@3.21.4, and tbb@2020_u3. Signed-off-by: Steve Peters --- Formula/cmake@3.21.4.rb | 2 ++ Formula/gazebo10.rb | 1 + Formula/gazebo7.rb | 1 + Formula/gazebo9.rb | 2 ++ Formula/haptix-comm.rb | 2 ++ Formula/ignition-cmake0.rb | 2 ++ Formula/ignition-common1.rb | 2 ++ Formula/ignition-fuel-tools1.rb | 2 ++ Formula/ignition-math2.rb | 1 + Formula/ignition-math4.rb | 2 ++ Formula/ignition-msgs1.rb | 2 ++ Formula/ignition-rndf0.rb | 2 ++ Formula/ignition-transport.rb | 2 ++ Formula/ignition-transport4.rb | 2 ++ Formula/sdformat6.rb | 2 ++ Formula/tbb@2020_u3.rb | 2 ++ Formula/tinyxml2@6.2.0.rb | 2 ++ 17 files changed, 31 insertions(+) diff --git a/Formula/cmake@3.21.4.rb b/Formula/cmake@3.21.4.rb index 7ef60e04e..88233cb63 100644 --- a/Formula/cmake@3.21.4.rb +++ b/Formula/cmake@3.21.4.rb @@ -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 diff --git a/Formula/gazebo10.rb b/Formula/gazebo10.rb index 8ae67a1eb..08ba20c1f 100644 --- a/Formula/gazebo10.rb +++ b/Formula/gazebo10.rb @@ -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 diff --git a/Formula/gazebo7.rb b/Formula/gazebo7.rb index cdc398545..89be9b46a 100644 --- a/Formula/gazebo7.rb +++ b/Formula/gazebo7.rb @@ -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] diff --git a/Formula/gazebo9.rb b/Formula/gazebo9.rb index a318ede73..4658e91a2 100644 --- a/Formula/gazebo9.rb +++ b/Formula/gazebo9.rb @@ -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 diff --git a/Formula/haptix-comm.rb b/Formula/haptix-comm.rb index 53da2f092..32bedfe85 100644 --- a/Formula/haptix-comm.rb +++ b/Formula/haptix-comm.rb @@ -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 diff --git a/Formula/ignition-cmake0.rb b/Formula/ignition-cmake0.rb index e825cfe7a..15564cb08 100644 --- a/Formula/ignition-cmake0.rb +++ b/Formula/ignition-cmake0.rb @@ -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 diff --git a/Formula/ignition-common1.rb b/Formula/ignition-common1.rb index 17df3eb6f..53d93e942 100644 --- a/Formula/ignition-common1.rb +++ b/Formula/ignition-common1.rb @@ -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" diff --git a/Formula/ignition-fuel-tools1.rb b/Formula/ignition-fuel-tools1.rb index 1ffffa129..59a6e86ba 100644 --- a/Formula/ignition-fuel-tools1.rb +++ b/Formula/ignition-fuel-tools1.rb @@ -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" diff --git a/Formula/ignition-math2.rb b/Formula/ignition-math2.rb index 7482a9610..c224c73ed 100644 --- a/Formula/ignition-math2.rb +++ b/Formula/ignition-math2.rb @@ -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 diff --git a/Formula/ignition-math4.rb b/Formula/ignition-math4.rb index 262733467..53ff2d28c 100644 --- a/Formula/ignition-math4.rb +++ b/Formula/ignition-math4.rb @@ -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" diff --git a/Formula/ignition-msgs1.rb b/Formula/ignition-msgs1.rb index 0d6aa350a..39909e218 100644 --- a/Formula/ignition-msgs1.rb +++ b/Formula/ignition-msgs1.rb @@ -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" diff --git a/Formula/ignition-rndf0.rb b/Formula/ignition-rndf0.rb index daa36f702..24eec4022 100644 --- a/Formula/ignition-rndf0.rb +++ b/Formula/ignition-rndf0.rb @@ -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" diff --git a/Formula/ignition-transport.rb b/Formula/ignition-transport.rb index ef678c52d..9a02a08e0 100644 --- a/Formula/ignition-transport.rb +++ b/Formula/ignition-transport.rb @@ -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 diff --git a/Formula/ignition-transport4.rb b/Formula/ignition-transport4.rb index afae2233b..5ef038e8b 100644 --- a/Formula/ignition-transport4.rb +++ b/Formula/ignition-transport4.rb @@ -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" diff --git a/Formula/sdformat6.rb b/Formula/sdformat6.rb index b0b193e21..fe5d18a44 100644 --- a/Formula/sdformat6.rb +++ b/Formula/sdformat6.rb @@ -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" diff --git a/Formula/tbb@2020_u3.rb b/Formula/tbb@2020_u3.rb index 5fb2643da..88ccd209e 100644 --- a/Formula/tbb@2020_u3.rb +++ b/Formula/tbb@2020_u3.rb @@ -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 "python@3.9" diff --git a/Formula/tinyxml2@6.2.0.rb b/Formula/tinyxml2@6.2.0.rb index d2ae1461c..4783e7338 100644 --- a/Formula/tinyxml2@6.2.0.rb +++ b/Formula/tinyxml2@6.2.0.rb @@ -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