mplayer: cleanup formula.
Remove old options, especially remove --enable-freetype as it caused the bug where the window stayed black and disable osd options and x11 as enable-menu is not an option anymore for configure and enable-gui requires gtk+. clarify inclusion of cdparanoia disable configure option. Closes Homebrew/homebrew#46749. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
parent
dd43461b8b
commit
d4a15fd569
1 changed files with 4 additions and 18 deletions
|
@ -22,21 +22,8 @@ class Mplayer < Formula
|
|||
patch :DATA
|
||||
end
|
||||
|
||||
option "without-osd", "Build without OSD"
|
||||
|
||||
depends_on "yasm" => :build
|
||||
depends_on "libcaca" => :optional
|
||||
depends_on :x11 => :optional
|
||||
|
||||
deprecated_option "with-x" => "with-x11"
|
||||
|
||||
if build.with?("osd") || build.with?("x11")
|
||||
# These are required for the OSD. We can get them from X11, or we can
|
||||
# build our own.
|
||||
depends_on "fontconfig"
|
||||
depends_on "freetype"
|
||||
depends_on "libpng"
|
||||
end
|
||||
|
||||
fails_with :clang do
|
||||
build 211
|
||||
|
@ -51,18 +38,17 @@ class Mplayer < Formula
|
|||
ENV.O1 if ENV.compiler == :llvm
|
||||
|
||||
# we disable cdparanoia because homebrew's version is hacked to work on OS X
|
||||
# and mplayer doesn't expect the hacks we apply. So it chokes.
|
||||
# and mplayer doesn't expect the hacks we apply. So it chokes. Only relevant
|
||||
# if you have cdparanoia installed.
|
||||
# Specify our compiler to stop ffmpeg from defaulting to gcc.
|
||||
args = %W[
|
||||
--prefix=#{prefix}
|
||||
--cc=#{ENV.cc}
|
||||
--host-cc=#{ENV.cc}
|
||||
--disable-cdparanoia
|
||||
--prefix=#{prefix}
|
||||
--disable-x11
|
||||
]
|
||||
|
||||
args << "--enable-menu" if build.with? "osd"
|
||||
args << "--disable-x11" if build.without? "x11"
|
||||
args << "--enable-freetype" if build.with?("osd") || build.with?("x11")
|
||||
args << "--enable-caca" if build.with? "libcaca"
|
||||
|
||||
system "./configure", *args
|
||||
|
|
Loading…
Reference in a new issue