[MPlayer-cvslog] r20629 - in trunk: Copyright Makefile libdvdcss libdvdcss/Makefile libdvdcss/bsdi_dvd.h libdvdcss/bsdi_ioctl.c libdvdcss/common.h libdvdcss/css.c libdvdcss/css.h libdvdcss/csstables.h libdvdcss/device.c libdvdcss/device.h libdvdcss/dvdcss libdvdcss/error.c libdvdcss/ioctl.c libdvdcss/ioctl.h libdvdcss/libdvdcss.c libdvdcss/libdvdcss.h libmpdvdkit2/FILES libmpdvdkit2/Makefile libmpdvdkit2/bsdi_dvd.h libmpdvdkit2/bsdi_ioctl.c libmpdvdkit2/common.h libmpdvdkit2/css.c libmpdvdkit2/css.h libmpdvdkit2/csstables.h libmpdvdkit2/device.c libmpdvdkit2/device.h libmpdvdkit2/dvdcss libmpdvdkit2/error.c libmpdvdkit2/ioctl.c libmpdvdkit2/ioctl.h libmpdvdkit2/libdvdcss.c libmpdvdkit2/libdvdcss.h
diego
subversion at mplayerhq.hu
Fri Nov 3 13:25:56 CET 2006
Author: diego
Date: Fri Nov 3 13:25:56 2006
New Revision: 20629
Added:
trunk/libdvdcss/ (props changed)
trunk/libdvdcss/Makefile
- copied, changed from r20572, /trunk/libmpdvdkit2/Makefile
trunk/libdvdcss/bsdi_dvd.h
- copied unchanged from r20572, /trunk/libmpdvdkit2/bsdi_dvd.h
trunk/libdvdcss/bsdi_ioctl.c
- copied unchanged from r20572, /trunk/libmpdvdkit2/bsdi_ioctl.c
trunk/libdvdcss/common.h
- copied unchanged from r20581, /trunk/libmpdvdkit2/common.h
trunk/libdvdcss/css.c
- copied unchanged from r20572, /trunk/libmpdvdkit2/css.c
trunk/libdvdcss/css.h
- copied unchanged from r20572, /trunk/libmpdvdkit2/css.h
trunk/libdvdcss/csstables.h
- copied unchanged from r20572, /trunk/libmpdvdkit2/csstables.h
trunk/libdvdcss/device.c
- copied unchanged from r20572, /trunk/libmpdvdkit2/device.c
trunk/libdvdcss/device.h
- copied unchanged from r20572, /trunk/libmpdvdkit2/device.h
trunk/libdvdcss/dvdcss/
- copied from r20572, /trunk/libmpdvdkit2/dvdcss/
trunk/libdvdcss/error.c
- copied unchanged from r20572, /trunk/libmpdvdkit2/error.c
trunk/libdvdcss/ioctl.c
- copied unchanged from r20572, /trunk/libmpdvdkit2/ioctl.c
trunk/libdvdcss/ioctl.h
- copied unchanged from r20572, /trunk/libmpdvdkit2/ioctl.h
trunk/libdvdcss/libdvdcss.c
- copied unchanged from r20572, /trunk/libmpdvdkit2/libdvdcss.c
trunk/libdvdcss/libdvdcss.h
- copied unchanged from r20572, /trunk/libmpdvdkit2/libdvdcss.h
Removed:
trunk/libmpdvdkit2/FILES
trunk/libmpdvdkit2/bsdi_dvd.h
trunk/libmpdvdkit2/bsdi_ioctl.c
trunk/libmpdvdkit2/common.h
trunk/libmpdvdkit2/css.c
trunk/libmpdvdkit2/css.h
trunk/libmpdvdkit2/csstables.h
trunk/libmpdvdkit2/device.c
trunk/libmpdvdkit2/device.h
trunk/libmpdvdkit2/dvdcss/
trunk/libmpdvdkit2/error.c
trunk/libmpdvdkit2/ioctl.c
trunk/libmpdvdkit2/ioctl.h
trunk/libmpdvdkit2/libdvdcss.c
trunk/libmpdvdkit2/libdvdcss.h
Modified:
trunk/Copyright
trunk/Makefile
trunk/libmpdvdkit2/Makefile
Log:
Move libdvdcss into its own subdirectory.
Modified: trunk/Copyright
==============================================================================
--- trunk/Copyright (original)
+++ trunk/Copyright Fri Nov 3 13:25:56 2006
@@ -51,7 +51,7 @@
Name: libdvdcss
Version: Subversion r202 (post 1.2.9 release)
Homepage: http://developers.videolan.org/libdvdcss/
-Directory: libmpdvdkit2
+Directory: libdvdcss
Copyright: 1998-2006 VideoLAN
License: GNU General Public License
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Nov 3 13:25:56 2006
@@ -116,6 +116,7 @@
endif
ifeq ($(DVDKIT2),yes)
PARTS += libmpdvdkit2
+PARTS += libdvdcss
endif
ifeq ($(GUI),yes)
PARTS += Gui
@@ -175,6 +176,8 @@
ifeq ($(DVDKIT2),yes)
COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
COMMON_LIBS += libmpdvdkit2/libmpdvdkit.a
+COMMON_DEPS += libdvdcss/libdvdcss.a
+COMMON_LIBS += libdvdcss/libdvdcss.a
endif
ifeq ($(CONFIG_ASS),yes)
COMMON_DEPS += libass/libass.a
@@ -207,6 +210,9 @@
libmpdvdkit2/libmpdvdkit.a:
$(MAKE) -C libmpdvdkit2
+libdvdcss/libdvdcss.a:
+ $(MAKE) -C libdvdcss
+
loader/libloader.a:
$(MAKE) -C loader
@@ -476,6 +482,7 @@
libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch])
libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch])
libmpdvdkit2/libmpdvdkit.a: .norecurse $(wildcard libmpdvdkit2/*.[ch])
+libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch])
libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])
stream/stream.a: .norecurse $(wildcard stream/*.[ch] stream/*/*.[ch])
Copied: trunk/libdvdcss/Makefile (from r20572, /trunk/libmpdvdkit2/Makefile)
==============================================================================
--- /trunk/libmpdvdkit2/Makefile (original)
+++ trunk/libdvdcss/Makefile Fri Nov 3 13:25:56 2006
@@ -5,39 +5,27 @@
SRCS = css.c \
device.c \
- dvd_input.c \
- dvd_reader.c \
- dvd_udf.c \
error.c \
- ifo_print.c \
- ifo_read.c \
ioctl.c \
libdvdcss.c \
- nav_print.c \
- nav_read.c \
- md5.c \
-
-#bsdi_ioctl.c
+ #bsdi_ioctl \
OBJS = $(SRCS:.c=.o)
-LIB=libmpdvdkit
+LIB=libdvdcss
.SUFFIXES: .c .o
ifeq ($(OPTFLAGS),)
OPTFLAGS = -mcpu=pentium -march=pentium -O4
-else
-OPTFLAGS += -DHAVE_MPLAYER
endif
# \ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
# -funroll-loops removed, triggered gcc 3.0.4 (3.x?) bug
-CFLAGS= -I. $(OPTFLAGS) \
- -DSYS_LINUX -D__USE_UNIX98 -D_REENTRANT -D_GNU_SOURCE \
- -DHAVE_DVDCSS_DVDCSS_H -DSTDC_HEADERS -DHAVE_LIMITS_H \
- -DHAVE_ERRNO_H -DHAVE_INTTYPES_H -DHAVE_UNISTD_H \
+CFLAGS= -I.. $(OPTFLAGS) -D__USE_UNIX98 -D_GNU_SOURCE \
+ -DHAVE_LIMITS_H -DHAVE_ERRNO_H -DHAVE_INTTYPES_H -DHAVE_UNISTD_H \
+ -DVERSION=\"1.2.9\"
ifeq ($(TARGET_OS),CYGWIN)
CFLAGS+=-DSYS_CYGWIN -DWIN32
@@ -51,7 +39,6 @@
$(CC) $(CFLAGS) -c -o $@ $<
all: $(LIB).a
-default: $(LIB).a
$(LIB).a: $(OBJS)
$(AR) rc $(LIB).a $(OBJS)
Modified: trunk/libmpdvdkit2/Makefile
==============================================================================
--- trunk/libmpdvdkit2/Makefile (original)
+++ trunk/libmpdvdkit2/Makefile Fri Nov 3 13:25:56 2006
@@ -3,16 +3,11 @@
include ../config.mak
endif
-SRCS = css.c \
- device.c \
- dvd_input.c \
+SRCS = dvd_input.c \
dvd_reader.c \
dvd_udf.c \
- error.c \
ifo_print.c \
ifo_read.c \
- ioctl.c \
- libdvdcss.c \
nav_print.c \
nav_read.c \
md5.c \
@@ -34,18 +29,8 @@
# \ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
# -funroll-loops removed, triggered gcc 3.0.4 (3.x?) bug
-CFLAGS= -I.. $(OPTFLAGS) -D__USE_UNIX98 -D_GNU_SOURCE \
+CFLAGS= -I../libdvdcss -I.. $(OPTFLAGS) -D__USE_UNIX98 -D_GNU_SOURCE \
-DHAVE_DVDCSS_DVDCSS_H -DSTDC_HEADERS -DHAVE_LIMITS_H \
- -DHAVE_ERRNO_H -DHAVE_INTTYPES_H -DHAVE_UNISTD_H \
- -DVERSION=\"1.2.9\"
-
-ifeq ($(TARGET_OS),CYGWIN)
-CFLAGS+=-DSYS_CYGWIN -DWIN32
-endif
-
-ifeq ($(TARGET_OS),Darwin)
-CFLAGS+=-D__DARWIN__
-endif
.c.o:
$(CC) $(CFLAGS) -c -o $@ $<
More information about the MPlayer-cvslog
mailing list