diff options
| author | kwm <kwm@FreeBSD.org> | 2013-12-25 05:22:21 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2013-12-25 05:22:21 +0800 |
| commit | 3602daba968a0e16ff8817cb961f23cd54730acc (patch) | |
| tree | 93506aaee5230ee46b75930c4b3a6b8e0f243d74 /multimedia/ffmpeg | |
| parent | b6e03796b2af561162757d9125b17f9d15197d64 (diff) | |
| download | freebsd-ports-gnome-3602daba968a0e16ff8817cb961f23cd54730acc.tar.gz freebsd-ports-gnome-3602daba968a0e16ff8817cb961f23cd54730acc.tar.zst freebsd-ports-gnome-3602daba968a0e16ff8817cb961f23cd54730acc.zip | |
Update freetype to 2.5.2.
Remove patch to add -I/usr/local/include in freetype-config --cflags. If
ports need extra headers they should look for them, and not get them via
a side-effect.
Freetype had a header resuffle in 2.5.1, patch ports to use the new header
style.
Thanks go to bdrewery for the two exp-runs and rakuco for helping me with
some troublesome cmake ports.
PR: ports/184587
Diffstat (limited to 'multimedia/ffmpeg')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c | 10 |
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 |