[1306] | 1 | diff -up mplayer-export-2010-07-03/configure.nodvdcss mplayer-export-2010-07-03/configure |
---|
| 2 | --- mplayer-export-2010-07-03/configure.nodvdcss 2010-07-02 18:52:32.000000000 +0200 |
---|
| 3 | +++ mplayer-export-2010-07-03/configure 2010-07-03 18:00:01.000000000 +0200 |
---|
| 4 | @@ -677,7 +677,7 @@ _dvdnavconfig=dvdnav-config |
---|
| 5 | _dvdreadconfig=dvdread-config |
---|
| 6 | _dvdread=auto |
---|
| 7 | _dvdread_internal=auto |
---|
| 8 | -_libdvdcss_internal=auto |
---|
| 9 | +_libdvdcss_internal=no |
---|
| 10 | _xanim=auto |
---|
| 11 | _real=auto |
---|
| 12 | _live=auto |
---|
| 13 | diff -up mplayer-export-2010-07-03/Makefile.nodvdcss mplayer-export-2010-07-03/Makefile |
---|
| 14 | --- mplayer-export-2010-07-03/Makefile.nodvdcss 2010-07-03 18:00:01.000000000 +0200 |
---|
| 15 | +++ mplayer-export-2010-07-03/Makefile 2010-07-03 18:00:26.000000000 +0200 |
---|
| 16 | @@ -146,11 +146,6 @@ SRCS_COMMON-$(LIBDCA) += |
---|
| 17 | SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ |
---|
| 18 | libmpcodecs/vd_libdv.c \ |
---|
| 19 | libmpdemux/demux_rawdv.c |
---|
| 20 | -SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \ |
---|
| 21 | - libdvdcss/device.c \ |
---|
| 22 | - libdvdcss/error.c \ |
---|
| 23 | - libdvdcss/ioctl.c \ |
---|
| 24 | - libdvdcss/libdvdcss.c \ |
---|
| 25 | |
---|
| 26 | SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c |
---|
| 27 | |
---|
| 28 | @@ -764,7 +759,6 @@ DIRS = . \ |
---|
| 29 | libavutil/sh4 \ |
---|
| 30 | libavutil/tomi \ |
---|
| 31 | libavutil/x86 \ |
---|
| 32 | - libdvdcss \ |
---|
| 33 | libdvdnav \ |
---|
| 34 | libdvdnav/vm \ |
---|
| 35 | libdvdread4 \ |
---|
| 36 | @@ -887,7 +881,6 @@ $(call ADDSUFFIXES,.d .o,mpcommon osdep/ |
---|
| 37 | |
---|
| 38 | gui/%: CFLAGS += -Wno-strict-prototypes |
---|
| 39 | |
---|
| 40 | -libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS) |
---|
| 41 | libdvdnav/%: CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS) |
---|
| 42 | libdvdread4/%: CFLAGS := -Ilibdvdread4 -D__USE_UNIX98 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS) |
---|
| 43 | libfaad2/%: CFLAGS := -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS) |
---|