diff options
| author | Nikoli <nikoli@gmx.us> | 2013-11-28 21:15:11 +0400 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-11-29 23:08:33 +0100 |
| commit | 18345400c022ad644ff5dafe1383110c47e7d533 (patch) | |
| tree | 7055f483ad6f9730d334f33d4205a30f22bad863 | |
| parent | 597b8a355002306486c5d4a19890bb403b5d3ded (diff) | |
| download | mpv-18345400c022ad644ff5dafe1383110c47e7d533.tar.bz2 mpv-18345400c022ad644ff5dafe1383110c47e7d533.tar.xz | |
build: add options for enabling and disabling any libquvi versions
Makes packaging a bit simpler.
| -rw-r--r-- | mpvcore/player/loadfile.c | 2 | ||||
| -rwxr-xr-x | old-configure | 14 | ||||
| -rw-r--r-- | wscript | 7 |
3 files changed, 13 insertions, 10 deletions
diff --git a/mpvcore/player/loadfile.c b/mpvcore/player/loadfile.c index 46574898e5..3f23b21234 100644 --- a/mpvcore/player/loadfile.c +++ b/mpvcore/player/loadfile.c @@ -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; diff --git a/old-configure b/old-configure index d5592be408..8decf53458 100755 --- a/old-configure +++ b/old-configure @@ -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,12 +1639,13 @@ if test "$_libquvi9" = auto ; then _libquvi9=yes fi fi -if test "$_libquvi9" = yes; then - def_libquvi9="#define HAVE_LIBQUVI9 1" +echores "$_libquvi9" + +if test "$_libquvi9" = yes || test "$_libquvi4" = yes; then + def_libquvi9="#define HAVE_LIBQUVI 1" else - def_libquvi9="#define HAVE_LIBQUVI9 0" + def_libquvi9="#define HAVE_LIBQUVI 0" fi -echores "$_libquvi9" ######### # VIDEO # @@ -183,13 +183,20 @@ 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', 'func': check_pkg_config('libass'), |