sync our formula with the upstream

Author: iSerganov

Formula/ffmpeg.rb

@@ -1,102 +1,142 @@
 class Ffmpeg < Formula
   desc "Play, record, convert, and stream audio and video"
   homepage "https://ffmpeg.org/"
-  url "https://ffmpeg.org/releases/ffmpeg-8.1.tar.xz"
-  version "8.1-with-options" # to distinguish from homebrew-core's ffmpeg
-  sha256 "b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a"
+  url "https://ffmpeg.org/releases/ffmpeg-9.0.1.tar.xz"
+  sha256 "cf38e0e28c7e5605942c4a77755349b0145804a397af37eb1fb4c77cb237f635"
   license "GPL-2.0-or-later"
   head "https://github.com/FFmpeg/FFmpeg.git", branch: "master"
 
+  option "with-alt-name", "Use command names ff*-alt rather than ff*"
   option "with-chromaprint", "Enable the Chromaprint audio fingerprinting library"
   option "with-decklink", "Enable DeckLink support"
+  option "with-dvd", "Enable DVD-Video demuxer, powered by libdvdnav and libdvdread"
   option "with-fdk-aac", "Enable the Fraunhofer FDK AAC library"
+  option "with-libflite", "Enable text to speech synthesis support via Flite"
   option "with-game-music-emu", "Enable Game Music Emu (GME) support"
+  option "with-ggml", "Enable tensor library for machine learning"
   option "with-jack", "Enable Jack support"
+  option "with-jpeg-xl", "Enable JPEG XL image format"
   option "with-libaribb24", "Enable decoding ARIB/ISDB captions"
+  option "with-libaribcaption", "Enable ARIB STD-B24 based broadcast captions"
   option "with-libmodplug", "Enable module/tracker files as inputs via libmodplug"
   option "with-libopenmpt", "Enable module/tracker files as inputs via libopenmpt"
+  option "with-libplacebo", "Enable GPU-accelerated image/video processing primitives"
   option "with-librist", "Enable Reliable Internet Stream Transport (RIST) support"
   option "with-librsvg", "Enable SVG files as inputs via librsvg"
   option "with-libsoxr", "Enable the soxr resample library"
   option "with-libssh", "Enable SFTP protocol via libssh"
+  option "with-tensorflow", "Enable TensorFlow as a module backend for DNN-based filters"
   option "with-tesseract", "Enable the tesseract OCR engine"
   option "with-libvidstab", "Enable vid.stab support for video stabilization"
+  option "with-openal-soft", "Enable OpenAL (Open Audio Library) for macOS targets"
+  option "with-openapv", "Enable OpenAPV (Open Advanced Professional Video Codec)"
   option "with-opencore-amr", "Enable Opencore AMR NR/WB audio format"
   option "with-openh264", "Enable OpenH264 library"
   option "with-openjpeg", "Enable JPEG 2000 image format"
   option "with-openssl", "Enable SSL support"
+  option "with-openvino", "Enable OpenVINO as a module backend for DNN-based filters"
   option "with-rav1e", "Enable AV1 encoding via librav1e"
-  option "with-svt-av1", "Enable Scalable Video Technology for AV1"
   option "with-rtmpdump", "Enable RTMP dumping support"
   option "with-rubberband", "Enable rubberband library"
+  option "with-two-lame", "Enable TwoLAME, an optimized MPEG Audio Layer 2 (MP2) encoder"
   option "with-webp", "Enable using libwebp to encode WEBP images"
+  option "with-whisper-cpp", "Enable OpenAI's Whisper speech recognition model"
+  option "with-xvid", "Enable Xvid"
   option "with-zeromq", "Enable using libzeromq to receive cmds sent through a libzeromq client"
   option "with-zimg", "Enable z.lib zimg library"
   option "with-srt", "Enable SRT library"
   option "with-libvmaf", "Enable libvmaf scoring library"
   option "with-libxml2", "Enable libxml2 library"
   option "with-libzvbi", "Enable decoding of DVB teletext pages and DVB teletext subtitles"
 
-  depends_on "pkg-config" => :build
+  depends_on "pkgconf" => :build
 
   depends_on "aom"
   depends_on "dav1d"
   depends_on "fontconfig"
   depends_on "freetype"
-  depends_on "frei0r"
+  depends_on "frei0r" => :no_linkage
+  depends_on "harfbuzz"
   depends_on "lame"
   depends_on "libass"
   depends_on "libvorbis"
   depends_on "libvpx"
   depends_on "opus"
   depends_on "sdl2"
   depends_on "snappy"
+  depends_on "svt-av1"
   depends_on "theora"
   depends_on "x264"
   depends_on "x265"
   depends_on "xz"
 
   depends_on "aribb24" => :optional
+  depends_on "chromaprint" => :optional
   depends_on "fdk-aac" => :optional
   depends_on "game-music-emu" => :optional
+  depends_on "ggml" => :optional
   depends_on "jack" => :optional
+  depends_on "jpeg-xl" => :optional
+  depends_on "libaribcaption" => :optional
   depends_on "libbluray" => :optional
   depends_on "libbs2b" => :optional
   depends_on "libcaca" => :optional
   depends_on "libgsm" => :optional
   depends_on "libmodplug" => :optional
   depends_on "libopenmpt" => :optional
+  depends_on "libplacebo" => :optional
   depends_on "librist" => :optional
   depends_on "librsvg" => :optional
   depends_on "libsoxr" => :optional
   depends_on "libssh" => :optional
+  depends_on "libtensorflow" => :optional
   depends_on "libvidstab" => :optional
   depends_on "libvmaf" => :optional
-  depends_on "libxml2" => :optional
+  depends_on "openal-soft" => :optional
+  depends_on "openapv" => :optional
   depends_on "opencore-amr" => :optional
   depends_on "openh264" => :optional
   depends_on "openjpeg" => :optional
   depends_on "openssl@3" => :optional
+  depends_on "openvino" => :optional
   depends_on "rav1e" => :optional
   depends_on "rtmpdump" => :optional
   depends_on "rubberband" => :optional
   depends_on "speex" => :optional
   depends_on "srt" => :optional
-  depends_on "svt-av1" => :optional
   depends_on "tesseract" => :optional
   depends_on "two-lame" => :optional
   depends_on "webp" => :optional
+  depends_on "whisper-cpp" => :optional
   depends_on "xvid" => :optional
   depends_on "zeromq" => :optional
   depends_on "zimg" => :optional
 
+  # `--with-dvd` needs the DVD libraries — plus libdvdcss, a dependency of
+  # libdvdread — installed and discoverable via pkg-config at build time.
+  if build.with? "dvd"
+    depends_on "libdvdcss"
+    depends_on "libdvdnav"
+    depends_on "libdvdread"
+  end
+
   uses_from_macos "bzip2"
   uses_from_macos "zlib"
+  uses_from_macos "libxml2" => :optional
+
+  on_macos do
+    depends_on "libarchive"
+    depends_on "libogg"
+    depends_on "libsamplerate"
+  end
 
   on_linux do
     depends_on "alsa-lib"
+    depends_on "libdrm"
+    depends_on "libx11"
+    depends_on "libxcb"
+    depends_on "libxext"
     depends_on "libxv"
-    depends_on "gcc" => :optional
   end
 
   on_intel do
@@ -115,9 +155,11 @@ def install
       --enable-gpl
       --enable-libaom
       --enable-libdav1d
+      --enable-libharfbuzz
       --enable-libmp3lame
       --enable-libopus
       --enable-libsnappy
+      --enable-libsvtav1
       --enable-libtheora
       --enable-libvorbis
       --enable-libvpx
@@ -130,28 +172,33 @@ def install
       --enable-demuxer=dash
     ]
 
+    args << "--enable-neon" if Hardware::CPU.arm?
+
     if OS.mac?
+      args << "--enable-openal" if build.with? "openal-soft"
       args << "--enable-opencl"
       args << "--enable-audiotoolbox"
       args << "--enable-videotoolbox"
-      args << "--enable-neon" if Hardware::CPU.arm?
     end
 
     args << "--disable-htmlpages" # The same info is accessible through the man pages.
     args << "--enable-chromaprint" if build.with? "chromaprint"
+    args << "--enable-libaribcaption" if build.with? "libaribcaption"
     args << "--enable-libaribb24" if build.with? "libaribb24"
     args << "--enable-libbluray" if build.with? "libbluray"
     args << "--enable-libbs2b" if build.with? "libbs2b"
     args << "--enable-libcaca" if build.with? "libcaca"
     args << "--enable-libfdk-aac" if build.with? "fdk-aac"
+    args << "--enable-libflite" if build.with? "libflite"
     args << "--enable-libgme" if build.with? "game-music-emu"
     args << "--enable-libgsm" if build.with? "libgsm"
+    args << "--enable-libjxl" if build.with? "jpeg-xl"
     args << "--enable-libmodplug" if build.with? "libmodplug"
     args << "--enable-libopenh264" if build.with? "openh264"
     args << "--enable-libopenjpeg" if build.with? "openjpeg"
     args << "--enable-libopenmpt" if build.with? "libopenmpt"
+    args << "--enable-libplacebo" if build.with? "libplacebo"
     args << "--enable-librav1e" if build.with? "rav1e"
-    args << "--enable-libsvtav1" if build.with? "svt-av1"
     args << "--enable-librist" if build.with? "librist"
     args << "--enable-librsvg" if build.with? "librsvg"
     args << "--enable-librtmp" if build.with? "rtmpdump"
@@ -160,6 +207,7 @@ def install
     args << "--enable-libspeex" if build.with? "speex"
     args << "--enable-libsrt" if build.with? "srt"
     args << "--enable-libssh" if build.with? "libssh"
+    args << "--enable-libtensorflow" if build.with? "tensorflow"
     args << "--enable-libtesseract" if build.with? "tesseract"
     args << "--enable-libtwolame" if build.with? "two-lame"
     args << "--enable-libvidstab" if build.with? "libvidstab"
@@ -168,9 +216,10 @@ def install
     args << "--enable-libxml2" if build.with? "libxml2"
     args << "--enable-libxvid" if build.with? "xvid"
     args << "--enable-libzimg" if build.with? "zimg"
-    args << "--enable-libzvbi" if build.with? "libzvbi"
     args << "--enable-libzmq" if build.with? "zeromq"
     args << "--enable-openssl" if build.with? "openssl@3"
+    args << "--enable-libopenvino" if build.with? "openvino"
+    args << "--enable-liboapv" if build.with? "openapv"
 
     # These librares are GPL-incompatible, and require ffmpeg be built with
     # the "--enable-nonfree" flag, which produces unredistributable libraries
@@ -183,14 +232,24 @@ def install
       mv "VERSION", "VERSION.txt"
     end
 
+    if build.with? "dvd"
+      ENV.prepend_path "PKG_CONFIG_PATH", formula_opt_lib("libdvdnav")/"pkgconfig"
+      ENV.prepend_path "PKG_CONFIG_PATH", formula_opt_lib("libdvdread")/"pkgconfig"
+      ENV.prepend_path "PKG_CONFIG_PATH", formula_opt_lib("libdvdcss")/"pkgconfig"
+      args << "--enable-libdvdnav"
+      args << "--enable-libdvdread"
+    end
+
     if build.with? "jack"
-      ENV.prepend_path "PKG_CONFIG_PATH", Formula["jack"].opt_lib/"pkgconfig"
+      ENV.prepend_path "PKG_CONFIG_PATH", formula_opt_lib("jack")/"pkgconfig"
       args << "--enable-libjack"
       args << "--enable-indev=jack"
     end
 
+    args << "--enable-whisper" if build.with? "whisper-cpp"
+
     if build.with? "libzvbi"
-      ENV.prepend_path "PKG_CONFIG_PATH", Formula["zvbi"].opt_lib/"pkgconfig"
+      ENV.prepend_path "PKG_CONFIG_PATH", formula_opt_lib("zvbi")/"pkgconfig"
       args << "--enable-libzvbi"
     end
 
@@ -202,12 +261,19 @@ def install
     end
 
     system "./configure", *args
-    system "make", "install"
+    if build.with? "alt-name"
+      system "make"
+      bin.install "ffmpeg" => "ffmpeg-alt"
+      bin.install "ffprobe" => "ffprobe-alt"
+      bin.install "ffplay" => "ffplay-alt"
+    else
+      system "make", "install"
+    end
 
     # Build and install additional FFmpeg tools
     system "make", "alltools"
-    bin.install Dir["tools/*"].select { |f| File.executable? f }
-    mv bin/"python", pkgshare/"python", force: true
+    bin.install (buildpath/"tools").children.select { |f| f.file? && f.executable? }
+    pkgshare.install buildpath/"tools/python"
 
     if build.with? "tesseract"
       opoo <<~EOS
@@ -218,9 +284,28 @@ def install
   end
 
   test do
-    # Create an example mp4 file
+    # Create a 5 second test MP4
     mp4out = testpath/"video.mp4"
-    system bin/"ffmpeg", "-filter_complex", "testsrc=rate=1:duration=1", mp4out
-    assert_predicate mp4out, :exist?
+    if build.with? "alt-name"
+      system bin/"ffmpeg-alt", "-filter_complex", "testsrc=rate=1:duration=5", mp4out
+      assert_match(/Duration: 00:00:05\.00,.*Video: h264/m,
+                   shell_output("#{bin}/ffprobe-alt -hide_banner #{mp4out} 2>&1"))
+    else
+      system bin/"ffmpeg", "-filter_complex", "testsrc=rate=1:duration=5", mp4out
+      assert_match(/Duration: 00:00:05\.00,.*Video: h264/m,
+                   shell_output("#{bin}/ffprobe -hide_banner #{mp4out} 2>&1"))
+    end
+
+    # Re-encode it in HEVC/Matroska
+    mkvout = testpath/"video.mkv"
+    if build.with? "alt-name"
+      system bin/"ffmpeg-alt", "-i", mp4out, "-c:v", "hevc", mkvout
+      assert_match(/Duration: 00:00:05\.00,.*Video: hevc/m,
+                   shell_output("#{bin}/ffprobe-alt -hide_banner #{mkvout} 2>&1"))
+    else
+      system bin/"ffmpeg", "-i", mp4out, "-c:v", "hevc", mkvout
+      assert_match(/Duration: 00:00:05\.00,.*Video: hevc/m,
+                   shell_output("#{bin}/ffprobe -hide_banner #{mkvout} 2>&1"))
+    end
   end
-end
+end