mirror of https://github.com/mpv-player/mpv
wscript: decouple dvdnav check from dvdread
Reallows enabling dvdnav without enabling dvdread which was broken
in 77cbb3543
when they were both disabled by default.
Since dvdnav requires dvdread, we can enable dvdread:// even if
--enable-dvdread isn't passed.
Fixes #4290
This commit is contained in:
parent
9b077a5cca
commit
34e6a26f4d
|
@ -93,7 +93,7 @@ static const stream_info_t *const stream_list[] = {
|
|||
#if HAVE_LIBSMBCLIENT
|
||||
&stream_info_smb,
|
||||
#endif
|
||||
#if HAVE_DVDREAD
|
||||
#if HAVE_DVDREAD || HAVE_DVDNAV
|
||||
&stream_info_ifo,
|
||||
&stream_info_dvd,
|
||||
#endif
|
||||
|
|
4
wscript
4
wscript
|
@ -338,8 +338,8 @@ iconv support use --disable-iconv.",
|
|||
}, {
|
||||
'name': '--dvdnav',
|
||||
'desc': 'dvdnav support',
|
||||
'deps': [ 'dvdread' ],
|
||||
'func': check_pkg_config('dvdnav', '>= 4.2.0'),
|
||||
'func': check_pkg_config('dvdnav', '>= 4.2.0',
|
||||
'dvdread', '>= 4.1.0'),
|
||||
'default': 'disable',
|
||||
}, {
|
||||
'name': '--cdda',
|
||||
|
|
|
@ -260,7 +260,9 @@ def build(ctx):
|
|||
( "stream/stream_cdda.c", "cdda" ),
|
||||
( "stream/stream_dvb.c", "dvbin" ),
|
||||
( "stream/stream_dvd.c", "dvdread" ),
|
||||
( "stream/stream_dvd.c", "dvdnav" ),
|
||||
( "stream/stream_dvd_common.c", "dvdread" ),
|
||||
( "stream/stream_dvd_common.c", "dvdnav" ),
|
||||
( "stream/stream_dvdnav.c", "dvdnav" ),
|
||||
( "stream/stream_edl.c" ),
|
||||
( "stream/stream_file.c" ),
|
||||
|
|
Loading…
Reference in New Issue