2 ===================================================================
3 RCS file: /cvsroot/dvd/libdvdnav/configure.ac,v
4 retrieving revision 1.22
5 diff -u -r1.22 configure.ac
6 --- configure.ac 3 Jan 2005 20:24:21 -0000 1.22
7 +++ configure.ac 11 Feb 2005 11:08:09 -0000
11 dnl ---------------------------------------------
12 +dnl enable builtin libdvdread
13 +dnl ---------------------------------------------
14 +AC_ARG_ENABLE(builtin-dvdread,
15 +[ --disable-builtin-dvdread use external libdvdread (default builtin)])
17 +dnl ---------------------------------------------
19 dnl ---------------------------------------------
20 dnl Common cflags for all platforms
25 +if test "${enable_builtin_dvdread}" != "no"; then
26 + BUILTIN_DVDREAD=dvdread
27 + BUILTIN_DVDREAD_LIB='$(top_builddir)/src/dvdread/libdvdread.la'
28 + AC_SUBST(BUILTIN_DVDREAD)
29 + AC_SUBST(BUILTIN_DVDREAD_LIB)
30 + AC_OUTPUT([src/dvdread/Makefile])
33 dnl ---------------------------------------------
34 dnl Output configuration files
35 dnl ---------------------------------------------
43 Index: src/Makefile.am
44 ===================================================================
45 RCS file: /cvsroot/dvd/libdvdnav/src/Makefile.am,v
46 retrieving revision 1.28
47 diff -u -r1.28 Makefile.am
48 --- src/Makefile.am 3 Jan 2005 20:24:21 -0000 1.28
49 +++ src/Makefile.am 11 Feb 2005 11:08:09 -0000
51 include $(top_srcdir)/misc/Makefile.common
54 +SUBDIRS = $(BUILTIN_DVDREAD) vm
56 includedir = ${prefix}/include/dvdnav
59 dvdnav_internal.h read_cache.h remap.h
61 libdvdnav_la_LIBADD = $(THREAD_LIBS) \
62 - $(top_builddir)/src/dvdread/libdvdread.la \
63 + $(BUILTIN_DVDREAD_LIB) \
64 $(top_builddir)/src/vm/libdvdvm.la
66 libdvdnav_la_LDFLAGS = \
68 ===================================================================
69 RCS file: /cvsroot/dvd/libdvdnav/src/dvdnav.c,v
70 retrieving revision 1.65
71 diff -u -r1.65 dvdnav.c
72 --- src/dvdnav.c 15 Dec 2004 21:16:58 -0000 1.65
73 +++ src/dvdnav.c 11 Feb 2005 11:08:09 -0000
76 #include "dvdnav_internal.h"
77 #include "read_cache.h"
78 -#include "nav_read.h"
83 ===================================================================
84 RCS file: /cvsroot/dvd/libdvdnav/src/dvdnav.h,v
85 retrieving revision 1.31
86 diff -u -r1.31 dvdnav.h
87 --- src/dvdnav.h 9 Jun 2003 15:17:44 -0000 1.31
88 +++ src/dvdnav.h 11 Feb 2005 11:08:10 -0000
93 +#include <inttypes.h>
95 +#include <dvdread/dvd_reader.h>
96 +#include <dvdread/nav_types.h>
97 +#include <dvdread/nav_read.h>
98 +#include <dvdread/ifo_types.h> /* For vm_cmd_t */
100 #ifdef DVDNAV_COMPILE
101 # include "dvdnav_events.h"
102 # include "dvd_types.h"
103 -# include "dvd_reader.h"
104 -# include "ifo_types.h" /* For vm_cmd_t */
106 # include <dvdnav/dvdnav_events.h>
107 # include <dvdnav/dvd_types.h>
108 -# include <dvdnav/dvd_reader.h>
109 -# include <dvdnav/ifo_types.h> /* For vm_cmd_t */
113 Index: src/dvdnav_events.h
114 ===================================================================
115 RCS file: /cvsroot/dvd/libdvdnav/src/dvdnav_events.h,v
116 retrieving revision 1.12
117 diff -u -r1.12 dvdnav_events.h
118 --- src/dvdnav_events.h 27 Apr 2003 01:26:18 -0000 1.12
119 +++ src/dvdnav_events.h 11 Feb 2005 11:08:10 -0000
121 #ifndef DVDNAV_EVENTS_H_INCLUDED
122 #define DVDNAV_EVENTS_H_INCLUDED
124 -#include "ifo_types.h"
125 -#include "dvd_reader.h"
126 -#include "nav_types.h"
131 Index: src/highlight.c
132 ===================================================================
133 RCS file: /cvsroot/dvd/libdvdnav/src/highlight.c,v
134 retrieving revision 1.32
135 diff -u -r1.32 highlight.c
136 --- src/highlight.c 20 Jan 2004 01:22:24 -0000 1.32
137 +++ src/highlight.c 11 Feb 2005 11:08:10 -0000
142 -#include "nav_types.h"
143 #include "dvdnav_internal.h"
147 ===================================================================
148 RCS file: /cvsroot/dvd/libdvdnav/src/remap.c,v
149 retrieving revision 1.4
150 diff -u -r1.4 remap.c
151 --- src/remap.c 27 Aug 2003 13:54:19 -0000 1.4
152 +++ src/remap.c 11 Feb 2005 11:08:10 -0000
156 /* Build the map filename */
157 - home = getenv("HOME"); assert(home);
158 + home = getenv("HOME");
160 + fprintf(MSG_OUT, "libdvdnav: Unable to find map for title '%s'\n", title);
163 strncpy(fname, home, sizeof(fname));
164 strncat(fname, "/.dvdnav/", sizeof(fname));
165 strncat(fname, title, sizeof(fname));
166 Index: src/vm/decoder.c
167 ===================================================================
168 RCS file: /cvsroot/dvd/libdvdnav/src/vm/decoder.c,v
169 retrieving revision 1.2
170 diff -u -r1.2 decoder.c
171 --- src/vm/decoder.c 3 Mar 2004 16:50:42 -0000 1.2
172 +++ src/vm/decoder.c 11 Feb 2005 11:08:10 -0000
175 #include <inttypes.h>
176 #include <string.h> /* For memset */
177 -#include "ifo_types.h" /* vm_cmd_t */
179 #include "dvdnav_internal.h"
181 Index: src/vm/decoder.h
182 ===================================================================
183 RCS file: /cvsroot/dvd/libdvdnav/src/vm/decoder.h,v
184 retrieving revision 1.1
185 diff -u -r1.1 decoder.h
186 --- src/vm/decoder.h 11 Jan 2004 21:43:13 -0000 1.1
187 +++ src/vm/decoder.h 11 Feb 2005 11:08:10 -0000
189 #include <inttypes.h>
190 #include <sys/time.h>
192 -#include "ifo_types.h" /* vm_cmd_t */
193 +#include <dvdread/ifo_types.h> /* vm_cmd_t */
194 #include "dvdnav_internal.h"
196 /* link command types */
198 ===================================================================
199 RCS file: /cvsroot/dvd/libdvdnav/src/vm/vm.c,v
200 retrieving revision 1.11
202 --- src/vm/vm.c 16 Jan 2005 16:47:05 -0000 1.11
203 +++ src/vm/vm.c 11 Feb 2005 11:08:11 -0000
205 #include <sys/stat.h>
208 -#include "ifo_types.h"
209 -#include "ifo_read.h"
211 +#include <dvdread/ifo_types.h>
212 +#include <dvdread/ifo_read.h>
214 #include "dvdnav_internal.h"
217 #include <io.h> /* read() */
218 +#elif defined(WIN32)
219 +# define lseek _lseeki64
220 +# define off_t int64_t
221 #endif /* _MSC_VER */
224 diff -Naur Makefile.am Makefile.am
225 --- Makefile.am 2004-10-26 19:26:07.000000000 +0200
226 +++ Makefile.am 2005-09-02 15:05:20.000000000 +0200
229 AUTOMAKE_OPTIONS = 1.3
231 -SUBDIRS = src examples doc misc m4
232 +SUBDIRS = src misc m4
234 EXTRA_DIST = autogen.sh \
237 --- misc/dvdnav-config.in 2003-04-27 03:26:17.000000000 +0200
238 +++ misc/dvdnav-config.in 2005-09-21 20:27:06.000000000 +0200
242 if test "$echo_libs" = "yes"; then
243 - echo -L@libdir@ -ldvdnav @THREAD_LIBS@
244 + echo -L@libdir@ -ldvdnav @THREAD_LIBS@ -ldvdread -ldvdcss