Attachment 314848 Details for Bug 213597 – patch to fix detection of and building with external libdvdnav

[patch] patch to fix detection of and building with external libdvdnav

xine-lib-1.1.12-dvdnav.patch (text/plain), 3.37 KB, created by Dominik 'Rathann' Mierzejewski on 2008-08-22 23:20:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dominik 'Rathann' Mierzejewski

Created: 2008-08-22 23:20:53 UTC

Size: 3.37 KB

patch

obsolete

>diff -up xine-lib-1.1.12/src/input/input_dvd.c.dvdnav xine-lib-1.1.12/src/input/input_dvd.c
>--- xine-lib-1.1.12/src/input/input_dvd.c.dvdnav	2008-03-28 15:24:50.000000000 +0100
>+++ xine-lib-1.1.12/src/input/input_dvd.c	2008-08-23 00:38:30.000000000 +0200
>@@ -77,7 +77,7 @@
> /* DVDNAV includes */
> #ifdef HAVE_DVDNAV
> #  include <dvdnav/dvdnav.h>
>-#  include <dvdnav/nav_read.h>
>+#  include <dvdread/nav_read.h>
> #else
> #  define DVDNAV_COMPILE
> #  include "dvdnav.h"
>diff -up xine-lib-1.1.12/src/dxr3/dxr3_decode_spu.c.dvdnav xine-lib-1.1.12/src/dxr3/dxr3_decode_spu.c
>--- xine-lib-1.1.12/src/dxr3/dxr3_decode_spu.c.dvdnav	2008-01-23 06:11:52.000000000 +0100
>+++ xine-lib-1.1.12/src/dxr3/dxr3_decode_spu.c	2008-08-23 00:37:05.000000000 +0200
>@@ -47,8 +47,8 @@
> #include "buffer.h"
> #include "xine-engine/bswap.h"
> #ifdef HAVE_DVDNAV
>-#  include <dvdnav/nav_types.h>
>-#  include <dvdnav/nav_read.h>
>+#  include <dvdread/nav_types.h>
>+#  include <dvdread/nav_read.h>
> #else
> #  include "nav_types.h"
> #  include "nav_read.h"
>diff -up xine-lib-1.1.12/src/libspudec/xine_spu_decoder.c.dvdnav xine-lib-1.1.12/src/libspudec/xine_spu_decoder.c
>--- xine-lib-1.1.12/src/libspudec/xine_spu_decoder.c.dvdnav	2008-01-23 06:11:53.000000000 +0100
>+++ xine-lib-1.1.12/src/libspudec/xine_spu_decoder.c	2008-08-23 01:03:15.000000000 +0200
>@@ -35,8 +35,8 @@
> #include "xineutils.h"
> #include "spu.h"
> #ifdef HAVE_DVDNAV
>-#  include <dvdnav/nav_read.h>
>-#  include <dvdnav/nav_types.h>
>+#  include <dvdread/nav_read.h>
>+#  include <dvdread/nav_types.h>
> #else
> #  include "nav_read.h"
> #  include "nav_types.h"
>diff -up xine-lib-1.1.12/src/libspudec/spu.h.dvdnav xine-lib-1.1.12/src/libspudec/spu.h
>--- xine-lib-1.1.12/src/libspudec/spu.h.dvdnav	2008-03-28 15:24:50.000000000 +0100
>+++ xine-lib-1.1.12/src/libspudec/spu.h	2008-08-23 00:41:33.000000000 +0200
>@@ -33,7 +33,7 @@
> #include "video_out.h"
> #include "video_overlay.h"
> #ifdef HAVE_DVDNAV
>-#  include <dvdnav/nav_types.h>
>+#  include <dvdread/nav_types.h>
> #else
> #  include "nav_types.h"
> #endif
>diff -up xine-lib-1.1.12/src/libspudec/spu.c.dvdnav xine-lib-1.1.12/src/libspudec/spu.c
>--- xine-lib-1.1.12/src/libspudec/spu.c.dvdnav	2008-01-23 06:11:53.000000000 +0100
>+++ xine-lib-1.1.12/src/libspudec/spu.c	2008-08-23 00:41:55.000000000 +0200
>@@ -53,8 +53,8 @@
> #include "buffer.h"
> #include "xine-engine/bswap.h"
> #ifdef HAVE_DVDNAV
>-#  include <dvdnav/nav_read.h>
>-#  include <dvdnav/nav_print.h>
>+#  include <dvdread/nav_read.h>
>+#  include <dvdread/nav_print.h>
> #else
> #  include "nav_read.h"
> #  include "nav_print.h"
>diff -up xine-lib-1.1.12/configure.dvdnav xine-lib-1.1.12/configure
>--- xine-lib-1.1.12/configure.dvdnav	2008-08-23 00:14:26.000000000 +0200
>+++ xine-lib-1.1.12/configure	2008-08-23 00:27:01.000000000 +0200
>@@ -41976,7 +41976,8 @@ cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-#include <dvdnav.h>
>+#include <inttypes.h>
>+#include <dvdnav/dvdnav.h>
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
>@@ -42061,7 +42062,8 @@ cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-#include <dvdnav.h>
>+#include <inttypes.h>
>+#include <dvdnav/dvdnav.h>
> #include <stdio.h>
> 
> int
>@@ -42135,7 +42137,8 @@ cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h.  */
> 
>-#include <dvdnav.h>
>+#include <inttypes.h>
>+#include <dvdnav/dvdnav.h>
> #include <stdio.h>
> 
> int

Actions: View | Diff

Attachments on bug 213597: 314848