aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/mpd.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/Library/Formula/mpd.rb b/Library/Formula/mpd.rb
index bda0e6cf8..f09bfe0b4 100644
--- a/Library/Formula/mpd.rb
+++ b/Library/Formula/mpd.rb
@@ -25,10 +25,12 @@ class Mpd < Formula
option "with-lame", "Build with lame support (for MP3 encoding when streaming)"
option "with-two-lame", "Build with two-lame support (for MP2 encoding when streaming)"
option "with-flac", "Build with flac support (for Flac encoding when streaming)"
- option "with-vorbis", "Build with vorbis support (for Ogg encoding)"
+ option "with-libvorbis", "Build with vorbis support (for Ogg encoding)"
option "with-yajl", "Build with yajl support (for playing from soundcloud)"
option "with-opus", "Build with opus support (for Opus encoding and decoding)"
+ deprecated_option "with-vorbis" => "with-libvorbis"
+
depends_on "pkg-config" => :build
depends_on "boost" => :build
depends_on "glib"
@@ -55,8 +57,7 @@ class Mpd < Formula
depends_on "libzzip" => :optional # Reading from within ZIPs
depends_on "yajl" => :optional # JSON library for SoundCloud
depends_on "opus" => :optional # Opus support
-
- depends_on "libvorbis" if build.with? "vorbis" # Vorbis support
+ depends_on "libvorbis" => :optional
def install
# mpd specifies -std=gnu++0x, but clang appears to try to build
@@ -84,7 +85,7 @@ class Mpd < Formula
args << "--enable-lastfm" if build.with? "lastfm"
args << "--disable-lame-encoder" if build.without? "lame"
args << "--disable-soundcloud" if build.without? "yajl"
- args << "--enable-vorbis-encoder" if build.with? "vorbis"
+ args << "--enable-vorbis-encoder" if build.with? "libvorbis"
system "./configure", *args
system "make"