Merge pull request #153869 from chenrui333/bump-ffmpeg@5-5.1.4

ffmpeg@5 5.1.4
Homebrew · Nov 10, 2023 · bbf5051 · bbf5051
2 parents 9ce7140 + f83b449
commit bbf5051
Showing 1 changed file with 9 additions and 29 deletions.
diff --git a/Formula/f/ffmpeg@5.rb b/Formula/f/ffmpeg@5.rb
@@ -1,8 +1,8 @@
 class FfmpegAT5 < Formula
   desc "Play, record, convert, and stream audio and video"
   homepage "https://ffmpeg.org/"
-  url "https://ffmpeg.org/releases/ffmpeg-5.1.3.tar.xz"
-  sha256 "1b113593ff907293be7aed95acdda5e785dd73616d7d4ec90a0f6adbc5a0312e"
+  url "https://ffmpeg.org/releases/ffmpeg-5.1.4.tar.xz"
+  sha256 "54383bb890a1cd62580e9f1eaa8081203196ed53bde9e98fb6b0004423f49063"
   # None of these parts are used by default, you have to explicitly pass `--enable-gpl`
   # to configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
   license "GPL-2.0-or-later"
@@ -13,14 +13,13 @@ class FfmpegAT5 < Formula
   end
 
   bottle do
-    rebuild 1
-    sha256 arm64_sonoma:   "9c2f2fd629fc3253f6f63509f1f30ba18ed2901cff2b7151d3b8f45b6c8a3523"
-    sha256 arm64_ventura:  "d35bb65a3507dea5b31ab8f5cfd8986c033936677b4ed5866dafd448cc9baefd"
-    sha256 arm64_monterey: "e983392a535c5f0d8c0864095991eadfec9ee253108fea379e501b2890731c43"
-    sha256 sonoma:         "7ee58d604e6f8b689480cb57d40daf66c4af2bf71723641f8b29e6d8c4f0b984"
-    sha256 ventura:        "80542a31d0037553279f66b7bad42c0503d5d3513520227f4194c7e06297fe20"
-    sha256 monterey:       "dadd70293274942a49d1b6821d9ac12ea97ee61380443bc989723d07b28a255d"
-    sha256 x86_64_linux:   "fd60f1b7d5db9a6bd73a5ce698c53e51f716aaba6d4498b299949c1ede20cfd1"
+    sha256 arm64_sonoma:   "57e663e9b06001e33e5449bd108137fb041d1be328a5dc5a556cdbf47642c8e5"
+    sha256 arm64_ventura:  "582db04e3d64f784c092b1e2ed31349b800d5a2e318057622fbffb9141b67868"
+    sha256 arm64_monterey: "663bc7fb94b641cc97f7efe5fa41965f3998fb35c089f4943d20a538e2e0936d"
+    sha256 sonoma:         "62394f0513c42fbe43e007eabe23a099d69a93615119201c619f0edb5a38f6a4"
+    sha256 ventura:        "e9e6db0e65d1221318f73be87c758b5b5bc7d5e6ea474cef281ba2f89169ff6b"
+    sha256 monterey:       "b9ae2a5cfa48a2c35529b9035eab2a19bd93a862929b1fd1ba25fc74d515f97a"
+    sha256 x86_64_linux:   "3929834b2ff03980e9cadb7d055e73742d84d8d2422c112c8d1f3ebfc07128aa"
   end
 
   keg_only :versioned_formula
@@ -77,25 +76,6 @@ class FfmpegAT5 < Formula
 
   fails_with gcc: "5"
 
-  # Two upstream patches, fixing compilation with recent svt-av1 versions
-  # Remove in next version
-  patch do
-    url "https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/bea695d54372b66a6b9b136982fc92adb63e4745?hp=33ed503e590c252ac5e191503ff45e67dc34c214"
-    sha256 "76b1916d710e01b79e20342de7fb0aa5b32bfcdc903d16bd3c1eafa10a555d60"
-  end
-
-  patch do
-    url "https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/3344d47a88506aba060b5fd2a214cf7785b11483?hp=bea695d54372b66a6b9b136982fc92adb63e4745"
-    sha256 "1d46c3ba395710ba8ba440fa1e6a176dd063a74539d67365389cba6d015abaf3"
-  end
-
-  # Fix for binutils on Linux, remove on next release
-  # https://www.linuxquestions.org/questions/slackware-14/regression-on-current-with-ffmpeg-4175727691/
-  patch do
-    url "https://github.com/FFmpeg/FFmpeg/commit/effadce6c756247ea8bae32dc13bb3e6f464f0eb.patch?full_index=1"
-    sha256 "9800c708313da78d537b61cfb750762bb8ad006ca9335b1724dbbca5669f5b24"
-  end
-
   def install
     # The new linker leads to duplicate symbol issue https://github.com/homebrew-ffmpeg/homebrew-ffmpeg/issues/140
     ENV.append "LDFLAGS", "-Wl,-ld_classic" if DevelopmentTools.clang_build_version >= 1500