[MPlayer-cvslog] r27498 - in trunk: Copyright Makefile configure dvdread libdvdread libdvdread/cmd_print.h libdvdread/ifo_print.h libdvdread/ifo_read.h libdvdread/ifo_types.h libdvdread/nav_print.h libdvdread/nav_read.h libdvdread/nav_types.h stream/stream_dvd.h stream/stream_dvd_common.c stream/stream_dvd_common.h
rathann
subversion at mplayerhq.hu
Sat Aug 30 14:22:21 CEST 2008
Author: rathann
Date: Sat Aug 30 14:22:21 2008
New Revision: 27498
Log:
Rename internal libdvdread fork from dvdread to libdvdread
to avoid clashing with external libdvdread.
(Sync with libdvdread r1122)
Added:
trunk/libdvdread/
- copied from r27490, /trunk/dvdread/
Removed:
trunk/dvdread/
Modified:
trunk/Copyright
trunk/Makefile
trunk/configure
trunk/libdvdread/cmd_print.h
trunk/libdvdread/ifo_print.h
trunk/libdvdread/ifo_read.h
trunk/libdvdread/ifo_types.h
trunk/libdvdread/nav_print.h
trunk/libdvdread/nav_read.h
trunk/libdvdread/nav_types.h
trunk/stream/stream_dvd.h
trunk/stream/stream_dvd_common.c
trunk/stream/stream_dvd_common.h
Modified: trunk/Copyright
==============================================================================
--- trunk/Copyright (original)
+++ trunk/Copyright Sat Aug 30 14:22:21 2008
@@ -51,7 +51,7 @@ License: GNU General Public License
Name: libdvdread
Version: 0.9.7 + patches
Homepage: http://www.dtek.chalmers.se/groups/dvd/development.shtml
-Directory: dvdread
+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 Sat Aug 30 14:22:21 2008
@@ -236,15 +236,15 @@ SRCS_COMMON-$(DVBIN) +=
SRCS_COMMON-$(DVDNAV) += stream/stream_dvdnav.c
SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \
stream/stream_dvd_common.c
-SRCS_COMMON-$(DVDREAD_INTERNAL) += dvdread/cmd_print.c \
- dvdread/dvd_input.c \
- dvdread/dvd_reader.c \
- dvdread/dvd_udf.c \
- dvdread/ifo_print.c \
- dvdread/ifo_read.c \
- dvdread/md5.c \
- dvdread/nav_print.c \
- dvdread/nav_read.c \
+SRCS_COMMON-$(DVDREAD_INTERNAL) += libdvdread/cmd_print.c \
+ libdvdread/dvd_input.c \
+ libdvdread/dvd_reader.c \
+ libdvdread/dvd_udf.c \
+ libdvdread/ifo_print.c \
+ libdvdread/ifo_read.c \
+ libdvdread/md5.c \
+ libdvdread/nav_print.c \
+ libdvdread/nav_read.c \
SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c
SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \
@@ -655,7 +655,6 @@ INSTALL_TARGETS-$(MENCODER) += install-m
INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man
DIRS = . \
- dvdread \
gui \
gui/mplayer \
gui/mplayer/gtk \
@@ -679,6 +678,7 @@ DIRS = . \
libavformat \
libavutil \
libdvdcss \
+ libdvdread \
libfaad2 \
libmenu \
libmpcodecs \
@@ -783,8 +783,8 @@ codec-cfg.d: codecs.conf.h
mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h
$(DEPS): help_mp.h
-dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
+libdvdread/%.o libdvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sat Aug 30 14:22:21 2008
@@ -5475,10 +5475,10 @@ elif test "$_dvdread" = auto ; then
if test "$_dl" = yes; then
cat > $TMPC << EOF
#include <inttypes.h>
-#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>
int main(void) { return 0; }
EOF
fi
Modified: trunk/libdvdread/cmd_print.h
==============================================================================
--- /trunk/dvdread/cmd_print.h (original)
+++ trunk/libdvdread/cmd_print.h Sat Aug 30 14:22:21 2008
@@ -20,7 +20,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <dvdread/ifo_types.h>
+#include <libdvdread/ifo_types.h>
/**
* Pretty printing of the DVD commands (vm instructions).
Modified: trunk/libdvdread/ifo_print.h
==============================================================================
--- /trunk/dvdread/ifo_print.h (original)
+++ trunk/libdvdread/ifo_print.h Sat Aug 30 14:22:21 2008
@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
+#include <libdvdread/ifo_types.h>
+#include <libdvdread/dvd_reader.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/libdvdread/ifo_read.h
==============================================================================
--- /trunk/dvdread/ifo_read.h (original)
+++ trunk/libdvdread/ifo_read.h Sat Aug 30 14:22:21 2008
@@ -21,8 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
+#include <libdvdread/ifo_types.h>
+#include <libdvdread/dvd_reader.h>
#ifdef __cplusplus
extern "C" {
Modified: trunk/libdvdread/ifo_types.h
==============================================================================
--- /trunk/dvdread/ifo_types.h (original)
+++ trunk/libdvdread/ifo_types.h Sat Aug 30 14:22:21 2008
@@ -25,7 +25,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <dvdread/dvd_reader.h>
+#include <libdvdread/dvd_reader.h>
#if defined(__BEOS__)
#if !defined(_INTTYPES_H_) && !defined(_INTTYPES_H) && !defined(_STDINT_H_) && !defined(_STDINT_H)
Modified: trunk/libdvdread/nav_print.h
==============================================================================
--- /trunk/dvdread/nav_print.h (original)
+++ trunk/libdvdread/nav_print.h Sat Aug 30 14:22:21 2008
@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <dvdread/nav_types.h>
+#include <libdvdread/nav_types.h>
/**
* Pretty printing of the NAV packets, PCI and DSI structs.
Modified: trunk/libdvdread/nav_read.h
==============================================================================
--- /trunk/dvdread/nav_read.h (original)
+++ trunk/libdvdread/nav_read.h Sat Aug 30 14:22:21 2008
@@ -20,7 +20,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <dvdread/nav_types.h>
+#include <libdvdread/nav_types.h>
/**
* Parsing of NAV data, PCI and DSI parts.
Modified: trunk/libdvdread/nav_types.h
==============================================================================
--- /trunk/dvdread/nav_types.h (original)
+++ trunk/libdvdread/nav_types.h Sat Aug 30 14:22:21 2008
@@ -30,7 +30,7 @@
* USA
*/
-#include <dvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */
+#include <libdvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */
/* If it's ever removed add a uintX_t test. */
#undef ATTRIBUTE_PACKED
Modified: trunk/stream/stream_dvd.h
==============================================================================
--- trunk/stream/stream_dvd.h (original)
+++ trunk/stream/stream_dvd.h Sat Aug 30 14:22:21 2008
@@ -4,15 +4,15 @@
#include "config.h"
#include <stdint.h>
#ifdef CONFIG_DVDREAD_INTERNAL
-#include "dvdread/dvd_reader.h"
-#include "dvdread/ifo_types.h"
-#include "dvdread/ifo_read.h"
-#include "dvdread/nav_read.h"
+#include "libdvdread/dvd_reader.h"
+#include "libdvdread/ifo_types.h"
+#include "libdvdread/ifo_read.h"
+#include "libdvdread/nav_read.h"
#else
-#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>
#endif
#include "stream.h"
Modified: trunk/stream/stream_dvd_common.c
==============================================================================
--- trunk/stream/stream_dvd_common.c (original)
+++ trunk/stream/stream_dvd_common.c Sat Aug 30 14:22:21 2008
@@ -1,9 +1,9 @@
#include "config.h"
#include <inttypes.h>
#ifdef CONFIG_DVDREAD_INTERNAL
-#include <dvdread/ifo_types.h>
+#include "libdvdread/ifo_types.h"
#else
-#include <libdvdread/ifo_types.h>
+#include <dvdread/ifo_types.h>
#endif
#include "stream_dvd_common.h"
Modified: trunk/stream/stream_dvd_common.h
==============================================================================
--- trunk/stream/stream_dvd_common.h (original)
+++ trunk/stream/stream_dvd_common.h Sat Aug 30 14:22:21 2008
@@ -4,9 +4,9 @@
#include "config.h"
#include <inttypes.h>
#ifdef CONFIG_DVDREAD_INTERNAL
-#include <dvdread/ifo_types.h>
+#include "libdvdread/ifo_types.h"
#else
-#include <libdvdread/ifo_types.h>
+#include <dvdread/ifo_types.h>
#endif
int mp_dvdtimetomsec(dvd_time_t *dt);
More information about the MPlayer-cvslog
mailing list