[MPlayer-cvslog] r28280 - in trunk: . Makefile configure libdvdread stream/stream_dvd.h stream/stream_dvd_common.c stream/stream_dvd_common.h

[reimar]

Author: reimar
Date: Thu Jan  8 20:28:28 2009
New Revision: 28280

Log:
Switch internal dvdread to libdvdread SVN external.

Deleted:
   trunk/libdvdread/
Modified:
   trunk/   (props changed)
   trunk/Makefile
   trunk/configure
   trunk/stream/stream_dvd.h
   trunk/stream/stream_dvd_common.c
   trunk/stream/stream_dvd_common.h

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Jan  7 17:39:56 2009	(r28279)
+++ trunk/Makefile	Thu Jan  8 20:28:28 2009	(r28280)
@@ -236,15 +236,15 @@ SRCS_COMMON-$(DVBIN)                 += 
 SRCS_COMMON-$(DVDNAV)                += stream/stream_dvdnav.c
 SRCS_COMMON-$(DVDREAD)               += stream/stream_dvd.c \
                                         stream/stream_dvd_common.c
-SRCS_COMMON-$(DVDREAD_INTERNAL)      += libdvdread/cmd_print.c \
-                                        libdvdread/dvd_input.c \
-                                        libdvdread/dvd_reader.c \
-                                        libdvdread/dvd_udf.c \
-                                        libdvdread/ifo_print.c \
-                                        libdvdread/ifo_read.c \
-                                        libdvdread/md5.c \
-                                        libdvdread/nav_print.c \
-                                        libdvdread/nav_read.c \
+SRCS_COMMON-$(DVDREAD_INTERNAL)      += libdvdread4/bitreader.c \
+                                        libdvdread4/dvd_input.c \
+                                        libdvdread4/dvd_reader.c \
+                                        libdvdread4/dvd_udf.c \
+                                        libdvdread4/ifo_print.c \
+                                        libdvdread4/ifo_read.c \
+                                        libdvdread4/md5.c \
+                                        libdvdread4/nav_print.c \
+                                        libdvdread4/nav_read.c \
 
 SRCS_COMMON-$(FAAD)                  += libmpcodecs/ad_faad.c
 SRCS_COMMON-$(FAAD_INTERNAL)         += libfaad2/bits.c \
@@ -733,7 +733,7 @@ DIRS =  . \
         libavformat \
         libavutil \
         libdvdcss \
-        libdvdread \
+        libdvdread4 \
         libfaad2 \
         libmenu \
         libmpcodecs \
@@ -839,7 +839,7 @@ mencoder.d mplayer.d vobsub.d gui/win32/
 $(DEPS): help_mp.h
 
 libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
-libdvdread/%.o libdvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
+libdvdread4/%.o libdvdread4/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
 libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
 
 loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)

Modified: trunk/configure
==============================================================================
--- trunk/configure	Wed Jan  7 17:39:56 2009	(r28279)
+++ trunk/configure	Thu Jan  8 20:28:28 2009	(r28280)
@@ -5525,6 +5525,7 @@ if test "$_dvdread_internal" = auto ; th
      || darwin || win32; then
     _dvdread_internal=yes
     _dvdread=yes
+    _inc_extra="$_inc_extra -Ilibdvdread4"
   fi
 elif test "$_dvdread" = auto ; then
   _dvdread=no
@@ -5550,7 +5551,6 @@ EOF
 fi
 
 if test "$_dvdread_internal" = yes; then
-  _def_dvdread_internal="#define CONFIG_DVDREAD_INTERNAL 1"
   _def_dvdread='#define CONFIG_DVDREAD 1'
   _inputmodules="dvdread(internal) $_inputmodules"
   _largefiles=yes
@@ -5562,7 +5562,6 @@ elif test "$_dvdread" = yes; then
   _inputmodules="dvdread(external) $_inputmodules"
   _res_comment="external"
 else
-  _def_dvdread_internal="#undef CONFIG_DVDREAD_INTERNAL"
   _def_dvdread='#undef CONFIG_DVDREAD'
   _noinputmodules="dvdread $_noinputmodules"
 fi
@@ -8335,7 +8334,6 @@ $_def_dvd_openbsd
 $_def_dvdio
 $_def_dvdnav
 $_def_dvdread
-$_def_dvdread_internal
 $_def_hpux_scsi_h
 $_def_libcdio
 $_def_sol_scsi_h

Modified: trunk/stream/stream_dvd.h
==============================================================================
--- trunk/stream/stream_dvd.h	Wed Jan  7 17:39:56 2009	(r28279)
+++ trunk/stream/stream_dvd.h	Thu Jan  8 20:28:28 2009	(r28280)
@@ -3,17 +3,10 @@
 
 #include "config.h"
 #include <stdint.h>
-#ifdef CONFIG_DVDREAD_INTERNAL
-#include "libdvdread/dvd_reader.h"
-#include "libdvdread/ifo_types.h"
-#include "libdvdread/ifo_read.h"
-#include "libdvdread/nav_read.h"
-#else
 #include <dvdread/dvd_reader.h>
 #include <dvdread/ifo_types.h>
 #include <dvdread/ifo_read.h>
 #include <dvdread/nav_read.h>
-#endif
 #include "stream.h"
 
 typedef struct {

Modified: trunk/stream/stream_dvd_common.c
==============================================================================
--- trunk/stream/stream_dvd_common.c	Wed Jan  7 17:39:56 2009	(r28279)
+++ trunk/stream/stream_dvd_common.c	Thu Jan  8 20:28:28 2009	(r28280)
@@ -1,10 +1,6 @@
 #include "config.h"
 #include <inttypes.h>
-#ifdef CONFIG_DVDREAD_INTERNAL
-#include "libdvdread/ifo_types.h"
-#else
 #include <dvdread/ifo_types.h>
-#endif
 #include "stream_dvd_common.h"
 
 /** 

Modified: trunk/stream/stream_dvd_common.h
==============================================================================
--- trunk/stream/stream_dvd_common.h	Wed Jan  7 17:39:56 2009	(r28279)
+++ trunk/stream/stream_dvd_common.h	Thu Jan  8 20:28:28 2009	(r28280)
@@ -3,11 +3,7 @@
 
 #include "config.h"
 #include <inttypes.h>
-#ifdef CONFIG_DVDREAD_INTERNAL
-#include "libdvdread/ifo_types.h"
-#else
 #include <dvdread/ifo_types.h>
-#endif
 
 int mp_dvdtimetomsec(dvd_time_t *dt);