diff options
-rw-r--r-- | Copyright | 2 | ||||
-rw-r--r-- | Makefile | 12 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | libdvdread/Makefile (renamed from libmpdvdkit2/Makefile) | 2 | ||||
-rw-r--r-- | libdvdread/bswap.h (renamed from libmpdvdkit2/bswap.h) | 0 | ||||
-rw-r--r-- | libdvdread/dvd_input.c (renamed from libmpdvdkit2/dvd_input.c) | 0 | ||||
-rw-r--r-- | libdvdread/dvd_input.h (renamed from libmpdvdkit2/dvd_input.h) | 0 | ||||
-rw-r--r-- | libdvdread/dvd_reader.c (renamed from libmpdvdkit2/dvd_reader.c) | 0 | ||||
-rw-r--r-- | libdvdread/dvd_reader.h (renamed from libmpdvdkit2/dvd_reader.h) | 0 | ||||
-rw-r--r-- | libdvdread/dvd_udf.c (renamed from libmpdvdkit2/dvd_udf.c) | 0 | ||||
-rw-r--r-- | libdvdread/dvd_udf.h (renamed from libmpdvdkit2/dvd_udf.h) | 0 | ||||
-rw-r--r-- | libdvdread/dvdread_internal.h (renamed from libmpdvdkit2/dvdread_internal.h) | 0 | ||||
-rw-r--r-- | libdvdread/ifo_print.c (renamed from libmpdvdkit2/ifo_print.c) | 0 | ||||
-rw-r--r-- | libdvdread/ifo_print.h (renamed from libmpdvdkit2/ifo_print.h) | 0 | ||||
-rw-r--r-- | libdvdread/ifo_read.c (renamed from libmpdvdkit2/ifo_read.c) | 0 | ||||
-rw-r--r-- | libdvdread/ifo_read.h (renamed from libmpdvdkit2/ifo_read.h) | 0 | ||||
-rw-r--r-- | libdvdread/ifo_types.h (renamed from libmpdvdkit2/ifo_types.h) | 0 | ||||
-rw-r--r-- | libdvdread/libdvdread_changes.diff (renamed from libmpdvdkit2/libdvdread_changes.diff) | 4 | ||||
-rw-r--r-- | libdvdread/md5.c (renamed from libmpdvdkit2/md5.c) | 0 | ||||
-rw-r--r-- | libdvdread/md5.h (renamed from libmpdvdkit2/md5.h) | 0 | ||||
-rw-r--r-- | libdvdread/nav_print.c (renamed from libmpdvdkit2/nav_print.c) | 0 | ||||
-rw-r--r-- | libdvdread/nav_print.h (renamed from libmpdvdkit2/nav_print.h) | 0 | ||||
-rw-r--r-- | libdvdread/nav_read.c (renamed from libmpdvdkit2/nav_read.c) | 0 | ||||
-rw-r--r-- | libdvdread/nav_read.h (renamed from libmpdvdkit2/nav_read.h) | 0 | ||||
-rw-r--r-- | libdvdread/nav_types.h (renamed from libmpdvdkit2/nav_types.h) | 0 | ||||
-rw-r--r-- | stream/stream_dvd.h | 8 |
26 files changed, 15 insertions, 15 deletions
@@ -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>, @@ -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]) @@ -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 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 index f121b06104..f121b06104 100644 --- a/libmpdvdkit2/bswap.h +++ b/libdvdread/bswap.h diff --git a/libmpdvdkit2/dvd_input.c b/libdvdread/dvd_input.c index 8478970a6d..8478970a6d 100644 --- a/libmpdvdkit2/dvd_input.c +++ b/libdvdread/dvd_input.c diff --git a/libmpdvdkit2/dvd_input.h b/libdvdread/dvd_input.h index e9e84917ea..e9e84917ea 100644 --- a/libmpdvdkit2/dvd_input.h +++ b/libdvdread/dvd_input.h diff --git a/libmpdvdkit2/dvd_reader.c b/libdvdread/dvd_reader.c index 996477ef2c..996477ef2c 100644 --- a/libmpdvdkit2/dvd_reader.c +++ b/libdvdread/dvd_reader.c diff --git a/libmpdvdkit2/dvd_reader.h b/libdvdread/dvd_reader.h index cc4ba54895..cc4ba54895 100644 --- a/libmpdvdkit2/dvd_reader.h +++ b/libdvdread/dvd_reader.h diff --git a/libmpdvdkit2/dvd_udf.c b/libdvdread/dvd_udf.c index 56682e7405..56682e7405 100644 --- a/libmpdvdkit2/dvd_udf.c +++ b/libdvdread/dvd_udf.c diff --git a/libmpdvdkit2/dvd_udf.h b/libdvdread/dvd_udf.h index b600983d9a..b600983d9a 100644 --- a/libmpdvdkit2/dvd_udf.h +++ b/libdvdread/dvd_udf.h diff --git a/libmpdvdkit2/dvdread_internal.h b/libdvdread/dvdread_internal.h index 5c8a535cc0..5c8a535cc0 100644 --- a/libmpdvdkit2/dvdread_internal.h +++ b/libdvdread/dvdread_internal.h diff --git a/libmpdvdkit2/ifo_print.c b/libdvdread/ifo_print.c index 0ce1c0011e..0ce1c0011e 100644 --- a/libmpdvdkit2/ifo_print.c +++ b/libdvdread/ifo_print.c diff --git a/libmpdvdkit2/ifo_print.h b/libdvdread/ifo_print.h index c6e24f6a74..c6e24f6a74 100644 --- a/libmpdvdkit2/ifo_print.h +++ b/libdvdread/ifo_print.h diff --git a/libmpdvdkit2/ifo_read.c b/libdvdread/ifo_read.c index ac81b0f14a..ac81b0f14a 100644 --- a/libmpdvdkit2/ifo_read.c +++ b/libdvdread/ifo_read.c diff --git a/libmpdvdkit2/ifo_read.h b/libdvdread/ifo_read.h index d64f6e712c..d64f6e712c 100644 --- a/libmpdvdkit2/ifo_read.h +++ b/libdvdread/ifo_read.h diff --git a/libmpdvdkit2/ifo_types.h b/libdvdread/ifo_types.h index 4eb6144e1c..4eb6144e1c 100644 --- a/libmpdvdkit2/ifo_types.h +++ b/libdvdread/ifo_types.h diff --git a/libmpdvdkit2/libdvdread_changes.diff b/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 index d4fd7d5e20..d4fd7d5e20 100644 --- a/libmpdvdkit2/md5.c +++ b/libdvdread/md5.c diff --git a/libmpdvdkit2/md5.h b/libdvdread/md5.h index 3b7dea1699..3b7dea1699 100644 --- a/libmpdvdkit2/md5.h +++ b/libdvdread/md5.h diff --git a/libmpdvdkit2/nav_print.c b/libdvdread/nav_print.c index 6df3dc8310..6df3dc8310 100644 --- a/libmpdvdkit2/nav_print.c +++ b/libdvdread/nav_print.c diff --git a/libmpdvdkit2/nav_print.h b/libdvdread/nav_print.h index 3a3354277f..3a3354277f 100644 --- a/libmpdvdkit2/nav_print.h +++ b/libdvdread/nav_print.h diff --git a/libmpdvdkit2/nav_read.c b/libdvdread/nav_read.c index 1a907f9dfe..1a907f9dfe 100644 --- a/libmpdvdkit2/nav_read.c +++ b/libdvdread/nav_read.c diff --git a/libmpdvdkit2/nav_read.h b/libdvdread/nav_read.h index 88c46d93bc..88c46d93bc 100644 --- a/libmpdvdkit2/nav_read.h +++ b/libdvdread/nav_read.h diff --git a/libmpdvdkit2/nav_types.h b/libdvdread/nav_types.h index 8800e7f894..8800e7f894 100644 --- a/libmpdvdkit2/nav_types.h +++ b/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 <dvd_reader.h> #include <ifo_types.h> |