mirror of https://github.com/mpv-player/mpv
Move libdvdcss into its own subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20629 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
b23a127c9a
commit
689d0cc0f4
|
@ -51,7 +51,7 @@ License: GNU General Public License
|
||||||
Name: libdvdcss
|
Name: libdvdcss
|
||||||
Version: Subversion r202 (post 1.2.9 release)
|
Version: Subversion r202 (post 1.2.9 release)
|
||||||
Homepage: http://developers.videolan.org/libdvdcss/
|
Homepage: http://developers.videolan.org/libdvdcss/
|
||||||
Directory: libmpdvdkit2
|
Directory: libdvdcss
|
||||||
Copyright: 1998-2006 VideoLAN
|
Copyright: 1998-2006 VideoLAN
|
||||||
License: GNU General Public License
|
License: GNU General Public License
|
||||||
|
|
||||||
|
|
7
Makefile
7
Makefile
|
@ -116,6 +116,7 @@ PARTS += libfame
|
||||||
endif
|
endif
|
||||||
ifeq ($(DVDKIT2),yes)
|
ifeq ($(DVDKIT2),yes)
|
||||||
PARTS += libmpdvdkit2
|
PARTS += libmpdvdkit2
|
||||||
|
PARTS += libdvdcss
|
||||||
endif
|
endif
|
||||||
ifeq ($(GUI),yes)
|
ifeq ($(GUI),yes)
|
||||||
PARTS += Gui
|
PARTS += Gui
|
||||||
|
@ -175,6 +176,8 @@ endif
|
||||||
ifeq ($(DVDKIT2),yes)
|
ifeq ($(DVDKIT2),yes)
|
||||||
COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
|
COMMON_DEPS += libmpdvdkit2/libmpdvdkit.a
|
||||||
COMMON_LIBS += libmpdvdkit2/libmpdvdkit.a
|
COMMON_LIBS += libmpdvdkit2/libmpdvdkit.a
|
||||||
|
COMMON_DEPS += libdvdcss/libdvdcss.a
|
||||||
|
COMMON_LIBS += libdvdcss/libdvdcss.a
|
||||||
endif
|
endif
|
||||||
ifeq ($(CONFIG_ASS),yes)
|
ifeq ($(CONFIG_ASS),yes)
|
||||||
COMMON_DEPS += libass/libass.a
|
COMMON_DEPS += libass/libass.a
|
||||||
|
@ -207,6 +210,9 @@ libaf/libaf.a:
|
||||||
libmpdvdkit2/libmpdvdkit.a:
|
libmpdvdkit2/libmpdvdkit.a:
|
||||||
$(MAKE) -C libmpdvdkit2
|
$(MAKE) -C libmpdvdkit2
|
||||||
|
|
||||||
|
libdvdcss/libdvdcss.a:
|
||||||
|
$(MAKE) -C libdvdcss
|
||||||
|
|
||||||
loader/libloader.a:
|
loader/libloader.a:
|
||||||
$(MAKE) -C loader
|
$(MAKE) -C loader
|
||||||
|
|
||||||
|
@ -476,6 +482,7 @@ input/libinput.a: .norecurse $(wildcard input/*.[ch])
|
||||||
libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch])
|
libmenu/libmenu.a: .norecurse $(wildcard libmenu/*.[ch])
|
||||||
libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch])
|
libaf/libaf.a: .norecurse $(wildcard libaf/*.[ch])
|
||||||
libmpdvdkit2/libmpdvdkit.a: .norecurse $(wildcard libmpdvdkit2/*.[ch])
|
libmpdvdkit2/libmpdvdkit.a: .norecurse $(wildcard libmpdvdkit2/*.[ch])
|
||||||
|
libdvdcss/libdvdcss.a: .norecurse $(wildcard libdvdcss/*.[ch])
|
||||||
|
|
||||||
libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])
|
libmpdemux/libmpdemux.a: .norecurse $(wildcard libmpdemux/*.[ch] libmpdemux/*/*.[ch])
|
||||||
stream/stream.a: .norecurse $(wildcard stream/*.[ch] stream/*/*.[ch])
|
stream/stream.a: .norecurse $(wildcard stream/*.[ch] stream/*/*.[ch])
|
||||||
|
|
|
@ -0,0 +1,63 @@
|
||||||
|
|
||||||
|
ifneq ($(wildcard ../config.mak),)
|
||||||
|
include ../config.mak
|
||||||
|
endif
|
||||||
|
|
||||||
|
SRCS = css.c \
|
||||||
|
device.c \
|
||||||
|
error.c \
|
||||||
|
ioctl.c \
|
||||||
|
libdvdcss.c \
|
||||||
|
#bsdi_ioctl \
|
||||||
|
|
||||||
|
OBJS = $(SRCS:.c=.o)
|
||||||
|
|
||||||
|
LIB=libdvdcss
|
||||||
|
|
||||||
|
.SUFFIXES: .c .o
|
||||||
|
|
||||||
|
ifeq ($(OPTFLAGS),)
|
||||||
|
OPTFLAGS = -mcpu=pentium -march=pentium -O4
|
||||||
|
endif
|
||||||
|
|
||||||
|
# \ -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 \
|
||||||
|
-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 $@ $<
|
||||||
|
|
||||||
|
all: $(LIB).a
|
||||||
|
|
||||||
|
$(LIB).a: $(OBJS)
|
||||||
|
$(AR) rc $(LIB).a $(OBJS)
|
||||||
|
$(RANLIB) $(LIB).a
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f *.o *.a *~ *.so
|
||||||
|
|
||||||
|
distclean: clean
|
||||||
|
rm -f .depend
|
||||||
|
|
||||||
|
dep: depend
|
||||||
|
|
||||||
|
depend:
|
||||||
|
$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
|
||||||
|
|
||||||
|
#
|
||||||
|
# include dependency files if they exist
|
||||||
|
#
|
||||||
|
ifneq ($(wildcard .depend),)
|
||||||
|
include .depend
|
||||||
|
endif
|
|
@ -1,48 +0,0 @@
|
||||||
On the origin of the files:
|
|
||||||
==========================
|
|
||||||
|
|
||||||
The code is a mixture of libdvdread and libdvdcss.
|
|
||||||
|
|
||||||
libdvdread 0.9.4:
|
|
||||||
----------------
|
|
||||||
bswap.h
|
|
||||||
dvd_input.c
|
|
||||||
dvd_input.h
|
|
||||||
dvd_reader.c
|
|
||||||
dvd_reader.h
|
|
||||||
dvd_udf.c
|
|
||||||
dvd_udf.h
|
|
||||||
ifo_print.c
|
|
||||||
ifo_print.h
|
|
||||||
ifo_read.c
|
|
||||||
ifo_read.h
|
|
||||||
ifo_types.h
|
|
||||||
md5.c
|
|
||||||
md5.h
|
|
||||||
nav_print.c
|
|
||||||
nav_print.h
|
|
||||||
nav_read.c
|
|
||||||
nav_read.h
|
|
||||||
nav_types.h
|
|
||||||
|
|
||||||
libdvdcss 1.2.9:
|
|
||||||
----------------
|
|
||||||
bsdi_dvd.h
|
|
||||||
bsdi_ioctl.c
|
|
||||||
common.h
|
|
||||||
config.h
|
|
||||||
css.c
|
|
||||||
css.h
|
|
||||||
csstables.h
|
|
||||||
device.c
|
|
||||||
device.h
|
|
||||||
dvdcss/dvdcss.h
|
|
||||||
error.c
|
|
||||||
ioctl.c
|
|
||||||
ioctl.h
|
|
||||||
libdvdcss.c
|
|
||||||
libdvdcss.h
|
|
||||||
|
|
||||||
Additional MPlayer-specific changes are contained in libdvdread_changes.diff
|
|
||||||
and libdvdcss_changes.diff.
|
|
||||||
This file should be updated with each modification of the code.
|
|
|
@ -3,16 +3,11 @@ ifneq ($(wildcard ../config.mak),)
|
||||||
include ../config.mak
|
include ../config.mak
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SRCS = css.c \
|
SRCS = dvd_input.c \
|
||||||
device.c \
|
|
||||||
dvd_input.c \
|
|
||||||
dvd_reader.c \
|
dvd_reader.c \
|
||||||
dvd_udf.c \
|
dvd_udf.c \
|
||||||
error.c \
|
|
||||||
ifo_print.c \
|
ifo_print.c \
|
||||||
ifo_read.c \
|
ifo_read.c \
|
||||||
ioctl.c \
|
|
||||||
libdvdcss.c \
|
|
||||||
nav_print.c \
|
nav_print.c \
|
||||||
nav_read.c \
|
nav_read.c \
|
||||||
md5.c \
|
md5.c \
|
||||||
|
@ -34,18 +29,8 @@ endif
|
||||||
# \ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
# \ -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
||||||
|
|
||||||
# -funroll-loops removed, triggered gcc 3.0.4 (3.x?) bug
|
# -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_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:
|
.c.o:
|
||||||
$(CC) $(CFLAGS) -c -o $@ $<
|
$(CC) $(CFLAGS) -c -o $@ $<
|
||||||
|
|
Loading…
Reference in New Issue