projects / packages / mplayer.git / blame
| Commit | Line | Data |
|---|---|---|
| 4632e2df ER |
1 | --- MPlayer-1.1/configure 2013-05-06 16:44:41.394467719 +0300 |
| 2 | +++ MPlayer-1.1.1/configure 2013-05-06 22:22:22.804625607 +0300 | |
| 3 | @@ -626,6 +626,11 @@ | |
| 4 | # GOTCHA: the variables below defines the default behavior for autodetection | |
| 5 | # and have - unless stated otherwise - at least 2 states : yes no | |
| 6 | # If autodetection is available then the third state is: auto | |
| 7 | + | |
| 8 | +# XXX this is in wrong place anyway | |
| 9 | +ffmpeg_config=false | |
| 10 | +test -x /usr/bin/ffmpeg-avconfig && ffmpeg_config=/usr/bin/ffmpeg-avconfig | |
| 11 | + | |
| 12 | _mmx=auto | |
| 13 | _3dnow=auto | |
| 14 | _3dnowext=auto | |
| 15 | @@ -666,22 +671,22 @@ | |
| bc84bb25 KK |
16 | _libopencore_amrnb=auto |
| 17 | _libopencore_amrwb=auto | |
| c65405fc ER |
18 | libopenjpeg=auto |
| 19 | -libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 20 | +libavdecoders_all=$($ffmpeg_config --decoders || sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 21 | libavdecoders=$(echo $libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g') | |
| 22 | -libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 23 | +libavencoders_all=$($ffmpeg_config --encoders || sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 24 | libavencoders=$(echo $libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g') | |
| 25 | -libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 26 | +libavparsers_all=$($ffmpeg_config --parsers || sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 27 | libavparsers=$libavparsers_all | |
| 28 | -libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 29 | +libavbsfs_all=$($ffmpeg_config --bsfs || sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 30 | libavbsfs=$libavbsfs_all | |
| 31 | libavhwaccels_all=$(sed -n 's/^[^#]*HWACCEL.*(.*, *\(.*\)).*/\1_hwaccel/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') | |
| 32 | # Disable all hardware accelerators for now. | |
| 33 | libavhwaccels= | |
| 34 | -libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]') | |
| 35 | +libavdemuxers_all=$($ffmpeg_config --demuxers || sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]') | |
| 36 | libavdemuxers=$(echo $libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/AVISYNTH_DEMUXER//) | |
| 37 | -libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]') | |
| 38 | +libavmuxers_all=$($ffmpeg_config --muxers || sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]') | |
| 39 | libavmuxers=$(echo $libavmuxers_all | sed -e 's/ LIB[A-Z0-9_]*_MUXER//g' -e s/RTP_MUXER// -e s/RTSP_MUXER// -e s/SAP_MUXER//) | |
| 40 | -libavprotocols_all=$(sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]') | |
| 41 | +libavprotocols_all=$($ffmpeg_config --protocols || sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]') | |
| 42 | libavprotocols=$libavprotocols_all | |
| 43 | libavprotocols=$(echo $libavprotocols | sed -e s/HTTPS_PROTOCOL// -e s/TLS_PROTOCOL// -e s/BLURAY_PROTOCOL//) | |
| 44 | libavfilters_all=$(sed -n 's/^[^#]*FILTER.*(.*, *\(.*\),.*).*/\1_filter/p' ffmpeg/libavfilter/allfilters.c | tr '[a-z]' '[A-Z]') | |
| 45 | --- MPlayer-1.1/Makefile~ 2013-05-06 16:37:01.000000000 +0300 | |
| 46 | +++ MPlayer-1.1/Makefile 2013-05-06 16:45:59.221182150 +0300 | |
| 47 | @@ -689,7 +689,7 @@ | |
| 48 | $(SRCS_MENCODER-yes) | |
| bc84bb25 | 49 | |
| c65405fc ER |
50 | # (linking) order matters for these libraries |
| 51 | -FFMPEGPARTS_ALL = libpostproc libavfilter libavformat libavcodec libswscale libswresample libavutil | |
| 52 | +FFMPEGPARTS_ALL = | |
| 53 | FFMPEGPARTS = $(foreach part, $(FFMPEGPARTS_ALL), $(if $(wildcard ffmpeg/$(part)), $(part))) | |
| 54 | FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), ffmpeg/$(part)/$(part).a) | |
| 55 | FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(addprefix ffmpeg/$(part)/,*.[chS] /*/*.[chS] /*/*.asm))) |