mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30166 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
92cd6dc3e9
commit
c1d166be18
2
configure
vendored
2
configure
vendored
@ -6154,6 +6154,7 @@ echocheck "SSA/ASS support"
|
||||
# libass depends on FreeType
|
||||
if test "$_freetype" = no ; then
|
||||
_ass=no
|
||||
ass_internal=no
|
||||
_res_comment="FreeType support needed"
|
||||
fi
|
||||
|
||||
@ -6169,6 +6170,7 @@ EOF
|
||||
_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"
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user