packages: mplayer/mplayer-ffmpeg.patch - rework old patch against new mplayer
evil
evil at pld-linux.org
Wed Jan 13 00:06:41 CET 2010
Author: evil Date: Tue Jan 12 23:06:41 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rework old patch against new mplayer
---- Files affected:
packages/mplayer:
mplayer-ffmpeg.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/mplayer/mplayer-ffmpeg.patch
diff -u packages/mplayer/mplayer-ffmpeg.patch:1.3 packages/mplayer/mplayer-ffmpeg.patch:1.4
--- packages/mplayer/mplayer-ffmpeg.patch:1.3 Mon Nov 24 10:08:02 2008
+++ packages/mplayer/mplayer-ffmpeg.patch Wed Jan 13 00:06:35 2010
@@ -1,76 +1,42 @@
---- mplayer-1.0_rc2_p27725/Makefile~ 2008-11-23 21:44:23.000000000 +0200
-+++ mplayer-1.0_rc2_p27725/Makefile 2008-11-23 21:46:59.771508333 +0200
-@@ -632,11 +632,11 @@
- SRCS_MENCODER += $(SRCS_MENCODER-yes)
- SRCS_MPLAYER += $(SRCS_MPLAYER-yes)
-
--COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a
--COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a
--COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a
--COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a
--COMMON_LIBS-$(LIBSWSCALE_A) += libswscale/libswscale.a
-+COMMON_LIBS += -lavformat
-+COMMON_LIBS += -lavcodec
-+COMMON_LIBS += -lavutil
-+COMMON_LIBS += -lpostproc
-+COMMON_LIBS += -lswscale
- COMMON_LIBS += $(COMMON_LIBS-yes)
-
- OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)))
-@@ -677,8 +677,6 @@
- libavcodec/ppc \
- libavcodec/sh4 \
- libavcodec/sparc \
-- libavformat \
-- libavutil \
- libdvdcss \
- libdvdread \
- libfaad2 \
-@@ -687,8 +685,6 @@
- libmpcodecs/native \
- libmpdemux \
- libmpeg2 \
-- libpostproc \
-- libswscale \
- libvo \
- loader \
- loader/dshow \
---- mplayer-1.0_rc2_p27725/configure~ 2008-11-23 21:44:23.000000000 +0200
-+++ mplayer-1.0_rc2_p27725/configure 2008-11-23 22:17:38.950927616 +0200
-@@ -468,6 +468,9 @@
- exit 0
- } #show_help()
-
-+ffmpeg_config=false
-+test -x /usr/bin/ffmpeg-avconfig && ffmpeg_config=/usr/bin/ffmpeg-avconfig
-+
- # GOTCHA: the variables below defines the default behavior for autodetection
- # and have - unless stated otherwise - at least 2 states : yes no
- # If autodetection is available then the third state is: auto
-@@ -501,19 +504,19 @@
+--- mplayer-r29930/configure.orig 2010-01-12 22:58:31.541952835 +0100
++++ mplayer-r29930/configure 2010-01-12 23:50:32.521942542 +0100
+@@ -544,19 +544,19 @@
_libavcodec_a=auto
- _libamr_nb=auto
- _libamr_wb=auto
--_libavdecoders_all=`sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
-+_libavdecoders_all=`$ffmpeg_config --decoders || sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
- _libavdecoders=` echo $_libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/MPEG4AAC_DECODER// `
--_libavencoders_all=`sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
-+_libavencoders_all=`$ffmpeg_config --encoders || sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
- _libavencoders=` echo $_libavencoders_all | sed 's/ LIB[A-Z0-9_]*_ENCODER//g'`
--_libavparsers_all=`sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
-+_libavparsers_all=`$ffmpeg_config --parsers || sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
+ _libopencore_amrnb=auto
+ _libopencore_amrwb=auto
+-_libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
++_libavdecoders_all=$(s$ffmpeg_config --decoders || sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
+ _libavdecoders=$(echo $_libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/MPEG4AAC_DECODER//)
+-_libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
++_libavencoders_all=$(s$ffmpeg_config --encoders || sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
+ _libavencoders=$(echo $_libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g' -e s/AAC_ENCODER//)
+-_libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
++_libavparsers_all=$($ffmpeg_config --parsers || sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
_libavparsers=$_libavparsers_all
--_libavbsfs_all=`sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
-+_libavbsfs_all=`$ffmpeg_config --bsfs || sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`
+-_libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
++_libavbsfs_all=$($ffmpeg_config --bsfs || sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
_libavbsfs=$_libavbsfs_all
--_libavdemuxers_all=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
-+_libavdemuxers_all=`$ffmpeg_config --demuxers || sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
- _libavdemuxers=`echo $_libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER// -e s/AVISYNTH_DEMUXER// `
--_libavmuxers_all=`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
-+libavmuxers_all=`$ffmpeg_config --muxers || sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
- _libavmuxers=`echo $_libavmuxers_all | sed -e 's/ LIB[A-Z0-9_]*_MUXER//g' -e s/RTP_MUXER// `
--_libavprotocols_all=`sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
-+_libavprotocols_all=`$ffmpeg_config --protocols || sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`
+-_libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
++_libavdemuxers_all=$($ffmpeg_config --demuxers || sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
+ _libavdemuxers=$(echo $_libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER// -e s/AVISYNTH_DEMUXER//)
+-_libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
++_libavmuxers_all=$($ffmpeg_config --muxers || sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
+ _libavmuxers=$(echo $_libavmuxers_all | sed -e 's/ LIB[A-Z0-9_]*_MUXER//g' -e s/RTP_MUXER//)
+-_libavprotocols_all=$(sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
++_libavprotocols_all=$($ffmpeg_config --protocols || sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]')
+ _libavprotocols=""
_libavcodec_so=auto
_libavformat_a=auto
- _libavformat_so=auto
+--- mplayer-r29930/Makefile.orig 2010-01-12 22:58:23.544432761 +0100
++++ mplayer-r29930/Makefile 2010-01-12 23:10:19.701953264 +0100
+@@ -792,10 +792,6 @@
+ ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1))
+
+ FFMPEGPARTS = libavcodec \
+- libavformat \
+- libavutil \
+- libpostproc \
+- libswscale \
+
+ FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), $(part)/$(part).a)
+ FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(part)/*.[chS] $(part)/*/*.[chS]))
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer-ffmpeg.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list