diff options
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | ext/resindvd/resindvdsrc.h | 12 |
2 files changed, 5 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 2ad52f6e..0d5e7e82 100644 --- a/configure.ac +++ b/configure.ac @@ -709,17 +709,15 @@ AG_GST_CHECK_FEATURE(DVDNAV, [dvdnav library], resindvd, [ DVDNAV_MAJOR=`echo $DVDNAV_VERSION | cut -d. -f1 | sed s/[a-zA-Z\-].*//g` DVDNAV_MINOR=`echo $DVDNAV_VERSION | cut -d. -f2 | sed s/[a-zA-Z\-].*//g` DVDNAV_MICRO=`echo $DVDNAV_VERSION | cut -d. -f3 | sed s/[a-zA-Z\-].*//g` - if [[ "$DVDNAV_MAJOR" -eq "0" ]] && \ + if [[ "$DVDNAV_MAJOR" -eq "4" ]] && \ [[ "$DVDNAV_MINOR" -lt "1" ]]; then - AC_MSG_WARN([libdvdnav >= 0.1.7 is required, you have $DVDNAV_VERSION]) + AC_MSG_WARN([libdvdnav >= 4.1.2 is required, you have $DVDNAV_VERSION]) HAVE_DVDNAV="no" - elif [[ "$DVDNAV_MAJOR" -eq "0" ]] && \ + elif [[ "$DVDNAV_MAJOR" -eq "4" ]] && \ [[ "$DVDNAV_MINOR" -eq "1" ]] && \ - [[ "$DVDNAV_MICRO" -lt "7" ]]; then - AC_MSG_WARN([libdvdnav >= 0.1.7 is required, you have $DVDNAV_VERSION]) + [[ "$DVDNAV_MICRO" -lt "2" ]]; then + AC_MSG_WARN([libdvdnav >= 4.1.2 is required, you have $DVDNAV_VERSION]) HAVE_DVDNAV="no" - elif [[ "$DVDNAV_MAJOR" -eq "0" ]]; then - AC_DEFINE(DVDNAV_OLD, 1, [Define if an old libdvdnav is used]) fi fi AS_SCRUB_INCLUDE(DVDNAV_CFLAGS) diff --git a/ext/resindvd/resindvdsrc.h b/ext/resindvd/resindvdsrc.h index 264c8e8b..61fa5d19 100644 --- a/ext/resindvd/resindvdsrc.h +++ b/ext/resindvd/resindvdsrc.h @@ -25,22 +25,10 @@ #include "_stdint.h" -#ifndef DVDNAV_OLD - #include <dvdnav/dvdnav.h> #include <dvdread/ifo_read.h> #include <dvdread/nav_read.h> -#else - -#include <dvdnav/dvd_reader.h> -#include <dvdnav/ifo_read.h> - -#include <dvdnav/dvdnav.h> -#include <dvdnav/nav_read.h> - -#endif - G_BEGIN_DECLS #define RESIN_TYPE_DVDSRC (rsn_dvdsrc_get_type()) |