aboutsummaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/ffmpeg')
-rw-r--r--multimedia/ffmpeg/Makefile1
-rw-r--r--multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c10
2 files changed, 11 insertions, 0 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 3db54e49f56b..ec2fca99ab21 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -349,6 +349,7 @@ post-patch:
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -e 's|-ldl||' \
-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
+ -e 's|freetype/freetype.h|freetype.h|g' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
${WRKSRC}/doc/texi2pod.pl
diff --git a/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c b/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c
new file mode 100644
index 000000000000..7662dd9cc0d1
--- /dev/null
+++ b/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c
@@ -0,0 +1,10 @@
+--- libavfilter/vf_drawtext.c.orig 2013-11-20 03:28:56.000000000 +0100
++++ libavfilter/vf_drawtext.c 2013-12-06 18:26:57.000000000 +0100
+@@ -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