From 34e6a26f4d5ae06019d121b77c84ac84aa7069a1 Mon Sep 17 00:00:00 2001 From: Ricardo Constantino Date: Fri, 31 Mar 2017 16:43:20 +0100 Subject: [PATCH] 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 --- stream/stream.c | 2 +- wscript | 4 ++-- wscript_build.py | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stream/stream.c b/stream/stream.c index 94b9c44bc4..469e370fd3 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -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 diff --git a/wscript b/wscript index 1dedc567e1..472856eb09 100644 --- a/wscript +++ b/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', diff --git a/wscript_build.py b/wscript_build.py index 282ef5b4f1..e6f31ffc0d 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -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" ),