You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
44 lines
2.2 KiB
44 lines
2.2 KiB
diff -up mplayer-export-2009-02-02/configure.nodvdcss mplayer-export-2009-02-02/configure
|
|
--- mplayer-export-2009-02-02/configure.nodvdcss 2009-02-02 01:15:29.000000000 +0100
|
|
+++ mplayer-export-2009-02-02/configure 2009-02-02 01:15:29.000000000 +0100
|
|
@@ -617,7 +617,7 @@ _dvdnavconfig=dvdnav-config
|
|
_dvdreadconfig=dvdread-config
|
|
_dvdread=auto
|
|
_dvdread_internal=auto
|
|
-_libdvdcss_internal=auto
|
|
+_libdvdcss_internal=no
|
|
_xanim=auto
|
|
_real=auto
|
|
_live=auto
|
|
diff -up mplayer-export-2009-02-02/Makefile.nodvdcss mplayer-export-2009-02-02/Makefile
|
|
--- mplayer-export-2009-02-02/Makefile.nodvdcss 2009-02-02 01:15:29.000000000 +0100
|
|
+++ mplayer-export-2009-02-02/Makefile 2009-02-02 01:15:56.000000000 +0100
|
|
@@ -347,11 +347,6 @@ SRCS_COMMON-$(LIBDCA) +=
|
|
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
|
|
libmpcodecs/vd_libdv.c \
|
|
libmpdemux/demux_rawdv.c
|
|
-SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \
|
|
- libdvdcss/device.c \
|
|
- libdvdcss/error.c \
|
|
- libdvdcss/ioctl.c \
|
|
- libdvdcss/libdvdcss.c \
|
|
|
|
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
|
|
SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \
|
|
@@ -743,7 +738,6 @@ DIRS = . \
|
|
libavcodec/x86 \
|
|
libavformat \
|
|
libavutil \
|
|
- libdvdcss \
|
|
libdvdnav \
|
|
libdvdnav/vm \
|
|
libdvdread4 \
|
|
@@ -851,7 +845,6 @@ codec-cfg.d: codecs.conf.h
|
|
mpcommon.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
|
|
|
|
-libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
|
|
libdvdnav/%.o libdvdnav/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\"
|
|
libdvdread4/%.o libdvdread4/%.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)
|