From 393039dbf092579847f43821fb694ac5789c56fb Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Wed, 10 Mar 2010 21:14:14 +0000
Subject: Make buildable with current (external) libdvdnav & libdvdread.

---
 src/dxr3/dxr3_decode_spu.c       | 9 +++++++--
 src/input/input_dvd.c            | 8 +++++++-
 src/libspudec/spu.c              | 9 +++++++--
 src/libspudec/spu.h              | 6 +++++-
 src/libspudec/xine_spu_decoder.c | 9 +++++++--
 5 files changed, 33 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
index e3d4f969b..683666d21 100644
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.c
@@ -51,8 +51,13 @@
 #include "buffer.h"
 #include "xine-engine/bswap.h"
 #ifdef HAVE_DVDNAV
-#  include <dvdnav/nav_types.h>
-#  include <dvdnav/nav_read.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_types.h>
+#    include <dvdnav/nav_read.h>
+#  else
+#    include <dvdread/nav_types.h>
+#    include <dvdread/nav_read.h>
+#  endif
 #else
 #  include "nav_types.h"
 #  include "nav_read.h"
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 400f82aca..27e49e05a 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -79,7 +79,13 @@
 /* DVDNAV includes */
 #ifdef HAVE_DVDNAV
 #  include <dvdnav/dvdnav.h>
-#  include <dvdnav/nav_read.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_types.h>
+#    include <dvdnav/nav_read.h>
+#  else
+#    include <dvdread/nav_types.h>
+#    include <dvdread/nav_read.h>
+#  endif
 #else
 #  define DVDNAV_COMPILE
 #  include "dvdnav.h"
diff --git a/src/libspudec/spu.c b/src/libspudec/spu.c
index a9319f103..80d1eeaf5 100644
--- a/src/libspudec/spu.c
+++ b/src/libspudec/spu.c
@@ -57,8 +57,13 @@
 #include "buffer.h"
 #include "xine-engine/bswap.h"
 #ifdef HAVE_DVDNAV
-#  include <dvdnav/nav_read.h>
-#  include <dvdnav/nav_print.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_read.h>
+#    include <dvdnav/nav_print.h>
+#  else
+#    include <dvdread/nav_read.h>
+#    include <dvdread/nav_print.h>
+#  endif
 #else
 #  include "nav_read.h"
 #  include "nav_print.h"
diff --git a/src/libspudec/spu.h b/src/libspudec/spu.h
index 54efe1968..a1bc5b971 100644
--- a/src/libspudec/spu.h
+++ b/src/libspudec/spu.h
@@ -33,7 +33,11 @@
 #include "video_out.h"
 #include "video_overlay.h"
 #ifdef HAVE_DVDNAV
-#  include <dvdnav/nav_types.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_types.h>
+#  else
+#    include <dvdread/nav_types.h>
+#  endif
 #else
 #  include "nav_types.h"
 #endif
diff --git a/src/libspudec/xine_spu_decoder.c b/src/libspudec/xine_spu_decoder.c
index 1f40dbb27..3d23bba21 100644
--- a/src/libspudec/xine_spu_decoder.c
+++ b/src/libspudec/xine_spu_decoder.c
@@ -39,8 +39,13 @@
 #include "xineutils.h"
 #include "spu.h"
 #ifdef HAVE_DVDNAV
-#  include <dvdnav/nav_read.h>
-#  include <dvdnav/nav_types.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_types.h>
+#    include <dvdnav/nav_read.h>
+#  else
+#    include <dvdread/nav_types.h>
+#    include <dvdread/nav_read.h>
+#  endif
 #else
 #  include "nav_read.h"
 #  include "nav_types.h"
-- 
cgit v1.2.3