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-10-29/configure.nodvdcss mplayer-export-2009-10-29/configure
|
|
--- mplayer-export-2009-10-29/configure.nodvdcss 2009-10-28 14:55:18.000000000 +0100
|
|
+++ mplayer-export-2009-10-29/configure 2009-10-30 00:36:25.000000000 +0100
|
|
@@ -639,7 +639,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-10-29/Makefile.nodvdcss mplayer-export-2009-10-29/Makefile
|
|
--- mplayer-export-2009-10-29/Makefile.nodvdcss 2009-10-19 11:56:18.000000000 +0200
|
|
+++ mplayer-export-2009-10-29/Makefile 2009-10-30 00:37:10.000000000 +0100
|
|
@@ -150,11 +150,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
|
|
|
|
@@ -752,7 +747,6 @@ DIRS = . \
|
|
libavutil/ppc \
|
|
libavutil/sh4 \
|
|
libavutil/x86 \
|
|
- libdvdcss \
|
|
libdvdnav \
|
|
libdvdnav/vm \
|
|
libdvdread4 \
|
|
@@ -871,7 +865,6 @@ codec-cfg.d codec-cfg.o: codecs.conf.h
|
|
$(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
|
|
$(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui): version.h
|
|
|
|
-libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)
|
|
libdvdnav/%: CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS)
|
|
libdvdread4/%: CFLAGS := -Ilibdvdread4 -D__USE_UNIX98 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS)
|
|
libfaad2/%: CFLAGS := -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS)
|