RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-17 21:27:08 +00:00
Code Issues Releases Wiki Activity

build: add options for enabling and disabling any libquvi versions

Browse Source 
Makes packaging a bit simpler.
This commit is contained in:
Nikoli 2013-11-28 21:15:11 +04:00 committed by Stefano Pigozzi
parent 597b8a3550
commit 18345400c0
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mpvcore/player/loadfile.c
View File

@ -858,7 +858,7 @@ static struct mp_resolve_result *resolve_url(const char *filename,
{
if (!mp_is_url(bstr0(filename)))
return NULL;
#if HAVE_LIBQUVI4 || HAVE_LIBQUVI9
#if HAVE_LIBQUVI
return mp_resolve_quvi(filename, opts);
#else
return NULL;

16
old-configure
View File

@ -1626,11 +1626,6 @@ if test "$_libquvi4" = auto ; then
_libquvi4=yes
fi
fi
if test "$_libquvi4" = yes; then
def_libquvi4="#define HAVE_LIBQUVI4 1"
else
def_libquvi4="#define HAVE_LIBQUVI4 0"
fi
echores "$_libquvi4"
echocheck "libquvi 0.9.x support"
@ -1644,13 +1639,14 @@ if test "$_libquvi9" = auto ; then
_libquvi9=yes
fi
fi
if test "$_libquvi9" = yes; then
def_libquvi9="#define HAVE_LIBQUVI9 1"
else
def_libquvi9="#define HAVE_LIBQUVI9 0"
fi
echores "$_libquvi9"
if test "$_libquvi9" = yes || test "$_libquvi4" = yes; then
def_libquvi9="#define HAVE_LIBQUVI 1"
else
def_libquvi9="#define HAVE_LIBQUVI 0"
fi
#########
# VIDEO #
#########

7
wscript
View File

@ -183,12 +183,19 @@ iconv support use --disable-iconv.",
}, {
'name': '--libquvi4',
'desc': 'libquvi 0.4.x support',
'groups': [ 'libquvi' ],
'func': check_pkg_config('libquvi', '>= 0.4.1'),
}, {
'name': '--libquvi9',
'desc': 'libquvi 0.9.x support',
'groups': [ 'libquvi' ],
'deps_neg': [ 'libquvi4' ],
'func': check_pkg_config('libquvi-0.9', '>= 0.9.0'),
}, {
'name': '--libquvi',
'desc': 'libquvi support',
'deps_any': [ 'libquvi4', 'libquvi9' ],
'func': check_true
}, {
'name': '--libass',
'desc': 'SSA/ASS support',