aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisty De Meo2015-03-05 09:34:50 -0800
committerMisty De Meo2015-03-05 09:35:12 -0800
commit6032387b7e767a4675ccb803c2ebd400ab098dee (patch)
tree780848cc0b2210cf993f784b83bbb31a6a9b9251
parent889285ce0911bc9a49e5b31f6b080c5118d057fd (diff)
downloadhomebrew-6032387b7e767a4675ccb803c2ebd400ab098dee.tar.bz2
ffmpeg: fix -framework flags for 10.6, 10.7
Fixes #34963.
-rw-r--r--Library/Formula/ffmpeg.rb14
1 files changed, 12 insertions, 2 deletions
diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
index 47e504062..0e124c4ee 100644
--- a/Library/Formula/ffmpeg.rb
+++ b/Library/Formula/ffmpeg.rb
@@ -1,7 +1,17 @@
class Ffmpeg < Formula
homepage "https://ffmpeg.org/"
- url "https://www.ffmpeg.org/releases/ffmpeg-2.5.4.tar.bz2"
- sha1 "e7d0bab14e82876762531a883c6b48918631d48c"
+ stable do
+ url "https://www.ffmpeg.org/releases/ffmpeg-2.5.4.tar.bz2"
+ sha1 "e7d0bab14e82876762531a883c6b48918631d48c"
+
+ # Fixes -framework flags for 10.7 and lower;
+ # fixed upstream, can be removed in the next release.
+ # https://trac.ffmpeg.org/ticket/4238
+ patch do
+ url "http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=83808ee7e9e89b0c83d5ecd94b35952c44716b68"
+ sha1 "918586c158e1231a8d59a78e6f05cedc83824d68"
+ end
+ end
head "git://git.videolan.org/ffmpeg.git"