From e55f069fe6b201e3255aedbd339c3c319b65f2e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Fri, 3 Apr 2009 17:55:31 +0100
Subject: [PATCH] resindvd: require libdvdnav >= 4.1.2 for
 dvdnav_get_current_time()

Fixes #577864.
---
 configure.ac               | 12 +++++-------
 ext/resindvd/resindvdsrc.h | 12 ------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2ad52f6e95..0d5e7e82ba 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 264c8e8b0f..61fa5d198b 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())