vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Feb 16 15:31:55 2019 +0100| [4b2c2a7bd033ee656dd8bbb389691cd06fc1f08f] | committer: Jean-Baptiste Kempf
Bump dvdnav version requirement to 6.0.0
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4b2c2a7bd033ee656dd8bbb389691cd06fc1f08f
---
configure.ac | 13 ++-----------
modules/access/dvdnav.c | 7 -------
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1f4ac52374..189ceab840 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1898,21 +1898,12 @@ AS_IF([test "$SYS" = "linux" -a "${enable_linsys}" != "no"], [
dnl
dnl dvdread module: check for libdvdread
dnl
-PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread > 4.9.0], [dvdread input module], [auto])
+PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread > 6.0.0], [dvdread input module], [auto])
dnl
dnl libdvdnav plugin
dnl
-PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav > 4.9.0], [DVD with navigation input module (dvdnav)], [auto])
-AS_IF([test "${enable_dvdnav}" != "no"], [
- AC_MSG_CHECKING(for dvdnav_stream_cb in dvdnav/dvdnav.h)
- AC_EGREP_HEADER(dvdnav_stream_cb,dvdnav/dvdnav.h,[
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_STREAM_CB_IN_DVDNAV_H, 1, For dvdnav demux support)
- ],[
- AC_MSG_RESULT(no)
- ])
-])
+PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav > 6.0.0], [DVD with navigation input module (dvdnav)], [auto])
dnl
dnl Blu-ray Disc Support with libbluray
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index fc6ad93000..9a38df3151 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -79,10 +79,7 @@
static int AccessDemuxOpen ( vlc_object_t * );
static void Close( vlc_object_t * );
-#if DVDREAD_VERSION >= 50300 && defined( HAVE_STREAM_CB_IN_DVDNAV_H )
-#define HAVE_DVDNAV_DEMUX
static int DemuxOpen ( vlc_object_t * );
-#endif
vlc_module_begin ()
set_shortname( N_("DVD with menus") )
@@ -96,7 +93,6 @@ vlc_module_begin ()
set_capability( "access", 305 )
add_shortcut( "dvd", "dvdnav", "file" )
set_callbacks( AccessDemuxOpen, Close )
-#ifdef HAVE_DVDNAV_DEMUX
add_submodule()
set_description( N_("DVDnav demuxer") )
set_category( CAT_INPUT )
@@ -104,7 +100,6 @@ vlc_module_begin ()
set_capability( "demux", 5 )
set_callbacks( DemuxOpen, Close )
add_shortcut( "dvd", "iso" )
-#endif
vlc_module_end ()
/* Shall we use libdvdnav's read ahead cache? */
@@ -391,7 +386,6 @@ bailout:
return i_ret;
}
-#ifdef HAVE_DVDNAV_DEMUX
/*****************************************************************************
* StreamProbeDVD: very weak probing that avoids going too often into a dvdnav_open()
*****************************************************************************/
@@ -484,7 +478,6 @@ static int DemuxOpen ( vlc_object_t *p_this )
dvdnav_close( p_dvdnav );
return i_ret;
}
-#endif
/*****************************************************************************
* Close: