SOURCES: mplayer-ffmpeg.patch - don't expect libavodec/libavformat...

[glen]

Author: glen                         Date: Tue Feb 19 00:04:50 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- don't expect libavodec/libavformat dirs being present, import info from ffmpeg-avconfig

---- Files affected:
SOURCES:
   mplayer-ffmpeg.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mplayer-ffmpeg.patch
diff -u SOURCES/mplayer-ffmpeg.patch:1.1 SOURCES/mplayer-ffmpeg.patch:1.2
--- SOURCES/mplayer-ffmpeg.patch:1.1	Wed Jun 27 00:15:16 2007
+++ SOURCES/mplayer-ffmpeg.patch	Tue Feb 19 01:04:45 2008
@@ -13,3 +13,35 @@
  COMMON_LIBS-$(WIN32DLL)           += loader/libloader.a
  COMMON_LIBS-$(MP3LIB)             += mp3lib/libmp3.a
  COMMON_LIBS-$(LIBA52)             += liba52/liba52.a
+--- MPlayer-1.0rc2/configure~	2008-02-19 01:50:14.000000000 +0200
++++ MPlayer-1.0rc2/configure	2008-02-19 01:50:17.223466682 +0200
+@@ -500,19 +500,22 @@
+ _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]'`
++# XXX this is in wrong place anyway
++ffmpeg_config=false
++test -x /usr/bin/ffmpeg-avconfig && ffmpeg_config=/usr/bin/ffmpeg-avconfig
++_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/LIBFAAD_DECODER// -e s/MPEG4AAC_DECODER//  -e s/LIBA52_DECODER// -e s/LIBGSM_DECODER// -e s/LIBGSM_MS_DECODER// -e s/LIBVORBIS_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 -e s/LIBGSM_ENCODER// -e s/LIBGSM_MS_ENCODER// -e s/LIBTHEORA_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=$_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/AUDIO_BEOS_DEMUXER// -e s/OSS_DEMUXER// -e s/DC1394_DEMUXER// -e s/DV1394_DEMUXER// -e s/REDIR_DEMUXER// -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER// -e s/V4L_DEMUXER// -e s/BKTR_DEMUXER// -e s/X11_GRAB_DEVICE_DEMUXER// -e s/V4L2_DEMUXER// -e s/LIBNUT_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/AUDIO_BEOS_MUXER// -e s/OSS_MUXER// -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]'`
+ _libavcodec_so=auto
+ _libavformat_a=auto
+ _libavformat_so=auto
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mplayer-ffmpeg.patch?r1=1.1&r2=1.2&f=u