aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/ffmpeg.rb22
1 files changed, 22 insertions, 0 deletions
diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
index 0db8bbad8..ec40925e5 100644
--- a/Library/Formula/ffmpeg.rb
+++ b/Library/Formula/ffmpeg.rb
@@ -57,7 +57,14 @@ class Ffmpeg < Formula
depends_on 'libcaca' => :optional
depends_on 'libquvi' => :optional if build.devel?
+ # Fix build against freetype 2.5.1
+ # http://ffmpeg.org/pipermail/ffmpeg-devel/2013-November/151404.html
+ def patches; DATA; end
+
def install
+ # Remove when fix for freetype 2.5.1+ is incorporated upstream
+ inreplace 'configure', 'ft2build.h freetype/freetype.h', 'ft2build.h freetype.h'
+
args = ["--prefix=#{prefix}",
"--enable-shared",
"--enable-pthreads",
@@ -124,3 +131,18 @@ class Ffmpeg < Formula
end
end
+
+__END__
+diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
+index 2358e35..4c08092 100644
+--- a/libavfilter/vf_drawtext.c
++++ b/libavfilter/vf_drawtext.c
+@@ -48,7 +48,6 @@
+ #include "video.h"
+
+ #include <ft2build.h>
+-#include <freetype/config/ftheader.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #if CONFIG_FONTCONFIG
+