ffmpeg: use new optional deps

Keeps a few of the old option descriptions where they provided extra
information, but many of them were not really useful or accurate.

1 files changed, 40 insertions, 48 deletions

diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
index cb55e17f0..80630de66 100644
--- a/Library/Formula/ffmpeg.rb
+++ b/Library/Formula/ffmpeg.rb
@@ -7,26 +7,18 @@ class Ffmpeg < Formula
 
   head 'git://git.videolan.org/ffmpeg.git'
 
-  option "without-x264", "Disable H264 encoder"
-  option "without-faac", "Disable AAC encoder"
+  option "without-x264", "Disable H.264 encoder"
   option "without-lame", "Disable MP3 encoder"
-  option "without-xvid", "Disable Xvid MPEG-4 video format"
+  option "without-xvid", "Disable Xvid MPEG-4 video encoder"
 
-  option "with-freetype", "Enable FreeType"
-  option "with-theora", "Enable Theora video format"
-  option "with-libvorbis", "Enable Vorbis audio format"
-  option "with-libvpx", "Enable VP8 video format"
   option "with-rtmpdump", "Enable RTMP protocol"
-  option "with-opencore-amr", "Enable AMR audio format"
   option "with-libvo-aacenc", "Enable VisualOn AAC encoder"
   option "with-libass", "Enable ASS/SSA subtitle format"
   option "with-openjpeg", 'Enable JPEG 2000 image format'
   option 'with-schroedinger', 'Enable Dirac video format'
-  option 'with-ffplay', 'Enable FFPlay media player'
+  option 'with-ffplay', 'Enable FFplay media player'
   option 'with-tools', 'Enable additional FFmpeg tools'
   option 'with-fdk-aac', 'Enable the Fraunhofer FDK AAC library'
-  option 'with-openssl', 'Enable OpenSSL encryption library'
-  option 'with-opus', 'Enable the Opus Codec library'
 
   depends_on 'pkg-config' => :build
 
@@ -34,25 +26,25 @@ class Ffmpeg < Formula
   depends_on 'texi2html' => :build if MacOS.version >= :mountain_lion
   depends_on 'yasm' => :build
 
-  depends_on 'x264' unless build.include? 'without-x264'
-  depends_on 'faac' unless build.include? 'without-faac'
-  depends_on 'lame' unless build.include? 'without-lame'
-  depends_on 'xvid' unless build.include? 'without-xvid'
-
-  depends_on :freetype if build.include? 'with-freetype'
-  depends_on 'theora' if build.include? 'with-theora'
-  depends_on 'libvorbis' if build.include? 'with-libvorbis'
-  depends_on 'libvpx' if build.include? 'with-libvpx'
-  depends_on 'rtmpdump' if build.include? 'with-rtmpdump'
-  depends_on 'opencore-amr' if build.include? 'with-opencore-amr'
-  depends_on 'libvo-aacenc' if build.include? 'with-libvo-aacenc'
-  depends_on 'libass' if build.include? 'with-libass'
-  depends_on 'openjpeg' if build.include? 'with-openjpeg'
+  depends_on 'x264' => :recommended
+  depends_on 'faac' => :recommended
+  depends_on 'lame' => :recommended
+  depends_on 'xvid' => :recommended
+
+  depends_on :freetype => :optional
+  depends_on 'theora' => :optional
+  depends_on 'libvorbis' => :optional
+  depends_on 'libvpx' => :optional
+  depends_on 'rtmpdump' => :optional
+  depends_on 'opencore-amr' => :optional
+  depends_on 'libvo-aacenc' => :optional
+  depends_on 'libass' => :optional
+  depends_on 'openjpeg' => :optional
   depends_on 'sdl' if build.include? 'with-ffplay'
-  depends_on 'speex' if build.include? 'with-speex'
-  depends_on 'schroedinger' if build.include? 'with-schroedinger'
-  depends_on 'fdk-aac' if build.include? 'with-fdk-aac'
-  depends_on 'opus' if build.include? 'with-opus'
+  depends_on 'speex' => :optional
+  depends_on 'schroedinger' => :optional
+  depends_on 'fdk-aac' => :optional
+  depends_on 'opus' => :optional
 
   def install
     args = ["--prefix=#{prefix}",
@@ -68,27 +60,27 @@ class Ffmpeg < Formula
             "--host-ldflags=#{ENV.ldflags}"
            ]
 
-    args << "--enable-libx264" unless build.include? 'without-x264'
-    args << "--enable-libfaac" unless build.include? 'without-faac'
-    args << "--enable-libmp3lame" unless build.include? 'without-lame'
-    args << "--enable-libxvid" unless build.include? 'without-xvid'
-
-    args << "--enable-libfreetype" if build.include? 'with-freetype'
-    args << "--enable-libtheora" if build.include? 'with-theora'
-    args << "--enable-libvorbis" if build.include? 'with-libvorbis'
-    args << "--enable-libvpx" if build.include? 'with-libvpx'
-    args << "--enable-librtmp" if build.include? 'with-rtmpdump'
-    args << "--enable-libopencore-amrnb" << "--enable-libopencore-amrwb" if build.include? 'with-opencore-amr'
-    args << "--enable-libvo-aacenc" if build.include? 'with-libvo-aacenc'
-    args << "--enable-libass" if build.include? 'with-libass'
+    args << "--enable-libx264" if build.with? 'x264'
+    args << "--enable-libfaac" if build.with? 'faac'
+    args << "--enable-libmp3lame" if build.with? 'lame'
+    args << "--enable-libxvid" if build.with? 'xvid'
+
+    args << "--enable-libfreetype" if build.with? 'freetype'
+    args << "--enable-libtheora" if build.with? 'theora'
+    args << "--enable-libvorbis" if build.with? 'libvorbis'
+    args << "--enable-libvpx" if build.with? 'libvpx'
+    args << "--enable-librtmp" if build.with? 'rtmpdump'
+    args << "--enable-libopencore-amrnb" << "--enable-libopencore-amrwb" if build.with? 'opencore-amr'
+    args << "--enable-libvo-aacenc" if build.with? 'libvo-aacenc'
+    args << "--enable-libass" if build.with? 'libass'
     args << "--enable-ffplay" if build.include? 'with-ffplay'
-    args << "--enable-libspeex" if build.include? 'with-speex'
-    args << '--enable-libschroedinger' if build.include? 'with-schroedinger'
-    args << "--enable-libfdk-aac" if build.include? 'with-fdk-aac'
-    args << "--enable-openssl" if build.include? 'with-openssl'
-    args << "--enable-libopus" if build.include? 'with-opus'
+    args << "--enable-libspeex" if build.with? 'speex'
+    args << '--enable-libschroedinger' if build.with? 'schroedinger'
+    args << "--enable-libfdk-aac" if build.with? 'fdk-aac'
+    args << "--enable-openssl" if build.with? 'openssl'
+    args << "--enable-libopus" if build.with? 'opus'
 
-    if build.include? 'with-openjpeg'
+    if build.with? 'openjpeg'
       args << '--enable-libopenjpeg'
       args << '--extra-cflags=' + %x[pkg-config --cflags libopenjpeg].chomp
     end