aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorDrew Hess2011-03-07 23:04:30 -0800
committerAdam Vandenberg2011-03-09 09:13:43 -0800
commit5283e5e3d0864c245b3ca65fde8af985a636e01d (patch)
tree36cb31e7fe27e9a91dc8cbaaa374d2a6566405a6 /Library
parent20a6876fc38cb351d250dba75686adb8d779f048 (diff)
downloadhomebrew-5283e5e3d0864c245b3ca65fde8af985a636e01d.tar.bz2
mplayer: don't prompt for ffmpeg git pull in configure
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/mplayer.rb21
1 files changed, 21 insertions, 0 deletions
diff --git a/Library/Formula/mplayer.rb b/Library/Formula/mplayer.rb
index 1526974c8..61dc74ea5 100644
--- a/Library/Formula/mplayer.rb
+++ b/Library/Formula/mplayer.rb
@@ -8,6 +8,12 @@ class Mplayer <Formula
depends_on 'pkg-config' => :build
depends_on 'yasm' => :optional
+ def patches
+ # configure prompts the user to pull ffmpeg from git.
+ # Don't do that.
+ DATA
+ end
+
def install
# Do not use pipes, per bug report
# https://github.com/mxcl/homebrew/issues#issue/622
@@ -28,3 +34,18 @@ class Mplayer <Formula
system "make install"
end
end
+
+__END__
+diff --git a/configure b/configure
+index ef60340..0b24e73 100755
+--- a/configure
++++ b/configure
+@@ -48,8 +48,6 @@ if test -e ffmpeg/mp_auto_pull ; then
+ fi
+
+ if ! test -e ffmpeg ; then
+- echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort"
+- read tmp
+ if ! git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg ; then
+ rm -rf ffmpeg
+ echo "Failed to get a FFmpeg checkout"