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

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20631 b3059339-0415-0410-9bf9-f77b7e298cf2

Copyright

@@ -58,7 +58,7 @@ License:    GNU General Public License
 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@brouhaha.com>
             1999 Christian Wolff for convergence integrated media
             2000-2001 Billy Biggs <vektor@dumbterm.net>,

Makefile

@@ -115,7 +115,7 @@ ifeq ($(FAME),yes)
 PARTS += libfame
 endif
 ifeq ($(DVDKIT2),yes)
-PARTS += libmpdvdkit2
+PARTS += libdvdread
 PARTS += libdvdcss
 endif
 ifeq ($(GUI),yes)
@@ -174,8 +174,8 @@ ifeq ($(FAME),yes)
 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 @@ all:	$(ALL_PRG)
 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 @@ input/libinput.a: .norecurse $(wildcard input/*.[ch])
 
 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])

configure

@@ -5198,7 +5198,7 @@ echocheck "DVD support (libmpdvdkit2)"
 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

libdvdread/Makefile

@@ -14,7 +14,7 @@ SRCS = dvd_input.c \
 
 OBJS = $(SRCS:.c=.o)
 
-LIB=libmpdvdkit
+LIB=libdvdread
 
 .SUFFIXES: .c .o
 

libdvdread/libdvdread_changes.diff

@@ -330,8 +330,8 @@ diff -Naur dvdread.orig/ifo_print.c dvdread/ifo_print.c
      }
 
 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
   */

stream/stream_dvd.h

@@ -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>