aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorAndrew Erickson2014-08-02 18:22:45 -0700
committerJack Nagel2014-08-02 21:04:16 -0500
commitfeea795bdba803e395e80a8910dc83158952b4f5 (patch)
tree20d6e92172bc7ee453ad772f8fb13111d8e49a14 /Library
parent7611b311e90678f407651bb54a51be8712e97171 (diff)
downloadhomebrew-feea795bdba803e395e80a8910dc83158952b4f5.tar.bz2
mplayer: update HEAD patch to work with latest code
Closes #31309. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/mplayer.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/Library/Formula/mplayer.rb b/Library/Formula/mplayer.rb
index 8b9f1d037..0495faf72 100644
--- a/Library/Formula/mplayer.rb
+++ b/Library/Formula/mplayer.rb
@@ -83,16 +83,14 @@ class Mplayer < Formula
end
__END__
-diff --git a/configure b/configure
-index a1fba5f..5deaa80 100755
--- a/configure
+++ b/configure
-@@ -49,8 +49,6 @@ if test -e ffmpeg/mp_auto_pull ; then
+@@ -1532,8 +1532,6 @@
fi
-
- if ! test -e ffmpeg ; then
+
+ if test "$ffmpeg_a" != "no" && ! 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://source.ffmpeg.org/ffmpeg.git ffmpeg ; then
+ if ! git clone -b $FFBRANCH --depth 1 git://source.ffmpeg.org/ffmpeg.git ffmpeg ; then
rm -rf ffmpeg
echo "Failed to get a FFmpeg checkout"