Mercurial > mplayer.hg

changeset 30124:248d9886d0b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation if FreeType is not available, in particular do not try to build libass and use the internal ass.h as a stub for structs needed for EOSD.
author reimar
date Fri, 01 Jan 2010 18:51:59 +0000
parents 0f5f75b4a015
children b932fc1042f1
files configure libass/ass_mp.h
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Fri Jan 01 13:23:16 2010 +0000
+++ b/configure	Fri Jan 01 18:51:59 2010 +0000
@@ -6154,6 +6154,7 @@
 # libass depends on FreeType
 if test "$_freetype" = no ; then
     _ass=no
+    ass_internal=no
     _res_comment="FreeType support needed"
 fi
 
@@ -6169,6 +6170,7 @@
     _ass=no
     cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes
     if test "$_ass" = no ; then
+        ass_internal=no
         _res_comment="FreeType >= 2.1.8 needed"
     elif test "$ass_internal" = no ; then
         _res_comment="external"
--- a/libass/ass_mp.h	Fri Jan 01 13:23:16 2010 +0000
+++ b/libass/ass_mp.h	Fri Jan 01 18:51:59 2010 +0000
@@ -24,7 +24,7 @@
 #define LIBASS_MP_H
 
 #include "subreader.h"
-#ifdef CONFIG_ASS_INTERNAL
+#if defined(CONFIG_ASS_INTERNAL) || !defined(CONFIG_ASS)
 #include "ass.h"
 #else
 #include <ass/ass.h>