summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/input/libdvdnav/diff_against_cvs.patch379
1 files changed, 241 insertions, 138 deletions
diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch
index 21fe87e6e..2be857aae 100644
--- a/src/input/libdvdnav/diff_against_cvs.patch
+++ b/src/input/libdvdnav/diff_against_cvs.patch
@@ -1,146 +1,249 @@
---- src/input/libdvdnav/decoder.c Wed Apr 24 23:15:25 2002
-+++ src/input/libdvdnav/decoder.c Fri Aug 9 21:59:56 2002
-@@ -30,7 +30,7 @@
- #include <stdlib.h>
- #include <inttypes.h>
- #include <string.h> /* For memset */
--#include <dvdread/ifo_types.h> /* vm_cmd_t */
-+#include "ifo_types.h" /* vm_cmd_t */
- #include <assert.h>
- #include "dvdnav_internal.h"
-
---- src/input/libdvdnav/decoder.h Wed Sep 4 12:50:34 2002
-+++ src/input/libdvdnav/decoder.h Wed Sep 4 12:50:42 2002
-@@ -28,7 +28,7 @@
- #include <inttypes.h>
- #include <sys/time.h>
-
--#include <dvdread/ifo_types.h> /* vm_cmd_t */
-+#include "ifo_types.h" /* vm_cmd_t */
- #include "dvdnav_internal.h"
-
- /* link command types */
---- src/input/libdvdnav/dvdnav.c Wed Sep 4 12:50:34 2002
-+++ src/input/libdvdnav/dvdnav.c Wed Sep 4 12:50:42 2002
-@@ -33,7 +33,7 @@
- #include "dvdnav_internal.h"
- #include "read_cache.h"
-
--#include <dvdread/nav_read.h>
-+#include "nav_read.h"
+diff -u xine-lib/src/input/libdvdnav/decoder.c libdvdnav/src/decoder.c
+--- xine-lib/src/input/libdvdnav/decoder.c 2003-04-29 22:55:47.000000000 +0100
++++ libdvdnav/src/decoder.c 2003-04-29 20:31:36.000000000 +0100
+@@ -18,7 +18,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/decoder.h libdvdnav/src/decoder.h
+--- xine-lib/src/input/libdvdnav/decoder.h 2003-04-07 19:10:46.000000000 +0100
++++ libdvdnav/src/decoder.h 2003-04-27 02:26:18.000000000 +0100
+@@ -18,7 +18,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/dvd_types.h libdvdnav/src/dvd_types.h
+--- xine-lib/src/input/libdvdnav/dvd_types.h 2003-04-29 16:58:30.000000000 +0100
++++ libdvdnav/src/dvd_types.h 2003-04-21 14:18:06.000000000 +0100
+@@ -18,7 +18,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/dvdnav.c libdvdnav/src/dvdnav.c
+--- xine-lib/src/input/libdvdnav/dvdnav.c 2003-04-29 23:18:14.000000000 +0100
++++ libdvdnav/src/dvdnav.c 2003-04-29 15:22:22.000000000 +0100
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
- #include <stdlib.h>
- #include <stdio.h>
@@ -70,7 +70,7 @@
struct timeval time;
/* Create a new structure */
-- fprintf(MSG_OUT, "libdvdnav: Using dvdnav version %s from http://dvd.sf.net\n", VERSION);
-+ fprintf(MSG_OUT, "libdvdnav: Using dvdnav version %s from http://xine.sf.net\n", VERSION);
+- fprintf(MSG_OUT, "libdvdnav: Using dvdnav version %s from http://xine.sf.net\n", VERSION);
++ fprintf(MSG_OUT, "libdvdnav: Using dvdnav version %s from http://dvd.sf.net\n", VERSION);
(*dest) = NULL;
this = (dvdnav_t*)malloc(sizeof(dvdnav_t));
---- src/input/libdvdnav/dvdnav.h Thu Jul 25 17:26:00 2002
-+++ src/input/libdvdnav/dvdnav.h Fri Aug 9 22:01:19 2002
-@@ -34,8 +34,13 @@
- #endif
-
- #ifdef HAVE_DVDNAV
-+#ifndef _MSC_VER
- # include <dvdnav/dvdnav_events.h>
- # include <dvdnav/dvd_types.h>
-+#else
-+# include "dvdnav_events.h"
-+# include "dvd_types.h"
-+#endif /* _MSC_VER */
- #else
- # include "dvdnav_events.h"
- # include "dvd_types.h"
- #endif
-
--#include <dvdread/dvd_reader.h>
--#include <dvdread/ifo_types.h> /* For vm_cmd_t */
-+#include "dvd_reader.h"
-+#include "ifo_types.h" /* For vm_cmd_t */
-
-
- /*********************************************************************
---- src/input/libdvdnav/dvdnav_events.h Fri Jul 5 16:55:04 2002
-+++ src/input/libdvdnav/dvdnav_events.h Fri Aug 9 22:01:50 2002
-@@ -28,9 +28,9 @@
- #ifndef DVDNAV_EVENTS_H_INCLUDED
- #define DVDNAV_EVENTS_H_INCLUDED
-
--#include <dvdread/ifo_types.h>
--#include <dvdread/dvd_reader.h>
--#include <dvdread/nav_types.h>
-+#include "ifo_types.h"
-+#include "dvd_reader.h"
-+#include "nav_types.h"
-
-
- /*
---- src/input/libdvdnav/dvdnav_internal.h Fri Aug 2 15:01:39 2002
-+++ src/input/libdvdnav/dvdnav_internal.h Fri Aug 9 22:02:18 2002
-@@ -1,3 +1,4 @@
-+/* !! DO NO EDIT THIS FILE, it is automatically generated */
- /*
- * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net>
- *
-@@ -37,9 +38,9 @@
-
- #undef WORDS_BIGENDIAN
-
--#include <dvdread/dvd_reader.h>
--#include <dvdread/ifo_read.h>
--#include <dvdread/ifo_types.h>
-+#include "dvd_reader.h"
-+#include "ifo_read.h"
-+#include "ifo_types.h"
-
- /* Uncomment for VM command tracing */
- /* #define TRACE */
---- src/input/libdvdnav/highlight.c Wed Sep 4 12:50:34 2002
-+++ src/input/libdvdnav/highlight.c Wed Sep 4 12:55:44 2002
-@@ -26,7 +26,7 @@
- #endif
-
- #include <assert.h>
--#include <dvdread/nav_types.h>
-+#include "nav_types.h"
- #include "dvdnav_internal.h"
-
- /*
-@@ -35,7 +35,7 @@
-
- #ifdef BUTTON_TESTING
-
--#include <dvdread/nav_print.h>
-+#include "nav_print.h"
-
- static void print_time(dvd_time_t *dtime) {
- const char *rate;
---- src/input/libdvdnav/vm.c Sat Jul 6 18:12:09 2002
-+++ src/input/libdvdnav/vm.c Fri Aug 9 22:03:48 2002
-@@ -37,8 +37,8 @@
- #include <sys/stat.h>
- #include <fcntl.h>
-
--#include <dvdread/ifo_types.h>
--#include <dvdread/ifo_read.h>
-+#include "ifo_types.h"
-+#include "ifo_read.h"
-
- #include "dvdnav_internal.h"
-
---- src/input/libdvdnav/vmcmd.h Sat Jun 1 14:40:50 2002
-+++ src/input/libdvdnav/vmcmd.h Fri Aug 9 22:04:13 2002
-@@ -26,7 +26,7 @@
- #define VMCMD_H_INCLUDED
-
- #include <inttypes.h>
--#include <dvdread/ifo_types.h> /* Only for vm_cmd_t */
-+#include "ifo_types.h" /* Only for vm_cmd_t */
- #include "dvdnav_internal.h"
-
- #ifdef TRACE
+diff -u xine-lib/src/input/libdvdnav/dvdnav.h libdvdnav/src/dvdnav.h
+--- xine-lib/src/input/libdvdnav/dvdnav.h 2003-04-29 16:58:30.000000000 +0100
++++ libdvdnav/src/dvdnav.h 2003-04-27 02:26:18.000000000 +0100
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/dvdnav_events.h libdvdnav/src/dvdnav_events.h
+--- xine-lib/src/input/libdvdnav/dvdnav_events.h 2003-04-07 19:10:48.000000000 +0100
++++ libdvdnav/src/dvdnav_events.h 2003-04-27 02:26:18.000000000 +0100
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/dvdnav_internal.h libdvdnav/src/dvdnav_internal.h
+--- xine-lib/src/input/libdvdnav/dvdnav_internal.h 2003-04-29 16:58:30.000000000 +0100
++++ libdvdnav/src/dvdnav_internal.h 2003-04-29 23:00:56.000000000 +0100
+@@ -18,7 +18,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/dvdnav_internal.h.in libdvdnav/src/dvdnav_internal.h.in
+--- xine-lib/src/input/libdvdnav/dvdnav_internal.h.in 2003-04-29 16:58:30.000000000 +0100
++++ libdvdnav/src/dvdnav_internal.h.in 2003-04-28 19:23:54.000000000 +0100
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/highlight.c libdvdnav/src/highlight.c
+--- xine-lib/src/input/libdvdnav/highlight.c 2003-04-29 16:58:30.000000000 +0100
++++ libdvdnav/src/highlight.c 2003-04-27 02:26:18.000000000 +0100
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/navigation.c libdvdnav/src/navigation.c
+--- xine-lib/src/input/libdvdnav/navigation.c 2003-04-07 19:10:50.000000000 +0100
++++ libdvdnav/src/navigation.c 2003-04-06 13:45:12.000000000 +0100
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/read_cache.c libdvdnav/src/read_cache.c
+--- xine-lib/src/input/libdvdnav/read_cache.c 2003-04-29 22:55:52.000000000 +0100
++++ libdvdnav/src/read_cache.c 2003-04-28 17:29:22.000000000 +0100
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/read_cache.h libdvdnav/src/read_cache.h
+--- xine-lib/src/input/libdvdnav/read_cache.h 2002-08-08 18:49:21.000000000 +0100
++++ libdvdnav/src/read_cache.h 2002-07-12 16:46:44.000000000 +0100
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/remap.c libdvdnav/src/remap.c
+--- xine-lib/src/input/libdvdnav/remap.c 2003-04-29 16:58:30.000000000 +0100
++++ libdvdnav/src/remap.c 2003-04-28 17:29:22.000000000 +0100
+@@ -15,7 +15,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ */
+
+ #include <stdlib.h>
+diff -u xine-lib/src/input/libdvdnav/remap.h libdvdnav/src/remap.h
+--- xine-lib/src/input/libdvdnav/remap.h 2003-02-20 16:02:00.000000000 +0000
++++ libdvdnav/src/remap.h 2003-02-20 15:32:19.000000000 +0000
+@@ -15,7 +15,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ */
+
+ #ifndef __REMAP__H
+diff -u xine-lib/src/input/libdvdnav/searching.c libdvdnav/src/searching.c
+--- xine-lib/src/input/libdvdnav/searching.c 2003-04-29 22:55:53.000000000 +0100
++++ libdvdnav/src/searching.c 2003-04-29 15:48:53.000000000 +0100
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/settings.c libdvdnav/src/settings.c
+--- xine-lib/src/input/libdvdnav/settings.c 2003-03-29 13:19:09.000000000 +0000
++++ libdvdnav/src/settings.c 2003-03-27 15:12:21.000000000 +0000
+@@ -17,7 +17,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/vm.c libdvdnav/src/vm.c
+--- xine-lib/src/input/libdvdnav/vm.c 2003-04-29 22:55:53.000000000 +0100
++++ libdvdnav/src/vm.c 2003-04-29 16:25:20.000000000 +0100
+@@ -19,7 +19,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/vm.h libdvdnav/src/vm.h
+--- xine-lib/src/input/libdvdnav/vm.h 2003-04-29 22:55:54.000000000 +0100
++++ libdvdnav/src/vm.h 2003-04-29 15:49:15.000000000 +0100
+@@ -19,7 +19,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/vmcmd.c libdvdnav/src/vmcmd.c
+--- xine-lib/src/input/libdvdnav/vmcmd.c 2003-04-07 19:10:52.000000000 +0100
++++ libdvdnav/src/vmcmd.c 2003-04-05 17:45:45.000000000 +0100
+@@ -18,7 +18,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
+diff -u xine-lib/src/input/libdvdnav/vmcmd.h libdvdnav/src/vmcmd.h
+--- xine-lib/src/input/libdvdnav/vmcmd.h 2003-04-07 19:10:53.000000000 +0100
++++ libdvdnav/src/vmcmd.h 2003-04-27 02:26:18.000000000 +0100
+@@ -18,7 +18,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+- * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
++ * $Id: diff_against_cvs.patch,v 1.14 2003/04/29 22:22:34 jcdutton Exp $
+ *
+ */
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 19:01:22 +0000