From 8cf4397274d9f5cf35f1961d154ebb811f4f0f2f Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 18 Nov 2006 00:33:01 +0000 Subject: [PATCH] Rename libdvdread to dvdread. We really only include only the dvdread subdirectory of libdvdread. This will also allow getting rid of some local modifications. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20997 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Copyright | 2 +- Makefile | 12 ++++++------ TOOLS/netstream/Makefile | 2 +- {libdvdread => dvdread}/Makefile | 0 {libdvdread => dvdread}/bswap.h | 0 {libdvdread => dvdread}/dvd_input.c | 0 {libdvdread => dvdread}/dvd_input.h | 0 {libdvdread => dvdread}/dvd_reader.c | 0 {libdvdread => dvdread}/dvd_reader.h | 0 {libdvdread => dvdread}/dvd_udf.c | 0 {libdvdread => dvdread}/dvd_udf.h | 0 {libdvdread => dvdread}/dvdread_internal.h | 0 {libdvdread => dvdread}/ifo_print.c | 0 {libdvdread => dvdread}/ifo_print.h | 0 {libdvdread => dvdread}/ifo_read.c | 0 {libdvdread => dvdread}/ifo_read.h | 0 {libdvdread => dvdread}/ifo_types.h | 0 {libdvdread => dvdread}/libdvdread_changes.diff | 0 {libdvdread => dvdread}/md5.c | 0 {libdvdread => dvdread}/md5.h | 0 {libdvdread => dvdread}/nav_print.c | 0 {libdvdread => dvdread}/nav_print.h | 0 {libdvdread => dvdread}/nav_read.c | 0 {libdvdread => dvdread}/nav_read.h | 0 {libdvdread => dvdread}/nav_types.h | 0 stream/stream_dvd.h | 8 ++++---- 26 files changed, 12 insertions(+), 12 deletions(-) rename {libdvdread => dvdread}/Makefile (100%) rename {libdvdread => dvdread}/bswap.h (100%) rename {libdvdread => dvdread}/dvd_input.c (100%) rename {libdvdread => dvdread}/dvd_input.h (100%) rename {libdvdread => dvdread}/dvd_reader.c (100%) rename {libdvdread => dvdread}/dvd_reader.h (100%) rename {libdvdread => dvdread}/dvd_udf.c (100%) rename {libdvdread => dvdread}/dvd_udf.h (100%) rename {libdvdread => dvdread}/dvdread_internal.h (100%) rename {libdvdread => dvdread}/ifo_print.c (100%) rename {libdvdread => dvdread}/ifo_print.h (100%) rename {libdvdread => dvdread}/ifo_read.c (100%) rename {libdvdread => dvdread}/ifo_read.h (100%) rename {libdvdread => dvdread}/ifo_types.h (100%) rename {libdvdread => dvdread}/libdvdread_changes.diff (100%) rename {libdvdread => dvdread}/md5.c (100%) rename {libdvdread => dvdread}/md5.h (100%) rename {libdvdread => dvdread}/nav_print.c (100%) rename {libdvdread => dvdread}/nav_print.h (100%) rename {libdvdread => dvdread}/nav_read.c (100%) rename {libdvdread => dvdread}/nav_read.h (100%) rename {libdvdread => dvdread}/nav_types.h (100%) diff --git a/Copyright b/Copyright index 745e12a510..61be083376 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: libdvdread +Directory: dvdread Copyright: 1998, 1999 Eric Smith 1999 Christian Wolff for convergence integrated media 2000-2001 Billy Biggs , diff --git a/Makefile b/Makefile index e259e224fd..03546fad45 100644 --- a/Makefile +++ b/Makefile @@ -112,7 +112,7 @@ ifeq ($(VIDIX),yes) PARTS += libdha vidix endif ifeq ($(DVDREAD_INTERNAL),yes) -PARTS += libdvdread +PARTS += dvdread PARTS += libdvdcss endif ifeq ($(GUI),yes) @@ -168,8 +168,8 @@ ifeq ($(VIDIX),yes) COMMON_DEPS += libdha/libdha.so vidix/libvidix.a endif ifeq ($(DVDREAD_INTERNAL),yes) -COMMON_DEPS += libdvdread/libdvdread.a -COMMON_LIBS += libdvdread/libdvdread.a +COMMON_DEPS += dvdread/libdvdread.a +COMMON_LIBS += dvdread/libdvdread.a COMMON_DEPS += libdvdcss/libdvdcss.a COMMON_LIBS += libdvdcss/libdvdcss.a endif @@ -201,8 +201,8 @@ all: $(ALL_PRG) libaf/libaf.a: $(MAKE) -C libaf -libdvdread/libdvdread.a: - $(MAKE) -C libdvdread +dvdread/libdvdread.a: + $(MAKE) -C dvdread libdvdcss/libdvdcss.a: $(MAKE) -C libdvdcss @@ -476,7 +476,7 @@ input/libinput.a: .norecurse $(wildcard input/*.[ch]) libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch]) libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch]) -libdvdread/libdvdread.a: .norecurse $(wildcard libdvdread/*.[ch]) +dvdread/libdvdread.a: .norecurse $(wildcard dvdread/*.[ch]) libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch]) libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch]) diff --git a/TOOLS/netstream/Makefile b/TOOLS/netstream/Makefile index ad062f0c51..27996d2383 100644 --- a/TOOLS/netstream/Makefile +++ b/TOOLS/netstream/Makefile @@ -20,7 +20,7 @@ all: netstream # it does not work with either GUI, LIVE555 or libavformat enabled DEPS = $(MPROOT)/libmpdemux/libmpdemux.a \ $(MPROOT)/stream/stream.a \ - $(MPROOT)/libdvdread/libdvdread.a \ + $(MPROOT)/dvdread/libdvdread.a \ $(MPROOT)/libmpcodecs/native/minilzo.o \ $(MPROOT)/libvo/aclib.o \ $(MPROOT)/libmpcodecs/img_format.o \ diff --git a/libdvdread/Makefile b/dvdread/Makefile similarity index 100% rename from libdvdread/Makefile rename to dvdread/Makefile diff --git a/libdvdread/bswap.h b/dvdread/bswap.h similarity index 100% rename from libdvdread/bswap.h rename to dvdread/bswap.h diff --git a/libdvdread/dvd_input.c b/dvdread/dvd_input.c similarity index 100% rename from libdvdread/dvd_input.c rename to dvdread/dvd_input.c diff --git a/libdvdread/dvd_input.h b/dvdread/dvd_input.h similarity index 100% rename from libdvdread/dvd_input.h rename to dvdread/dvd_input.h diff --git a/libdvdread/dvd_reader.c b/dvdread/dvd_reader.c similarity index 100% rename from libdvdread/dvd_reader.c rename to dvdread/dvd_reader.c diff --git a/libdvdread/dvd_reader.h b/dvdread/dvd_reader.h similarity index 100% rename from libdvdread/dvd_reader.h rename to dvdread/dvd_reader.h diff --git a/libdvdread/dvd_udf.c b/dvdread/dvd_udf.c similarity index 100% rename from libdvdread/dvd_udf.c rename to dvdread/dvd_udf.c diff --git a/libdvdread/dvd_udf.h b/dvdread/dvd_udf.h similarity index 100% rename from libdvdread/dvd_udf.h rename to dvdread/dvd_udf.h diff --git a/libdvdread/dvdread_internal.h b/dvdread/dvdread_internal.h similarity index 100% rename from libdvdread/dvdread_internal.h rename to dvdread/dvdread_internal.h diff --git a/libdvdread/ifo_print.c b/dvdread/ifo_print.c similarity index 100% rename from libdvdread/ifo_print.c rename to dvdread/ifo_print.c diff --git a/libdvdread/ifo_print.h b/dvdread/ifo_print.h similarity index 100% rename from libdvdread/ifo_print.h rename to dvdread/ifo_print.h diff --git a/libdvdread/ifo_read.c b/dvdread/ifo_read.c similarity index 100% rename from libdvdread/ifo_read.c rename to dvdread/ifo_read.c diff --git a/libdvdread/ifo_read.h b/dvdread/ifo_read.h similarity index 100% rename from libdvdread/ifo_read.h rename to dvdread/ifo_read.h diff --git a/libdvdread/ifo_types.h b/dvdread/ifo_types.h similarity index 100% rename from libdvdread/ifo_types.h rename to dvdread/ifo_types.h diff --git a/libdvdread/libdvdread_changes.diff b/dvdread/libdvdread_changes.diff similarity index 100% rename from libdvdread/libdvdread_changes.diff rename to dvdread/libdvdread_changes.diff diff --git a/libdvdread/md5.c b/dvdread/md5.c similarity index 100% rename from libdvdread/md5.c rename to dvdread/md5.c diff --git a/libdvdread/md5.h b/dvdread/md5.h similarity index 100% rename from libdvdread/md5.h rename to dvdread/md5.h diff --git a/libdvdread/nav_print.c b/dvdread/nav_print.c similarity index 100% rename from libdvdread/nav_print.c rename to dvdread/nav_print.c diff --git a/libdvdread/nav_print.h b/dvdread/nav_print.h similarity index 100% rename from libdvdread/nav_print.h rename to dvdread/nav_print.h diff --git a/libdvdread/nav_read.c b/dvdread/nav_read.c similarity index 100% rename from libdvdread/nav_read.c rename to dvdread/nav_read.c diff --git a/libdvdread/nav_read.h b/dvdread/nav_read.h similarity index 100% rename from libdvdread/nav_read.h rename to dvdread/nav_read.h diff --git a/libdvdread/nav_types.h b/dvdread/nav_types.h similarity index 100% rename from libdvdread/nav_types.h rename to dvdread/nav_types.h diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h index 3f9b2ffddb..d790bc078c 100644 --- a/stream/stream_dvd.h +++ b/stream/stream_dvd.h @@ -2,10 +2,10 @@ #ifdef USE_DVDREAD #ifdef USE_DVDREAD_INTERNAL -#include "libdvdread/dvd_reader.h" -#include "libdvdread/ifo_types.h" -#include "libdvdread/ifo_read.h" -#include "libdvdread/nav_read.h" +#include "dvdread/dvd_reader.h" +#include "dvdread/ifo_types.h" +#include "dvdread/ifo_read.h" +#include "dvdread/nav_read.h" #elif defined(USE_DVDNAV) #include #include