Updated to 7.0.

Author: skyzyx

Formula/ffmpeg-skyzyx.rb

@@ -1,8 +1,8 @@
 class FfmpegSkyzyx < Formula
   desc "Play, record, convert, and stream audio and video"
   homepage "https://ffmpeg.org/"
-  url "https://ffmpeg.org/releases/ffmpeg-6.1.tar.xz"
-  sha256 "488c76e57dd9b3bee901f71d5c95eaf1db4a5a31fe46a28654e837144207c270"
+  url "https://ffmpeg.org//releases/ffmpeg-7.0.tar.xz"
+  sha256 "4426a94dd2c814945456600c8adfc402bee65ec14a70e8c531ec9a2cd651da7b"
   head "https://github.com/FFmpeg/FFmpeg.git"
 
   depends_on "make" => :build
@@ -39,7 +39,6 @@ class FfmpegSkyzyx < Formula
   depends_on "libvo-aacenc"
   depends_on "libvorbis"
   depends_on "libvpx"
-  depends_on "libxml2"
   depends_on "opencore-amr"
   depends_on "openh264"
   depends_on "openjpeg"
@@ -65,10 +64,24 @@ class FfmpegSkyzyx < Formula
   depends_on "yasm"
   depends_on "zeromq"
   depends_on "zimg"
-  depends_on "zlib"
+
+  uses_from_macos "bzip2"
+  uses_from_macos "libxml2"
+  uses_from_macos "zlib"
+
+  on_intel do
+    depends_on "nasm" => :build
+  end
 
   conflicts_with "ffmpeg", because: "ffmpeg-skyzyx also ships a ffmpeg binary"
 
+  # Fix for QtWebEngine, do not remove
+  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270209
+  patch do
+    url "https://gitlab.archlinux.org/archlinux/packaging/packages/ffmpeg/-/raw/5670ccd86d3b816f49ebc18cab878125eca2f81f/add-av_stream_get_first_dts-for-chromium.patch"
+    sha256 "57e26caced5a1382cb639235f9555fc50e45e7bf8333f7c9ae3d49b3241d3f77"
+  end
+
   def install
     # Work around Xcode 11 clang bug
     # https://bitbucket.org/multicoreware/x265/issues/514/wrong-code-generated-on-macos-1015
@@ -105,6 +118,7 @@ def install
       --disable-libjack
       --disable-podpages
       --disable-txtpages
+      --enable-audiotoolbox
       --enable-decoder=aac
       --enable-decoder=ac3
       --enable-decoder=alac
@@ -172,10 +186,10 @@ def install
       --enable-encoder=h264_videotoolbox
       --enable-encoder=hevc_videotoolbox
       --enable-encoder=jpeg2000
-      --enable-encoder=libmp3lame
-      --enable-encoder=libtheora
       --enable-encoder=libaom_av1
+      --enable-encoder=libmp3lame
       --enable-encoder=libsvtav1
+      --enable-encoder=libtheora
       --enable-encoder=libvorbis
       --enable-encoder=libvpx_vp8
       --enable-encoder=libvpx_vp9
@@ -204,7 +218,6 @@ def install
       --enable-hwaccel=hevc_videotoolbox
       --enable-hwaccel=mpeg2_videotoolbox
       --enable-hwaccel=mpeg4_videotoolbox
-      --enable-libxml2
       --enable-libaom
       --enable-libass
       --enable-libbluray
@@ -235,6 +248,7 @@ def install
       --enable-libwebp
       --enable-libx264
       --enable-libx265
+      --enable-libxml2
       --enable-libxvid
       --enable-libzimg
       --enable-libzmq
@@ -267,16 +281,25 @@ def install
       --enable-muxer=webp
       --enable-muxer=webvtt
       --enable-nonfree
+      --enable-opencl
       --enable-pthreads
       --enable-shared
       --enable-small
       --enable-version3
       --enable-videotoolbox
       --extra-version=skyzyx
       --cc=#{ENV.cc}
-      --host-cflags="#{ENV.cflags.strip}"
+      --cxx=#{ENV.cxx}
+      --extra-cflags="-I#{HOMEBREW_PREFIX}/include"
+      --extra-ldflags="-L#{HOMEBREW_PREFIX}/include"
+      --host-cflags=#{ENV.cflags}
+      --host-ldflags=#{ENV.ldflags}
     ]
 
+    if OS.mac?
+      args << "--enable-neon" if Hardware::CPU.arm?
+    end
+
     system "./configure", *args
     system "make", "install"
 

README.md

@@ -22,7 +22,6 @@
 `mjpeg2jpeg`
 `mjpegadump`
 `mov2textsub`
-`mp3decomp`
 `mpeg2_metadata`
 `mpeg4_unpack_bframes`
 `noise`
@@ -33,6 +32,7 @@
 `prores_metadata`
 `remove_extra`
 `setts`
+`showinfo`
 `text2movsub`
 `trace_headers`
 `truehd_core`

docs/bsfs.txt

@@ -1,9 +1,10 @@
---prefix=/opt/homebrew/Cellar/ffmpeg-skyzyx/6.1
+--prefix=/opt/homebrew/Cellar/ffmpeg-skyzyx/7.0
 --disable-htmlpages
 --disable-indev=jack
 --disable-libjack
 --disable-podpages
 --disable-txtpages
+--enable-audiotoolbox
 --enable-decoder=aac
 --enable-decoder=ac3
 --enable-decoder=alac
@@ -71,10 +72,10 @@
 --enable-encoder=h264_videotoolbox
 --enable-encoder=hevc_videotoolbox
 --enable-encoder=jpeg2000
---enable-encoder=libmp3lame
---enable-encoder=libtheora
 --enable-encoder=libaom_av1
+--enable-encoder=libmp3lame
 --enable-encoder=libsvtav1
+--enable-encoder=libtheora
 --enable-encoder=libvorbis
 --enable-encoder=libvpx_vp8
 --enable-encoder=libvpx_vp9
@@ -103,7 +104,6 @@
 --enable-hwaccel=hevc_videotoolbox
 --enable-hwaccel=mpeg2_videotoolbox
 --enable-hwaccel=mpeg4_videotoolbox
---enable-libxml2
 --enable-libaom
 --enable-libass
 --enable-libbluray
@@ -134,6 +134,7 @@
 --enable-libwebp
 --enable-libx264
 --enable-libx265
+--enable-libxml2
 --enable-libxvid
 --enable-libzimg
 --enable-libzmq
@@ -166,11 +167,13 @@
 --enable-muxer=webp
 --enable-muxer=webvtt
 --enable-nonfree
+--enable-opencl
 --enable-pthreads
 --enable-shared
 --enable-small
 --enable-version3
 --enable-videotoolbox
 --extra-version=skyzyx
 --cc=clang
---host-cflags='
+--cxx=clang++
+--extra-cflags='

docs/buildconf.txt

@@ -94,7 +94,6 @@
 `avrp`
 `avs`
 `avui`
-`ayuv`
 `bethsoftvid`
 `bfi`
 `binkaudio_dct`
@@ -217,6 +216,7 @@
 `kgv1`
 `kmvc`
 `lagarith`
+`lead`
 `loco`
 `lscr`
 `m101`
@@ -334,6 +334,7 @@
 `qdm2`
 `qdmc`
 `qdraw`
+`qoa`
 `qoi`
 `qpeg`
 `qtrle`
@@ -443,6 +444,7 @@
 `vp9`
 `vplayer`
 `vqc`
+`vvc`
 `wady_dpcm`
 `wavarc`
 `wavesynth`

docs/codecs-decode.txt

@@ -31,7 +31,6 @@
 `av1`
 `avrp`
 `avui`
-`ayuv`
 `bitpacked`
 `bmp`
 `cfhd`
@@ -46,6 +45,7 @@
 `dvb_subtitle`
 `dvd_subtitle`
 `dvvideo`
+`dxv`
 `eac3`
 `exr`
 `ffv1`

docs/codecs-encode.txt

@@ -98,7 +98,6 @@
 `avrp`
 `avs`
 `avui`
-`ayuv`
 `bethsoftvid`
 `bfi`
 `binkaudio_dct`
@@ -231,6 +230,7 @@
 `kgv1`
 `kmvc`
 `lagarith`
+`lead`
 `libaom-av1`
 `libdav1d`
 `libfdk_aac`
@@ -374,6 +374,7 @@
 `qdmc_at`
 `qdmc`
 `qdraw`
+`qoa`
 `qoi`
 `qpeg`
 `qtrle`
@@ -481,6 +482,7 @@
 `vplayer`
 `vqavideo`
 `vqc`
+`vvc`
 `wady_dpcm`
 `wavarc`
 `wavesynth`

docs/decoders.txt

@@ -40,7 +40,7 @@
 `ast`
 `au`
 `av1`
-`avfoundation`
+`d`
 `avi`
 `avr`
 `avs`
@@ -132,6 +132,7 @@
 `hevc`
 `hls`
 `hnm`
+`iamf`
 `ico`
 `idcin`
 `idf`
@@ -159,7 +160,7 @@
 `kux`
 `kvag`
 `laf`
-`lavfi`
+`d`
 `libmodplug`
 `live_flv`
 `lmlm4`
@@ -237,6 +238,7 @@
 `pvf`
 `qcp`
 `qdraw_pipe`
+`qoa`
 `qoi_pipe`
 `r3d`
 `rawvideo`
@@ -342,7 +344,7 @@
 `wtv`
 `wv`
 `wve`
-`x11grab`
+`d`
 `xa`
 `xbin`
 `xbm_pipe`

docs/demuxers.txt

@@ -29,7 +29,6 @@
 `asv2`
 `avrp`
 `avui`
-`ayuv`
 `bitpacked`
 `bmp`
 `cfhd`
@@ -43,6 +42,7 @@
 `dvbsub`
 `dvdsub`
 `dvvideo`
+`dxv`
 `eac3`
 `exr`
 `ffv1`

docs/encoders.txt

@@ -1 +1,2 @@
+`opencl`
 `videotoolbox`

docs/hwaccels.txt

@@ -5,6 +5,7 @@
 `ac4`
 `adts`
 `adx`
+`aea`
 `aiff`
 `alaw`
 `alp`
@@ -21,7 +22,6 @@
 `ass`
 `ast`
 `au`
-`audiotoolbox`
 `avi`
 `avif`
 `avm2`
@@ -51,7 +51,6 @@
 `f64le`
 `ffmetadata`
 `fifo`
-`fifo_test`
 `film_cpk`
 `filmstrip`
 `fits`
@@ -74,6 +73,7 @@
 `hds`
 `hevc`
 `hls`
+`iamf`
 `ico`
 `ilbc`
 `image2`
@@ -117,6 +117,7 @@
 `opus`
 `psp`
 `rawvideo`
+`rcwt`
 `rm`
 `roq`
 `rso`
@@ -133,7 +134,6 @@
 `sap`
 `sbc`
 `scc`
-`sdl,sdl2`
 `segment`
 `smjpeg`
 `smoothstreaming`

docs/muxers.txt

@@ -35,6 +35,7 @@
 `cuda`
 `d3d11`
 `d3d11va_vld`
+`d3d12`
 `drm_prime`
 `dxva2_vld`
 `gbrap10be`
@@ -144,7 +145,6 @@
 `xv30le`
 `xv36be`
 `xv36le`
-`xvmc`
 `xyz12be`
 `xyz12le`
 `y210be`