svn commit: r339971 - head/multimedia/transcode/files

[Thomas Zander]

On 17 January 2014 08:49, Jason Helfman <jgh at freebsd.org> wrote:
> On Thu, Jan 16, 2014 at 12:03 PM, Thomas Zander <riggs at freebsd.org> wrote:
>>
>> Author: riggs
>> Date: Thu Jan 16 20:03:32 2014
>> New Revision: 339971
>> URL: http://svnweb.freebsd.org/changeset/ports/339971
>> QAT: https://qat.redports.org/buildarchive/r339971/
>>
>> Log:
>>   Fix build problem (subtitler looks for freetype headers in the wrong
>> dir)
>>
>>   PR:           ports/185248
>> http://www.FreeBSD.org/cgi/query-pr.cgi?pr=185248
>>
>>   Submitted by: Kevin Oberman <rkoberman at gmail.com>
>>   Approved by:  Naram Qashat <cyberbotx at cyberbotx.com> (maintainer),
>> thierry (mentor)
>>
>> Added:
>>   head/multimedia/transcode/files/patch-filter-subtitler-load_font.c
>> (contents, props changed)
>>
>> Added: head/multimedia/transcode/files/patch-filter-subtitler-load_font.c
>>
>> ==============================================================================
>> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
>> +++ head/multimedia/transcode/files/patch-filter-subtitler-load_font.c
>> Thu Jan 16 20:03:32 2014        (r339971)
>> @@ -0,0 +1,12 @@
>> +--- filter/subtitler/load_font.c.orig  2013-12-28 11:40:29.000000000
>> -0800
>> ++++ filter/subtitler/load_font.c       2013-12-28 10:44:23.000000000
>> -0800
>> +@@ -48,7 +48,7 @@
>> + #include <ft2build.h>
>> + #include FT_FREETYPE_H
>> +
>> +-#include <freetype/ftglyph.h>
>> ++#include <freetype2/ftglyph.h>
>> +
>> + /**
>> +  * @file bswap.h
>> +
>>
>
>
> Is this a merge candidate to 2014Q1?

Yes, it fixes the build for non-default OPTIONS.

Riggs