[MPlayer-cvslog] r20631 - in trunk: Copyright Makefile configure libdvdread libdvdread/Makefile libdvdread/libdvdread_changes.diff libmpdvdkit2 stream/stream_dvd.h

[diego]

Author: diego
Date: Fri Nov  3 14:48:52 2006
New Revision: 20631

Added:
   trunk/libdvdread/   (props changed)
      - copied from r20630, /trunk/libmpdvdkit2/
Removed:
   trunk/libmpdvdkit2/
Modified:
   trunk/Copyright
   trunk/Makefile
   trunk/configure
   trunk/libdvdread/Makefile
   trunk/libdvdread/libdvdread_changes.diff
   trunk/stream/stream_dvd.h

Log:
libmpdvdkit2 --> libdvdread, it just contains libdvdread now.


Modified: trunk/Copyright
==============================================================================
--- trunk/Copyright	(original)
+++ trunk/Copyright	Fri Nov  3 14:48:52 2006
@@ -58,7 +58,7 @@
 Name:       libdvdread
 Version:    0.9.4 + patches
 Homepage:   http://www.dtek.chalmers.se/groups/dvd/development.shtml
-Directory:  libmpdvdkit2
+Directory:  libdvdread
 Copyright:  1998, 1999 Eric Smith <eric at brouhaha.com>
             1999 Christian Wolff for convergence integrated media
             2000-2001 Billy Biggs <vektor at dumbterm.net>,

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Fri Nov  3 14:48:52 2006
@@ -115,7 +115,7 @@
 PARTS += libfame
 endif
 ifeq ($(DVDKIT2),yes)
-PARTS += libmpdvdkit2
+PARTS += libdvdread
 PARTS += libdvdcss
 endif
 ifeq ($(GUI),yes)
@@ -174,8 +174,8 @@
 COMMON_DEPS += libfame/libfame.a
 endif
 ifeq ($(DVDKIT2),yes)
-COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
-COMMON_LIBS += libmpdvdkit2/libmpdvdkit.a
+COMMON_DEPS += libdvdread/libdvdread.a
+COMMON_LIBS += libdvdread/libdvdread.a
 COMMON_DEPS += libdvdcss/libdvdcss.a
 COMMON_LIBS += libdvdcss/libdvdcss.a
 endif
@@ -207,8 +207,8 @@
 libaf/libaf.a:
 	$(MAKE) -C libaf
 
-libmpdvdkit2/libmpdvdkit.a:
-	$(MAKE) -C libmpdvdkit2
+libdvdread/libdvdread.a:
+	$(MAKE) -C libdvdread
 
 libdvdcss/libdvdcss.a:
 	$(MAKE) -C libdvdcss
@@ -481,7 +481,7 @@
 
 libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch])
 libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch])
-libmpdvdkit2/libmpdvdkit.a: .norecurse $(wildcard libmpdvdkit2/*.[ch])
+libdvdread/libdvdread.a: .norecurse $(wildcard libdvdread/*.[ch])
 libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch])
 
 libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Fri Nov  3 14:48:52 2006
@@ -5198,7 +5198,7 @@
 if test "$_mpdvdkit" = auto ; then
  _mpdvdkit=no
  if linux || freebsd || netbsd || darwin || openbsd || win32 || sunos || hpux; then
-  test -f "./libmpdvdkit2/Makefile" && _mpdvdkit=yes
+  _mpdvdkit=yes
  fi
 fi
 if test "$_mpdvdkit" = yes ; then

Modified: trunk/libdvdread/Makefile
==============================================================================
--- /trunk/libmpdvdkit2/Makefile	(original)
+++ trunk/libdvdread/Makefile	Fri Nov  3 14:48:52 2006
@@ -14,7 +14,7 @@
 
 OBJS = $(SRCS:.c=.o)
 
-LIB=libmpdvdkit
+LIB=libdvdread
 
 .SUFFIXES: .c .o
 

Modified: trunk/libdvdread/libdvdread_changes.diff
==============================================================================
--- /trunk/libmpdvdkit2/libdvdread_changes.diff	(original)
+++ trunk/libdvdread/libdvdread_changes.diff	Fri Nov  3 14:48:52 2006
@@ -330,8 +330,8 @@
      }
 
 diff -Naur dvdread.orig/ifo_print.h dvdread/ifo_print.h
---- dvdread/ifo_print.h 2002-08-15 22:13:21.000000000 +0200
-+++ /home/diego/src/mplayer/vanilla/libmpdvdkit2/ifo_print.h    2005-12-29 13:13:21.000000000 +0100
+--- dvdread.orig/ifo_print.h 2002-08-15 22:13:21.000000000 +0200
++++ dvdread/ifo_print.h    2005-12-29 13:13:21.000000000 +0100
 @@ -20,8 +24,8 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */

Modified: trunk/stream/stream_dvd.h
==============================================================================
--- trunk/stream/stream_dvd.h	(original)
+++ trunk/stream/stream_dvd.h	Fri Nov  3 14:48:52 2006
@@ -2,10 +2,10 @@
 #ifdef USE_DVDREAD
 
 #ifdef USE_MPDVDKIT
-#include "libmpdvdkit2/dvd_reader.h"
-#include "libmpdvdkit2/ifo_types.h"
-#include "libmpdvdkit2/ifo_read.h"
-#include "libmpdvdkit2/nav_read.h"
+#include "libdvdread/dvd_reader.h"
+#include "libdvdread/ifo_types.h"
+#include "libdvdread/ifo_read.h"
+#include "libdvdread/nav_read.h"
 #elif defined(USE_DVDNAV)
 #include <dvd_reader.h>
 #include <ifo_types.h>