From 376951ca72da23438f68ee5fd01bb7a22561e27a Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 3 Nov 2006 13:48:52 +0000 Subject: [PATCH] libmpdvdkit2 --> libdvdread, it just contains libdvdread now. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20631 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Copyright | 2 +- Makefile | 12 ++++++------ configure | 2 +- {libmpdvdkit2 => libdvdread}/Makefile | 2 +- {libmpdvdkit2 => libdvdread}/bswap.h | 0 {libmpdvdkit2 => libdvdread}/dvd_input.c | 0 {libmpdvdkit2 => libdvdread}/dvd_input.h | 0 {libmpdvdkit2 => libdvdread}/dvd_reader.c | 0 {libmpdvdkit2 => libdvdread}/dvd_reader.h | 0 {libmpdvdkit2 => libdvdread}/dvd_udf.c | 0 {libmpdvdkit2 => libdvdread}/dvd_udf.h | 0 {libmpdvdkit2 => libdvdread}/dvdread_internal.h | 0 {libmpdvdkit2 => libdvdread}/ifo_print.c | 0 {libmpdvdkit2 => libdvdread}/ifo_print.h | 0 {libmpdvdkit2 => libdvdread}/ifo_read.c | 0 {libmpdvdkit2 => libdvdread}/ifo_read.h | 0 {libmpdvdkit2 => libdvdread}/ifo_types.h | 0 {libmpdvdkit2 => libdvdread}/libdvdread_changes.diff | 4 ++-- {libmpdvdkit2 => libdvdread}/md5.c | 0 {libmpdvdkit2 => libdvdread}/md5.h | 0 {libmpdvdkit2 => libdvdread}/nav_print.c | 0 {libmpdvdkit2 => libdvdread}/nav_print.h | 0 {libmpdvdkit2 => libdvdread}/nav_read.c | 0 {libmpdvdkit2 => libdvdread}/nav_read.h | 0 {libmpdvdkit2 => libdvdread}/nav_types.h | 0 stream/stream_dvd.h | 8 ++++---- 26 files changed, 15 insertions(+), 15 deletions(-) rename {libmpdvdkit2 => libdvdread}/Makefile (98%) rename {libmpdvdkit2 => libdvdread}/bswap.h (100%) rename {libmpdvdkit2 => libdvdread}/dvd_input.c (100%) rename {libmpdvdkit2 => libdvdread}/dvd_input.h (100%) rename {libmpdvdkit2 => libdvdread}/dvd_reader.c (100%) rename {libmpdvdkit2 => libdvdread}/dvd_reader.h (100%) rename {libmpdvdkit2 => libdvdread}/dvd_udf.c (100%) rename {libmpdvdkit2 => libdvdread}/dvd_udf.h (100%) rename {libmpdvdkit2 => libdvdread}/dvdread_internal.h (100%) rename {libmpdvdkit2 => libdvdread}/ifo_print.c (100%) rename {libmpdvdkit2 => libdvdread}/ifo_print.h (100%) rename {libmpdvdkit2 => libdvdread}/ifo_read.c (100%) rename {libmpdvdkit2 => libdvdread}/ifo_read.h (100%) rename {libmpdvdkit2 => libdvdread}/ifo_types.h (100%) rename {libmpdvdkit2 => libdvdread}/libdvdread_changes.diff (98%) rename {libmpdvdkit2 => libdvdread}/md5.c (100%) rename {libmpdvdkit2 => libdvdread}/md5.h (100%) rename {libmpdvdkit2 => libdvdread}/nav_print.c (100%) rename {libmpdvdkit2 => libdvdread}/nav_print.h (100%) rename {libmpdvdkit2 => libdvdread}/nav_read.c (100%) rename {libmpdvdkit2 => libdvdread}/nav_read.h (100%) rename {libmpdvdkit2 => libdvdread}/nav_types.h (100%) diff --git a/Copyright b/Copyright index 842846e50c..d396b9a396 100644 --- a/Copyright +++ b/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 1999 Christian Wolff for convergence integrated media 2000-2001 Billy Biggs , diff --git a/Makefile b/Makefile index 3a1b7aae6c..5c1a54bab3 100644 --- a/Makefile +++ b/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]) diff --git a/configure b/configure index 109d03c461..c97c29f6e8 100755 --- a/configure +++ b/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 diff --git a/libmpdvdkit2/Makefile b/libdvdread/Makefile similarity index 98% rename from libmpdvdkit2/Makefile rename to libdvdread/Makefile index b6a0af13b4..0b9b7e47fc 100644 --- a/libmpdvdkit2/Makefile +++ b/libdvdread/Makefile @@ -14,7 +14,7 @@ SRCS = dvd_input.c \ OBJS = $(SRCS:.c=.o) -LIB=libmpdvdkit +LIB=libdvdread .SUFFIXES: .c .o diff --git a/libmpdvdkit2/bswap.h b/libdvdread/bswap.h similarity index 100% rename from libmpdvdkit2/bswap.h rename to libdvdread/bswap.h diff --git a/libmpdvdkit2/dvd_input.c b/libdvdread/dvd_input.c similarity index 100% rename from libmpdvdkit2/dvd_input.c rename to libdvdread/dvd_input.c diff --git a/libmpdvdkit2/dvd_input.h b/libdvdread/dvd_input.h similarity index 100% rename from libmpdvdkit2/dvd_input.h rename to libdvdread/dvd_input.h diff --git a/libmpdvdkit2/dvd_reader.c b/libdvdread/dvd_reader.c similarity index 100% rename from libmpdvdkit2/dvd_reader.c rename to libdvdread/dvd_reader.c diff --git a/libmpdvdkit2/dvd_reader.h b/libdvdread/dvd_reader.h similarity index 100% rename from libmpdvdkit2/dvd_reader.h rename to libdvdread/dvd_reader.h diff --git a/libmpdvdkit2/dvd_udf.c b/libdvdread/dvd_udf.c similarity index 100% rename from libmpdvdkit2/dvd_udf.c rename to libdvdread/dvd_udf.c diff --git a/libmpdvdkit2/dvd_udf.h b/libdvdread/dvd_udf.h similarity index 100% rename from libmpdvdkit2/dvd_udf.h rename to libdvdread/dvd_udf.h diff --git a/libmpdvdkit2/dvdread_internal.h b/libdvdread/dvdread_internal.h similarity index 100% rename from libmpdvdkit2/dvdread_internal.h rename to libdvdread/dvdread_internal.h diff --git a/libmpdvdkit2/ifo_print.c b/libdvdread/ifo_print.c similarity index 100% rename from libmpdvdkit2/ifo_print.c rename to libdvdread/ifo_print.c diff --git a/libmpdvdkit2/ifo_print.h b/libdvdread/ifo_print.h similarity index 100% rename from libmpdvdkit2/ifo_print.h rename to libdvdread/ifo_print.h diff --git a/libmpdvdkit2/ifo_read.c b/libdvdread/ifo_read.c similarity index 100% rename from libmpdvdkit2/ifo_read.c rename to libdvdread/ifo_read.c diff --git a/libmpdvdkit2/ifo_read.h b/libdvdread/ifo_read.h similarity index 100% rename from libmpdvdkit2/ifo_read.h rename to libdvdread/ifo_read.h diff --git a/libmpdvdkit2/ifo_types.h b/libdvdread/ifo_types.h similarity index 100% rename from libmpdvdkit2/ifo_types.h rename to libdvdread/ifo_types.h diff --git a/libmpdvdkit2/libdvdread_changes.diff b/libdvdread/libdvdread_changes.diff similarity index 98% rename from libmpdvdkit2/libdvdread_changes.diff rename to libdvdread/libdvdread_changes.diff index 326f7c1608..741e9cb05b 100644 --- a/libmpdvdkit2/libdvdread_changes.diff +++ b/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 */ diff --git a/libmpdvdkit2/md5.c b/libdvdread/md5.c similarity index 100% rename from libmpdvdkit2/md5.c rename to libdvdread/md5.c diff --git a/libmpdvdkit2/md5.h b/libdvdread/md5.h similarity index 100% rename from libmpdvdkit2/md5.h rename to libdvdread/md5.h diff --git a/libmpdvdkit2/nav_print.c b/libdvdread/nav_print.c similarity index 100% rename from libmpdvdkit2/nav_print.c rename to libdvdread/nav_print.c diff --git a/libmpdvdkit2/nav_print.h b/libdvdread/nav_print.h similarity index 100% rename from libmpdvdkit2/nav_print.h rename to libdvdread/nav_print.h diff --git a/libmpdvdkit2/nav_read.c b/libdvdread/nav_read.c similarity index 100% rename from libmpdvdkit2/nav_read.c rename to libdvdread/nav_read.c diff --git a/libmpdvdkit2/nav_read.h b/libdvdread/nav_read.h similarity index 100% rename from libmpdvdkit2/nav_read.h rename to libdvdread/nav_read.h diff --git a/libmpdvdkit2/nav_types.h b/libdvdread/nav_types.h similarity index 100% rename from libmpdvdkit2/nav_types.h rename to libdvdread/nav_types.h diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h index 1a2b314f35..b06ee9e35d 100644 --- a/stream/stream_dvd.h +++ b/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 #include