| 12345678910111213141516171819202122232425262728293031323334353637383940414243 |
- diff -up mplayer-export-2010-07-03/configure.nodvdcss mplayer-export-2010-07-03/configure
- --- mplayer-export-2010-07-03/configure.nodvdcss 2010-07-02 18:52:32.000000000 +0200
- +++ mplayer-export-2010-07-03/configure 2010-07-03 18:00:01.000000000 +0200
- @@ -677,7 +677,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-2010-07-03/Makefile.nodvdcss mplayer-export-2010-07-03/Makefile
- --- mplayer-export-2010-07-03/Makefile.nodvdcss 2010-07-03 18:00:01.000000000 +0200
- +++ mplayer-export-2010-07-03/Makefile 2010-07-03 18:00:26.000000000 +0200
- @@ -146,11 +146,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
-
- @@ -764,7 +759,6 @@ DIRS = . \
- libavutil/sh4 \
- libavutil/tomi \
- libavutil/x86 \
- - libdvdcss \
- libdvdnav \
- libdvdnav/vm \
- libdvdread4 \
- @@ -887,7 +881,6 @@ $(call ADDSUFFIXES,.d .o,mpcommon osdep/
-
- gui/%: CFLAGS += -Wno-strict-prototypes
-
- -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)
|
