[MPlayer-dev-eng] [Resend][PATCH] Compile with Freetype 2.1.6+

[Ivan Kalvachev]

commited


Pierre Lombard said:
> Hi
>
> * ismail dönmez <ismail.donmez at boun.edu.tr> [2003-11-14 19:43]:
>
>> Attached patch fixes mplayer compilation with freetype 2.1.6+. Using
>> freetype like :
>>
>> #include <freetype/freetype.h>
>>
>> is silently deprecated since Freetype 2.0.2 so my patch will not break
>> anything and according the Freetype developers ( Werner Lemberg to be
>> exact )
>> its the Right Way ( TM ) to  use Freetype2 .
>>
>> </quote>
>>
>> So this does *not* break anything at all. Can someone please
>> apply/comment on
>> it?
>
> A part is missing to fix configure. Without the attached patch
> freetype isn t detected here (debian unstable - freetype 2.1.7).
>
> I'll apply later if nobody shouts.
>
>> Index: libvo/font_load.h
>> ==================================================================> RCS
>> file: /cvsroot/mplayer/main/libvo/font_load.h,v
>> retrieving revision 1.12
>> diff -u -r1.12 font_load.h
>> --- libvo/font_load.h	29 Dec 2002 14:59:23 -0000	1.12
>> +++ libvo/font_load.h	9 Nov 2003 14:50:26 -0000
>> @@ -2,7 +2,8 @@
>>  #define __MPLAYER_FONT_LOAD_H
>>
>>  #ifdef HAVE_FREETYPE
>> -#include <freetype/freetype.h>
>> +#include <ft2build.h>
>> +#include FT_FREETYPE_H
>>  #endif
>>
>>  typedef struct {
>> Index: libvo/font_load_ft.c
>> ==================================================================> RCS
>> file: /cvsroot/mplayer/main/libvo/font_load_ft.c,v
>> retrieving revision 1.10
>> diff -u -r1.10 font_load_ft.c
>> --- libvo/font_load_ft.c	9 Jun 2003 12:15:47 -0000	1.10
>> +++ libvo/font_load_ft.c	9 Nov 2003 14:50:44 -0000
>> @@ -20,7 +20,8 @@
>>
>>  #include <iconv.h>
>>
>> -#include <freetype/freetype.h>
>> +#include <ft2build.h>
>> +#include FT_FREETYPE_H
>>  #include <freetype/ftglyph.h>
>>
>>  #include "../bswap.h"
>
> --
> Best regards,
>   Pierre Lombard
> _______________________________________________
> MPlayer-dev-eng mailing list
> MPlayer-dev-eng at mplayerhq.hu
> http://mplayerhq.hu/mailman/listinfo/mplayer-dev-eng
>