読者です 読者をやめる 読者になる 読者になる

MPlayer snapshot の nodvdcss パッチ

snapshot 20090110 以降、 RPM Fusion の nodvdcss パッチは当らないので、最新 snapshot 向けに修正してみた。

mplayer-20090122-nodvdcss.patch:

diff -up mplayer-export-2009-01-07/configure.nodvdcss mplayer-export-2009-01-07/configure
--- mplayer-export-2009-01-07/configure.nodvdcss	2009-01-07 00:27:10.000000000 +0100
+++ mplayer-export-2009-01-07/configure	2009-01-07 00:27:10.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
--- mplayer-export-20090122/Makefile.nodvdcss	2009-01-23 01:48:45.000000000 +0900
+++ mplayer-export-20090122/Makefile	2009-01-23 01:50:13.000000000 +0900
@@ -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
 mencoder.d mplayer.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)