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
1.9 KiB
44 lines
1.9 KiB
diff -up mplayer-export-2011-01-10/configure.nodvdcss mplayer-export-2011-01-10/configure
|
|
--- mplayer-export-2011-01-10/configure.nodvdcss 2011-01-06 13:42:59.000000000 +0100
|
|
+++ mplayer-export-2011-01-10/configure 2011-01-10 19:02:59.000000000 +0100
|
|
@@ -689,7 +689,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-2011-01-10/Makefile.nodvdcss mplayer-export-2011-01-10/Makefile
|
|
--- mplayer-export-2011-01-10/Makefile.nodvdcss 2011-01-10 19:02:59.000000000 +0100
|
|
+++ mplayer-export-2011-01-10/Makefile 2011-01-10 19:03:25.000000000 +0100
|
|
@@ -111,11 +111,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
|
|
|
|
@@ -742,7 +737,6 @@ DIRS = . \
|
|
libaf \
|
|
libao2 \
|
|
libass \
|
|
- libdvdcss \
|
|
libdvdnav \
|
|
libdvdnav/vm \
|
|
libdvdread4 \
|
|
@@ -858,7 +852,6 @@ osdep/mplayer-rc.o: osdep/mplayer.exe.ma
|
|
|
|
gui/%: CFLAGS += -Wno-strict-prototypes
|
|
|
|
-libdvdcss/%: CFLAGS := -Ilibdvdcss -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)
|
|
libdvdnav/%: CFLAGS := -Ilibdvdnav -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS)
|
|
libdvdread4/%: CFLAGS := -Ilibdvdread4 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS)
|
|
|