Remove ffmpeg dependency and disable bottles (#1801)

* ignition-common1: revision bump for ffmpeg * ignition-common3: revision bump for ffmpeg * ignition-common4: revision bump for ffmpeg * gazebo9: revision bump for ffmpeg * gazebo11: revision bump for ffmpeg * Disable ffmpeg as dependency Signed-off-by: Steve Peters <[email protected]>
osrf · Feb 3, 2022 · 4d84594 · 4d84594
1 parent 5171abf
commit 4d84594
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 39 deletions.
diff --git a/Formula/gazebo11.rb b/Formula/gazebo11.rb
@@ -4,15 +4,10 @@ class Gazebo11 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.10.1.tar.bz2"
   sha256 "349cbd73965f6e71784283f9b9b69f2cd43162c613642fd388d3f648f9caccf2"
   license "Apache-2.0"
+  revision 1
 
   head "https://github.com/osrf/gazebo.git", branch: "gazebo11"
 
-  bottle do
-    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
-    sha256 big_sur:  "4e8eeb509cf439802eee0790a137efdf48dc6bf7b002538b469ecaa3dbb6ea32"
-    sha256 catalina: "9859f98069dd8bd34a5fa125ec9a626443ae123f35a7bf5579709c73b7bc1d92"
-  end
-
   depends_on "cmake" => :build
   depends_on "pkg-config" => :build
 
@@ -21,7 +16,6 @@ class Gazebo11 < Formula
   depends_on "[email protected]"
   depends_on "dartsim"
   depends_on "doxygen"
-  depends_on "ffmpeg"
   depends_on "freeimage"
   depends_on "graphviz"
   depends_on "gts"

diff --git a/Formula/gazebo9.rb b/Formula/gazebo9.rb
@@ -4,16 +4,10 @@ class Gazebo9 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-9.19.0.tar.bz2"
   sha256 "1f3ca430824b120ae0c7c4c0037a1a56e7b6bf6c50731b148b5c75bfc46d7fe7"
   license "Apache-2.0"
-  revision 10
+  revision 11
 
   head "https://github.com/osrf/gazebo.git", branch: "gazebo9"
 
-  bottle do
-    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
-    sha256 big_sur:  "11d7fac9d0f3a0dcec73901385cf8560eaec174c62767b083dc8799b242afb3d"
-    sha256 catalina: "3a00685078a8aa129fc69116f761da99808a97cfe3cbab6bf9eda4c8013f3700"
-  end
-
   depends_on "cmake" => :build
   depends_on "pkg-config" => :build
 
@@ -22,7 +16,6 @@ class Gazebo9 < Formula
   depends_on "[email protected]"
   depends_on "dartsim"
   depends_on "doxygen"
-  depends_on "ffmpeg"
   depends_on "freeimage"
   depends_on "graphviz"
   depends_on "gts"

diff --git a/Formula/ignition-common1.rb b/Formula/ignition-common1.rb
@@ -4,19 +4,11 @@ class IgnitionCommon1 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/ign-common/releases/ignition-common-1.1.1.tar.bz2"
   sha256 "2e8b65c9390bc78088865d95c0933c564b07b3b55b68c14e1c6d947ca8d9525a"
   license "Apache-2.0"
-  revision 4
+  revision 5
 
   head "https://github.com/ignitionrobotics/ign-common.git", branch: "ign-common1"
 
-  bottle do
-    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
-    sha256 cellar: :any, big_sur:  "49c473752f0a529286009fa1e98003baff02fc0adf410c9f5a99ba157f65a5e6"
-    sha256 cellar: :any, catalina: "dd9ee5aeb6a3954ab254f064f12a8e69b31ebe2866b2d66a9d15ccf2e0f4be29"
-    sha256 cellar: :any, mojave:   "2b26f65d10eec66e6a95bdc062893f1c75651a2bb3a8e511be4e10b13929e7f6"
-  end
-
   depends_on "cmake"
-  depends_on "ffmpeg"
   depends_on "freeimage"
   depends_on "gts"
   depends_on "ignition-math4"

diff --git a/Formula/ignition-common3.rb b/Formula/ignition-common3.rb
@@ -4,15 +4,9 @@ class IgnitionCommon3 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/ign-common/releases/ignition-common3-3.14.0.tar.bz2"
   sha256 "ab8f1cbb3bb62649cbe096bbccac43c240dad197f3d5df3360e9eac8f04a9cda"
   license "Apache-2.0"
-
-  bottle do
-    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
-    sha256 cellar: :any, big_sur:  "1c79056857c96b534187abef6680545047be5b004453d48ce6f72cd58b5a20c1"
-    sha256 cellar: :any, catalina: "d981b8d43b0b275f83f972378e29df11301d8f694856fd7d6209b960606c42e0"
-  end
+  revision 1
 
   depends_on "cmake"
-  depends_on "ffmpeg"
   depends_on "freeimage"
   depends_on "gts"
   depends_on "ignition-cmake2"

diff --git a/Formula/ignition-common4.rb b/Formula/ignition-common4.rb
@@ -4,15 +4,9 @@ class IgnitionCommon4 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/ign-common/releases/ignition-common4-4.5.0.tar.bz2"
   sha256 "d01471b1abdbf5617d1bc1c0842fa9323094170e500f409b435049ec13fb19a2"
   license "Apache-2.0"
-
-  bottle do
-    root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
-    sha256 cellar: :any, big_sur:  "bf37ea7497b9809862ab771a6b18e19d9093080cccb5bc1035b0bd4550f4ad76"
-    sha256 cellar: :any, catalina: "468f02075b0dec46ca3b69ec82d5e1c2557ecdd861dccbd2814bdd8b69b5dfd4"
-  end
+  revision 1
 
   depends_on "cmake"
-  depends_on "ffmpeg"
   depends_on "freeimage"
   depends_on "gts"
   depends_on "ignition-cmake2"

diff --git a/Formula/ignition-common5.rb b/Formula/ignition-common5.rb
@@ -6,7 +6,6 @@ class IgnitionCommon5 < Formula
   license "Apache-2.0"
 
   depends_on "cmake"
-  depends_on "ffmpeg"
   depends_on "freeimage"
   depends_on "gdal"
   depends_on "gts"