* [PATCH 0/6] Update ffmepg and the packages that use it
@ 2016-11-13 19:23 Marcel Lorenz
2016-11-13 19:23 ` [PATCH 1/6] ffmpeg and ffmpeg-libs: update 3.1.4 Marcel Lorenz
` (5 more replies)
0 siblings, 6 replies; 15+ messages in thread
From: Marcel Lorenz @ 2016-11-13 19:23 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
The next series of patches updates ffmpeg an all packges
they wont build after update ffmpeg.
ffmpeg and ffmpeg-libs: update 3.1.4
motion: update to 4.0.1
xvid: update to 1.3.4
minidlna: update to 1.1.5
apcupsd: update to 3.14.14
mpd: update to 0.19.19
--
2.9.3
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 1/6] ffmpeg and ffmpeg-libs: update 3.1.4 2016-11-13 19:23 [PATCH 0/6] Update ffmepg and the packages that use it Marcel Lorenz @ 2016-11-13 19:23 ` Marcel Lorenz 2016-11-13 19:23 ` [PATCH 2/6] motion: update to 4.0.1 Marcel Lorenz ` (4 subsequent siblings) 5 siblings, 0 replies; 15+ messages in thread From: Marcel Lorenz @ 2016-11-13 19:23 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 23031 bytes --] Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/packages/ffmpeg | 230 ++++++++++++++++++++++++++---- config/rootfiles/packages/ffmpeg-libs | 260 ++++++++++++++++++++++++++-------- lfs/ffmpeg | 29 ++-- lfs/ffmpeg-libs | 6 +- 4 files changed, 424 insertions(+), 101 deletions(-) diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg index d403ca1..aa7a96d 100644 --- a/config/rootfiles/packages/ffmpeg +++ b/config/rootfiles/packages/ffmpeg @@ -1,64 +1,240 @@ usr/bin/ffmpeg usr/bin/ffplay +usr/bin/ffprobe usr/bin/ffserver #usr/include/libavcodec #usr/include/libavcodec/avcodec.h -#usr/include/libavcodec/opt.h +#usr/include/libavcodec/avdct.h +#usr/include/libavcodec/avfft.h +#usr/include/libavcodec/d3d11va.h +#usr/include/libavcodec/dirac.h +#usr/include/libavcodec/dv_profile.h +#usr/include/libavcodec/dxva2.h +#usr/include/libavcodec/jni.h +#usr/include/libavcodec/qsv.h +#usr/include/libavcodec/vaapi.h +#usr/include/libavcodec/vda.h +#usr/include/libavcodec/vdpau.h +#usr/include/libavcodec/version.h +#usr/include/libavcodec/videotoolbox.h +#usr/include/libavcodec/vorbis_parser.h +#usr/include/libavcodec/xvmc.h #usr/include/libavdevice #usr/include/libavdevice/avdevice.h +#usr/include/libavdevice/version.h +#usr/include/libavfilter +#usr/include/libavfilter/avfilter.h +#usr/include/libavfilter/avfiltergraph.h +#usr/include/libavfilter/buffersink.h +#usr/include/libavfilter/buffersrc.h +#usr/include/libavfilter/version.h #usr/include/libavformat #usr/include/libavformat/avformat.h #usr/include/libavformat/avio.h -#usr/include/libavformat/rtsp.h -#usr/include/libavformat/rtspcodes.h +#usr/include/libavformat/version.h #usr/include/libavutil #usr/include/libavutil/adler32.h +#usr/include/libavutil/aes.h +#usr/include/libavutil/aes_ctr.h +#usr/include/libavutil/attributes.h +#usr/include/libavutil/audio_fifo.h +#usr/include/libavutil/avassert.h +#usr/include/libavutil/avconfig.h #usr/include/libavutil/avstring.h #usr/include/libavutil/avutil.h #usr/include/libavutil/base64.h +#usr/include/libavutil/blowfish.h +#usr/include/libavutil/bprint.h +#usr/include/libavutil/bswap.h +#usr/include/libavutil/buffer.h +#usr/include/libavutil/camellia.h +#usr/include/libavutil/cast5.h +#usr/include/libavutil/channel_layout.h #usr/include/libavutil/common.h +#usr/include/libavutil/cpu.h #usr/include/libavutil/crc.h +#usr/include/libavutil/des.h +#usr/include/libavutil/dict.h +#usr/include/libavutil/display.h +#usr/include/libavutil/downmix_info.h +#usr/include/libavutil/error.h +#usr/include/libavutil/eval.h +#usr/include/libavutil/ffversion.h #usr/include/libavutil/fifo.h -#usr/include/libavutil/intfloat_readwrite.h +#usr/include/libavutil/file.h +#usr/include/libavutil/frame.h +#usr/include/libavutil/hash.h +#usr/include/libavutil/hmac.h +#usr/include/libavutil/hwcontext.h +#usr/include/libavutil/hwcontext_cuda.h +#usr/include/libavutil/hwcontext_dxva2.h +#usr/include/libavutil/hwcontext_vaapi.h +#usr/include/libavutil/hwcontext_vdpau.h +#usr/include/libavutil/imgutils.h +#usr/include/libavutil/intfloat.h +#usr/include/libavutil/intreadwrite.h +#usr/include/libavutil/lfg.h #usr/include/libavutil/log.h #usr/include/libavutil/lzo.h +#usr/include/libavutil/macros.h +#usr/include/libavutil/mastering_display_metadata.h #usr/include/libavutil/mathematics.h #usr/include/libavutil/md5.h #usr/include/libavutil/mem.h -#usr/include/libavutil/random.h +#usr/include/libavutil/motion_vector.h +#usr/include/libavutil/murmur3.h +#usr/include/libavutil/opt.h +#usr/include/libavutil/parseutils.h +#usr/include/libavutil/pixdesc.h +#usr/include/libavutil/pixelutils.h +#usr/include/libavutil/pixfmt.h +#usr/include/libavutil/random_seed.h #usr/include/libavutil/rational.h -#usr/include/libavutil/sha1.h +#usr/include/libavutil/rc4.h +#usr/include/libavutil/replaygain.h +#usr/include/libavutil/ripemd.h +#usr/include/libavutil/samplefmt.h +#usr/include/libavutil/sha.h +#usr/include/libavutil/sha512.h +#usr/include/libavutil/stereo3d.h +#usr/include/libavutil/tea.h +#usr/include/libavutil/threadmessage.h +#usr/include/libavutil/time.h +#usr/include/libavutil/timecode.h +#usr/include/libavutil/timestamp.h +#usr/include/libavutil/tree.h +#usr/include/libavutil/twofish.h +#usr/include/libavutil/version.h +#usr/include/libavutil/xtea.h +#usr/include/libpostproc +#usr/include/libpostproc/postprocess.h +#usr/include/libpostproc/version.h +#usr/include/libswresample +#usr/include/libswresample/swresample.h +#usr/include/libswresample/version.h +#usr/include/libswscale +#usr/include/libswscale/swscale.h +#usr/include/libswscale/version.h #usr/lib/libavcodec.a #usr/lib/libavcodec.so -#usr/lib/libavcodec.so.51 -#usr/lib/libavcodec.so.51.54.0 +#usr/lib/libavcodec.so.57 +#usr/lib/libavcodec.so.57.48.101 #usr/lib/libavdevice.a #usr/lib/libavdevice.so -#usr/lib/libavdevice.so.52 -#usr/lib/libavdevice.so.52.0.0 +#usr/lib/libavdevice.so.57 +#usr/lib/libavdevice.so.57.0.101 +#usr/lib/libavfilter.a +#usr/lib/libavfilter.so +#usr/lib/libavfilter.so.6 +#usr/lib/libavfilter.so.6.47.100 #usr/lib/libavformat.a #usr/lib/libavformat.so -#usr/lib/libavformat.so.52 -#usr/lib/libavformat.so.52.13.0 +#usr/lib/libavformat.so.57 +#usr/lib/libavformat.so.57.41.100 #usr/lib/libavutil.a #usr/lib/libavutil.so -#usr/lib/libavutil.so.49 -#usr/lib/libavutil.so.49.6.0 -#usr/lib/pkgconfig +#usr/lib/libavutil.so.55 +#usr/lib/libavutil.so.55.28.100 +#usr/lib/libpostproc.a +#usr/lib/libpostproc.so +#usr/lib/libpostproc.so.54 +#usr/lib/libpostproc.so.54.0.100 +#usr/lib/libswresample.a +#usr/lib/libswresample.so +#usr/lib/libswresample.so.2 +#usr/lib/libswresample.so.2.1.100 +#usr/lib/libswscale.a +#usr/lib/libswscale.so +#usr/lib/libswscale.so.4 +#usr/lib/libswscale.so.4.1.100 #usr/lib/pkgconfig/libavcodec.pc #usr/lib/pkgconfig/libavdevice.pc +#usr/lib/pkgconfig/libavfilter.pc #usr/lib/pkgconfig/libavformat.pc #usr/lib/pkgconfig/libavutil.pc -#usr/lib/vhook -#usr/lib/vhook/drawtext.so -#usr/lib/vhook/fish.so -#usr/lib/vhook/null.so -#usr/lib/vhook/ppm.so -#usr/lib/vhook/watermark.so -#usr/include/libpostproc -#usr/include/libpostproc/postprocess.h -#usr/lib/libpostproc.a -#usr/lib/libpostproc.so -#usr/lib/libpostproc.so.51 -#usr/lib/libpostproc.so.51.1.0 #usr/lib/pkgconfig/libpostproc.pc +#usr/lib/pkgconfig/libswresample.pc +#usr/lib/pkgconfig/libswscale.pc +#usr/share/doc/ffmpeg +#usr/share/doc/ffmpeg/developer.html +#usr/share/doc/ffmpeg/faq.html +#usr/share/doc/ffmpeg/fate.html +#usr/share/doc/ffmpeg/ffmpeg-all.html +#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html +#usr/share/doc/ffmpeg/ffmpeg-codecs.html +#usr/share/doc/ffmpeg/ffmpeg-devices.html +#usr/share/doc/ffmpeg/ffmpeg-filters.html +#usr/share/doc/ffmpeg/ffmpeg-formats.html +#usr/share/doc/ffmpeg/ffmpeg-protocols.html +#usr/share/doc/ffmpeg/ffmpeg-resampler.html +#usr/share/doc/ffmpeg/ffmpeg-scaler.html +#usr/share/doc/ffmpeg/ffmpeg-utils.html +#usr/share/doc/ffmpeg/ffmpeg.html +#usr/share/doc/ffmpeg/ffplay-all.html +#usr/share/doc/ffmpeg/ffplay.html +#usr/share/doc/ffmpeg/ffprobe-all.html +#usr/share/doc/ffmpeg/ffprobe.html +#usr/share/doc/ffmpeg/ffserver-all.html +#usr/share/doc/ffmpeg/ffserver.html +#usr/share/doc/ffmpeg/general.html +#usr/share/doc/ffmpeg/git-howto.html +#usr/share/doc/ffmpeg/libavcodec.html +#usr/share/doc/ffmpeg/libavdevice.html +#usr/share/doc/ffmpeg/libavfilter.html +#usr/share/doc/ffmpeg/libavformat.html +#usr/share/doc/ffmpeg/libavutil.html +#usr/share/doc/ffmpeg/libswresample.html +#usr/share/doc/ffmpeg/libswscale.html +#usr/share/doc/ffmpeg/nut.html +#usr/share/doc/ffmpeg/platform.html +#usr/share/ffmpeg +#usr/share/ffmpeg/examples +#usr/share/ffmpeg/examples/Makefile +#usr/share/ffmpeg/examples/README +#usr/share/ffmpeg/examples/avio_dir_cmd.c +#usr/share/ffmpeg/examples/avio_reading.c +#usr/share/ffmpeg/examples/decoding_encoding.c +#usr/share/ffmpeg/examples/demuxing_decoding.c +#usr/share/ffmpeg/examples/extract_mvs.c +#usr/share/ffmpeg/examples/filter_audio.c +#usr/share/ffmpeg/examples/filtering_audio.c +#usr/share/ffmpeg/examples/filtering_video.c +#usr/share/ffmpeg/examples/http_multiclient.c +#usr/share/ffmpeg/examples/metadata.c +#usr/share/ffmpeg/examples/muxing.c +#usr/share/ffmpeg/examples/qsvdec.c +#usr/share/ffmpeg/examples/remuxing.c +#usr/share/ffmpeg/examples/resampling_audio.c +#usr/share/ffmpeg/examples/scaling_video.c +#usr/share/ffmpeg/examples/transcode_aac.c +#usr/share/ffmpeg/examples/transcoding.c +#usr/share/ffmpeg/ffprobe.xsd +#usr/share/ffmpeg/libvpx-1080p.ffpreset +#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset +#usr/share/ffmpeg/libvpx-360p.ffpreset +#usr/share/ffmpeg/libvpx-720p.ffpreset +#usr/share/ffmpeg/libvpx-720p50_60.ffpreset +#usr/share/man/man1/ffmpeg-all.1 +#usr/share/man/man1/ffmpeg-bitstream-filters.1 +#usr/share/man/man1/ffmpeg-codecs.1 +#usr/share/man/man1/ffmpeg-devices.1 +#usr/share/man/man1/ffmpeg-filters.1 +#usr/share/man/man1/ffmpeg-formats.1 +#usr/share/man/man1/ffmpeg-protocols.1 +#usr/share/man/man1/ffmpeg-resampler.1 +#usr/share/man/man1/ffmpeg-scaler.1 +#usr/share/man/man1/ffmpeg-utils.1 +#usr/share/man/man1/ffmpeg.1 +#usr/share/man/man1/ffplay-all.1 +#usr/share/man/man1/ffplay.1 +#usr/share/man/man1/ffprobe-all.1 +#usr/share/man/man1/ffprobe.1 +#usr/share/man/man1/ffserver-all.1 +#usr/share/man/man1/ffserver.1 +#usr/share/man/man3/libavcodec.3 +#usr/share/man/man3/libavdevice.3 +#usr/share/man/man3/libavfilter.3 +#usr/share/man/man3/libavformat.3 +#usr/share/man/man3/libavutil.3 +#usr/share/man/man3/libswresample.3 +#usr/share/man/man3/libswscale.3 diff --git a/config/rootfiles/packages/ffmpeg-libs b/config/rootfiles/packages/ffmpeg-libs index a58dcd5..1f401ec 100644 --- a/config/rootfiles/packages/ffmpeg-libs +++ b/config/rootfiles/packages/ffmpeg-libs @@ -1,64 +1,212 @@ #usr/bin/ffmpeg #usr/bin/ffplay #usr/bin/ffserver -#usr/include/libavcodec -#usr/include/libavcodec/avcodec.h -#usr/include/libavcodec/opt.h -#usr/include/libavdevice -#usr/include/libavdevice/avdevice.h -#usr/include/libavformat -#usr/include/libavformat/avformat.h -#usr/include/libavformat/avio.h -#usr/include/libavformat/rtsp.h -#usr/include/libavformat/rtspcodes.h -#usr/include/libavutil -#usr/include/libavutil/adler32.h -#usr/include/libavutil/avstring.h -#usr/include/libavutil/avutil.h -#usr/include/libavutil/base64.h -#usr/include/libavutil/common.h -#usr/include/libavutil/crc.h -#usr/include/libavutil/fifo.h -#usr/include/libavutil/intfloat_readwrite.h -#usr/include/libavutil/log.h -#usr/include/libavutil/lzo.h -#usr/include/libavutil/mathematics.h -#usr/include/libavutil/md5.h -#usr/include/libavutil/mem.h -#usr/include/libavutil/random.h -#usr/include/libavutil/rational.h -#usr/include/libavutil/sha1.h +#usr/bin/ffprobe +#usr/include/libavcodec/avdct.h +#usr/include/libavcodec/avfft.h +#usr/include/libavcodec/d3d11va.h +#usr/include/libavcodec/dirac.h +#usr/include/libavcodec/dv_profile.h +#usr/include/libavcodec/dxva2.h +#usr/include/libavcodec/jni.h +#usr/include/libavcodec/qsv.h +#usr/include/libavcodec/vaapi.h +#usr/include/libavcodec/vda.h +#usr/include/libavcodec/vdpau.h +#usr/include/libavcodec/version.h +#usr/include/libavcodec/videotoolbox.h +#usr/include/libavcodec/vorbis_parser.h +#usr/include/libavcodec/xvmc.h +#usr/include/libavdevice/version.h +#usr/include/libavfilter +#usr/include/libavfilter/avfilter.h +#usr/include/libavfilter/avfiltergraph.h +#usr/include/libavfilter/buffersink.h +#usr/include/libavfilter/buffersrc.h +#usr/include/libavfilter/version.h +#usr/include/libavformat/version.h +#usr/include/libavutil/aes.h +#usr/include/libavutil/aes_ctr.h +#usr/include/libavutil/attributes.h +#usr/include/libavutil/audio_fifo.h +#usr/include/libavutil/avassert.h +#usr/include/libavutil/avconfig.h +#usr/include/libavutil/blowfish.h +#usr/include/libavutil/bprint.h +#usr/include/libavutil/bswap.h +#usr/include/libavutil/buffer.h +#usr/include/libavutil/camellia.h +#usr/include/libavutil/cast5.h +#usr/include/libavutil/channel_layout.h +#usr/include/libavutil/cpu.h +#usr/include/libavutil/des.h +#usr/include/libavutil/dict.h +#usr/include/libavutil/display.h +#usr/include/libavutil/downmix_info.h +#usr/include/libavutil/error.h +#usr/include/libavutil/eval.h +#usr/include/libavutil/ffversion.h +#usr/include/libavutil/file.h +#usr/include/libavutil/frame.h +#usr/include/libavutil/hash.h +#usr/include/libavutil/hmac.h +#usr/include/libavutil/hwcontext.h +#usr/include/libavutil/hwcontext_cuda.h +#usr/include/libavutil/hwcontext_dxva2.h +#usr/include/libavutil/hwcontext_vaapi.h +#usr/include/libavutil/hwcontext_vdpau.h +#usr/include/libavutil/imgutils.h +#usr/include/libavutil/intfloat.h +#usr/include/libavutil/intreadwrite.h +#usr/include/libavutil/lfg.h +#usr/include/libavutil/macros.h +#usr/include/libavutil/mastering_display_metadata.h +#usr/include/libavutil/motion_vector.h +#usr/include/libavutil/murmur3.h +#usr/include/libavutil/opt.h +#usr/include/libavutil/parseutils.h +#usr/include/libavutil/pixdesc.h +#usr/include/libavutil/pixelutils.h +#usr/include/libavutil/pixfmt.h +#usr/include/libavutil/random_seed.h +#usr/include/libavutil/rc4.h +#usr/include/libavutil/replaygain.h +#usr/include/libavutil/ripemd.h +#usr/include/libavutil/samplefmt.h +#usr/include/libavutil/sha.h +#usr/include/libavutil/sha512.h +#usr/include/libavutil/stereo3d.h +#usr/include/libavutil/tea.h +#usr/include/libavutil/threadmessage.h +#usr/include/libavutil/time.h +#usr/include/libavutil/timecode.h +#usr/include/libavutil/timestamp.h +#usr/include/libavutil/tree.h +#usr/include/libavutil/twofish.h +#usr/include/libavutil/version.h +#usr/include/libavutil/xtea.h +#usr/include/libpostproc/version.h +#usr/include/libswresample +#usr/include/libswresample/swresample.h +#usr/include/libswresample/version.h +#usr/include/libswscale +#usr/include/libswscale/swscale.h +#usr/include/libswscale/version.h, #usr/lib/libavcodec.a -usr/lib/libavcodec.so -usr/lib/libavcodec.so.51 -usr/lib/libavcodec.so.51.54.0 +#usr/lib/libavcodec.so +usr/lib/libavcodec.so.57 +usr/lib/libavcodec.so.57.48.101 #usr/lib/libavdevice.a -usr/lib/libavdevice.so -usr/lib/libavdevice.so.52 -usr/lib/libavdevice.so.52.0.0 +#usr/lib/libavdevice.so +usr/lib/libavdevice.so.57 +usr/lib/libavdevice.so.57.0.101 +#usr/lib/libavfilter.a +#usr/lib/libavfilter.so +usr/lib/libavfilter.so.6 +usr/lib/libavfilter.so.6.47.100 #usr/lib/libavformat.a -usr/lib/libavformat.so -usr/lib/libavformat.so.52 -usr/lib/libavformat.so.52.13.0 +#usr/lib/libavformat.so +usr/lib/libavformat.so.57 +usr/lib/libavformat.so.57.41.100 #usr/lib/libavutil.a -usr/lib/libavutil.so -usr/lib/libavutil.so.49 -usr/lib/libavutil.so.49.6.0 -#usr/lib/pkgconfig -usr/lib/pkgconfig/libavcodec.pc -usr/lib/pkgconfig/libavdevice.pc -usr/lib/pkgconfig/libavformat.pc -usr/lib/pkgconfig/libavutil.pc -#usr/lib/vhook -usr/lib/vhook/drawtext.so -usr/lib/vhook/fish.so -usr/lib/vhook/null.so -usr/lib/vhook/ppm.so -usr/lib/vhook/watermark.so -#usr/include/libpostproc -#usr/include/libpostproc/postprocess.h +#usr/lib/libavutil.so +usr/lib/libavutil.so.55 +usr/lib/libavutil.so.55.28.100 #usr/lib/libpostproc.a -usr/lib/libpostproc.so -usr/lib/libpostproc.so.51 -usr/lib/libpostproc.so.51.1.0 -usr/lib/pkgconfig/libpostproc.pc +#usr/lib/libpostproc.so +usr/lib/libpostproc.so.54 +usr/lib/libpostproc.so.54.0.100 +#usr/lib/libswresample.a +#usr/lib/libswresample.so +usr/lib/libswresample.so.2 +usr/lib/libswresample.so.2.1.100 +#usr/lib/libswscale.a +#usr/lib/libswscale.so +usr/lib/libswscale.so.4 +usr/lib/libswscale.so.4.1.100 +#usr/lib/pkgconfig/libavfilter.pc +#usr/lib/pkgconfig/libswresample.pc +#usr/lib/pkgconfig/libswscale.pc +#usr/share/doc/ffmpeg +#usr/share/doc/ffmpeg/developer.html +#usr/share/doc/ffmpeg/faq.html +#usr/share/doc/ffmpeg/fate.html +#usr/share/doc/ffmpeg/ffmpeg-all.html +#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html +#usr/share/doc/ffmpeg/ffmpeg-codecs.html +#usr/share/doc/ffmpeg/ffmpeg-devices.html +#usr/share/doc/ffmpeg/ffmpeg-filters.html +#usr/share/doc/ffmpeg/ffmpeg-formats.html +#usr/share/doc/ffmpeg/ffmpeg-protocols.html +#usr/share/doc/ffmpeg/ffmpeg-resampler.html +#usr/share/doc/ffmpeg/ffmpeg-scaler.html +#usr/share/doc/ffmpeg/ffmpeg-utils.html +#usr/share/doc/ffmpeg/ffmpeg.html +#usr/share/doc/ffmpeg/ffplay-all.html +#usr/share/doc/ffmpeg/ffplay.html +#usr/share/doc/ffmpeg/ffprobe-all.html +#usr/share/doc/ffmpeg/ffprobe.html +#usr/share/doc/ffmpeg/ffserver-all.html +#usr/share/doc/ffmpeg/ffserver.html +#usr/share/doc/ffmpeg/general.html +#usr/share/doc/ffmpeg/git-howto.html +#usr/share/doc/ffmpeg/libavcodec.html +#usr/share/doc/ffmpeg/libavdevice.html +#usr/share/doc/ffmpeg/libavfilter.html +#usr/share/doc/ffmpeg/libavformat.html +#usr/share/doc/ffmpeg/libavutil.html +#usr/share/doc/ffmpeg/libswresample.html +#usr/share/doc/ffmpeg/libswscale.html +#usr/share/doc/ffmpeg/nut.html +#usr/share/doc/ffmpeg/platform.html +#usr/share/ffmpeg +#usr/share/ffmpeg/examples +#usr/share/ffmpeg/examples/Makefile +#usr/share/ffmpeg/examples/README +#usr/share/ffmpeg/examples/avio_dir_cmd.c +#usr/share/ffmpeg/examples/avio_reading.c +#usr/share/ffmpeg/examples/decoding_encoding.c +#usr/share/ffmpeg/examples/demuxing_decoding.c +#usr/share/ffmpeg/examples/extract_mvs.c +#usr/share/ffmpeg/examples/filter_audio.c +#usr/share/ffmpeg/examples/filtering_audio.c +#usr/share/ffmpeg/examples/filtering_video.c +#usr/share/ffmpeg/examples/http_multiclient.c +#usr/share/ffmpeg/examples/metadata.c +#usr/share/ffmpeg/examples/muxing.c +#usr/share/ffmpeg/examples/qsvdec.c +#usr/share/ffmpeg/examples/remuxing.c +#usr/share/ffmpeg/examples/resampling_audio.c +#usr/share/ffmpeg/examples/scaling_video.c +#usr/share/ffmpeg/examples/transcode_aac.c +#usr/share/ffmpeg/examples/transcoding.c +#usr/share/ffmpeg/ffprobe.xsd +#usr/share/ffmpeg/libvpx-1080p.ffpreset +#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset +#usr/share/ffmpeg/libvpx-360p.ffpreset +#usr/share/ffmpeg/libvpx-720p.ffpreset +#usr/share/ffmpeg/libvpx-720p50_60.ffpreset +#usr/share/man/man1/ffmpeg-all.1 +#usr/share/man/man1/ffmpeg-bitstream-filters.1 +#usr/share/man/man1/ffmpeg-codecs.1 +#usr/share/man/man1/ffmpeg-devices.1 +#usr/share/man/man1/ffmpeg-filters.1 +#usr/share/man/man1/ffmpeg-formats.1 +#usr/share/man/man1/ffmpeg-protocols.1 +#usr/share/man/man1/ffmpeg-resampler.1 +#usr/share/man/man1/ffmpeg-scaler.1 +#usr/share/man/man1/ffmpeg-utils.1 +#usr/share/man/man1/ffmpeg.1 +#usr/share/man/man1/ffplay-all.1 +#usr/share/man/man1/ffplay.1 +#usr/share/man/man1/ffprobe-all.1 +#usr/share/man/man1/ffprobe.1 +#usr/share/man/man1/ffserver-all.1 +#usr/share/man/man1/ffserver.1 +#usr/share/man/man3/libavcodec.3 +#usr/share/man/man3/libavdevice.3 +#usr/share/man/man3/libavfilter.3 +#usr/share/man/man3/libavformat.3 +#usr/share/man/man3/libavutil.3 +#usr/share/man/man3/libswresample.3 +#usr/share/man/man3/libswscale.3 diff --git a/lfs/ffmpeg b/lfs/ffmpeg index b383886..76c0c73 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,19 +24,19 @@ include Config -VER = 2008-04-13 -THISAPP = ffmpeg-export-$(VER) +VER = 3.1.4 +THISAPP = ffmpeg-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ffmpeg -PAK_VER = 5 +PAK_VER = 6 DEPS = "ffmpeg-libs sdl lame libvorbis xvid" # Don't use PIC for libavcodec -CFLAGS += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack +#CFLAGS += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack ############################################################################### # Top-level Rules @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 017ab929ff92be552debb65c589c2183 +$(DL_FILE)_MD5 = 1c099ec01cef5caadd05a4f78561c560 install : $(TARGET) @@ -79,14 +79,13 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - ln -s $(THISAPP) /usr/src/ffmpeg - cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \ - --enable-shared \ - --enable-postproc \ - --enable-pthreads \ - --enable-gpl - cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_SRC)/ffmpeg && make install - cd $(DIR_SRC)/ffmpeg && make install-libs + cd $(DIR_APP) && ./configure --prefix=/usr \ + --enable-shared \ + --enable-postproc \ + --enable-pthreads \ + --enable-gpl + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + cd $(DIR_APP) && make install-libs @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/ffmpeg-libs b/lfs/ffmpeg-libs index b29c978..8762964 100644 --- a/lfs/ffmpeg-libs +++ b/lfs/ffmpeg-libs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,10 @@ include Config -VER = 2008-04-13 +VER = 3.1.4 THISAPP = ffmpeg-export-$(VER) PROG = ffmpeg-libs -PAK_VER = 5 +PAK_VER = 6 DEPS = "" -- 2.9.3 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 2/6] motion: update to 4.0.1 2016-11-13 19:23 [PATCH 0/6] Update ffmepg and the packages that use it Marcel Lorenz 2016-11-13 19:23 ` [PATCH 1/6] ffmpeg and ffmpeg-libs: update 3.1.4 Marcel Lorenz @ 2016-11-13 19:23 ` Marcel Lorenz 2016-11-13 19:23 ` [PATCH 3/6] xvid: update to 1.3.4 Marcel Lorenz ` (3 subsequent siblings) 5 siblings, 0 replies; 15+ messages in thread From: Marcel Lorenz @ 2016-11-13 19:23 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 49509 bytes --] Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/motion/camera1.conf | 71 +++++++ config/motion/camera2.conf | 71 +++++++ config/motion/camera3.conf | 71 +++++++ config/motion/camera4.conf | 71 +++++++ config/motion/motion.conf | 447 +++++++++++++++++++++++++-------------- config/rootfiles/packages/motion | 50 ++--- lfs/motion | 26 +-- 7 files changed, 610 insertions(+), 197 deletions(-) create mode 100644 config/motion/camera1.conf create mode 100644 config/motion/camera2.conf create mode 100644 config/motion/camera3.conf create mode 100644 config/motion/camera4.conf diff --git a/config/motion/camera1.conf b/config/motion/camera1.conf new file mode 100644 index 0000000..505c609 --- /dev/null +++ b/config/motion/camera1.conf @@ -0,0 +1,71 @@ +# /etc/motion/camera1.conf +# +# This config file was generated by motion 4.0.1 + +########################################################### +# Capture device options +############################################################ + +# Camera Id +# Consistent identification number to assign to each camera across multiple +# invocations of Motion. +# Default: The order when the camera file was read +# camera_id = 1 + +# Videodevice to be used for capturing (default /dev/video0) +# for FreeBSD default is /dev/bktr0 +videodevice /dev/video0 + +# The video input to be used (default: -1) +# Should normally be set to 1 for video/TV cards, and -1 for USB cameras +input -1 + +# Draw a user defined text on the images using same options as C function strftime(3) +# Default: Not defined = no text +# Text is placed in lower left corner +text_left CAMERA 1 + + +############################################################ +# Target Directories and filenames For Images And Films +# For the options snapshot_, picture_, mpeg_ and timelapse_filename +# you can use conversion specifiers +# %Y = year, %m = month, %d = date, +# %H = hour, %M = minute, %S = second, +# %v = event, %q = frame number, %t = camera id number, +# %D = changed pixels, %N = noise level, +# %i and %J = width and height of motion area, +# %K and %L = X and Y coordinates of motion center +# %C = value defined by text_event +# Quotation marks round string are allowed. +############################################################ + +# Target base directory for pictures and films +# Recommended to use absolute patch. (Default: current working directory) +#target_dir /tmp/motion/cam1 + +# File path for motion triggered images (jpeg or ppm) relative to target_dir +# Default: %v-%Y%m%d%H%M%S-%q +# Default value is equivalent to legacy oldlayout option +# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H/%M/%S-%q +# File extension .jpg or .ppm is automatically added so do not include this +# Set to 'preview' together with best-preview feature enables special naming +# convention for preview shots. See motion guide for details +picture_filename CAM1_%v-%Y%m%d%H%M%S-%q + + +############################################################ +# Live Stream Server +############################################################ + +# The mini-http server listens to this port for requests (default: 0 = disabled) +stream_port 8081 + +# Command to be executed when a picture (.ppm|.jpg) is saved (default: none) +# The filename of the picture is appended as an argument for the command. +#on_picture_save /usr/local/motion-extras/camparse2.pl + +# Command to be executed when a movie file (.mpg|.avi) is closed. (default: none) +# Filename of movie is appended as an argument for the command. +#on_movie_end /usr/local/motion-extras/mpegparse2.pl + diff --git a/config/motion/camera2.conf b/config/motion/camera2.conf new file mode 100644 index 0000000..6c897b1 --- /dev/null +++ b/config/motion/camera2.conf @@ -0,0 +1,71 @@ +# /etc/motion/camera2.conf +# +# This config file was generated by motion 4.0.1 + +########################################################### +# Capture device options +############################################################ + +# Camera Id +# Consistent identification number to assign to each camera across multiple +# invocations of Motion. +# Default: The order when the camera file was read +# camera_id = 2 + +# Videodevice to be used for capturing (default /dev/video0) +# for FreeBSD default is /dev/bktr0 +videodevice /dev/video1 + +# The video input to be used (default: -1) +# Should normally be set to 1 for video/TV cards, and -1 for USB cameras +input 1 + +# Draw a user defined text on the images using same options as C function strftime(3) +# Default: Not defined = no text +# Text is placed in lower left corner +text_left CAMERA 2 + + +############################################################ +# Target Directories and filenames For Images And Films +# For the options snapshot_, picture_, mpeg_ and timelapse_filename +# you can use conversion specifiers +# %Y = year, %m = month, %d = date, +# %H = hour, %M = minute, %S = second, +# %v = event, %q = frame number, %t = camera id number, +# %D = changed pixels, %N = noise level, +# %i and %J = width and height of motion area, +# %K and %L = X and Y coordinates of motion center +# %C = value defined by text_event +# Quotation marks round string are allowed. +############################################################ + +# Target base directory for pictures and films +# Recommended to use absolute patch. (Default: current working directory) +#target_dir /tmp/motion/cam2 + +# File path for motion triggered images (jpeg or ppm) relative to target_dir +# Default: %v-%Y%m%d%H%M%S-%q +# Default value is equivalent to legacy oldlayout option +# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H/%M/%S-%q +# File extension .jpg or .ppm is automatically added so do not include this +# Set to 'preview' together with best-preview feature enables special naming +# convention for preview shots. See motion guide for details +picture_filename CAM2_%v-%Y%m%d%H%M%S-%q + + +############################################################ +# Live Stream Server +############################################################ + +# The mini-http server listens to this port for requests (default: 0 = disabled) +stream_port 8082 + +# Command to be executed when a picture (.ppm|.jpg) is saved (default: none) +# The filename of the picture is appended as an argument for the command. +#on_picture_save /usr/local/motion-extras/camparse2.pl + +# Command to be executed when a movie file (.mpg|.avi) is closed. (default: none) +# Filename of movie is appended as an argument for the command. +#on_movie_end /usr/local/motion-extras/mpegparse2.pl + diff --git a/config/motion/camera3.conf b/config/motion/camera3.conf new file mode 100644 index 0000000..da9a52f --- /dev/null +++ b/config/motion/camera3.conf @@ -0,0 +1,71 @@ +# /etc/motion/camera3.conf +# +# This config file was generated by motion 4.0.1 + +########################################################### +# Capture device options +############################################################ + +# Camera Id +# Consistent identification number to assign to each camera across multiple +# invocations of Motion. +# Default: The order when the camera file was read +# camera_id = 3 + +# Videodevice to be used for capturing (default /dev/video0) +# for FreeBSD default is /dev/bktr0 +videodevice /dev/video2 + +# The video input to be used (default: -1) +# Should normally be set to 1 for video/TV cards, and -1 for USB cameras +input -1 + +# Draw a user defined text on the images using same options as C function strftime(3) +# Default: Not defined = no text +# Text is placed in lower left corner +text_left CAMERA 3 + + +############################################################ +# Target Directories and filenames For Images And Films +# For the options snapshot_, picture_, mpeg_ and timelapse_filename +# you can use conversion specifiers +# %Y = year, %m = month, %d = date, +# %H = hour, %M = minute, %S = second, +# %v = event, %q = frame number, %t = camera id number, +# %D = changed pixels, %N = noise level, +# %i and %J = width and height of motion area, +# %K and %L = X and Y coordinates of motion center +# %C = value defined by text_event +# Quotation marks round string are allowed. +############################################################ + +# Target base directory for pictures and films +# Recommended to use absolute patch. (Default: current working directory) +#target_dir /tmp/motion/cam3 + +# File path for motion triggered images (jpeg or ppm) relative to target_dir +# Default: %v-%Y%m%d%H%M%S-%q +# Default value is equivalent to legacy oldlayout option +# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H/%M/%S-%q +# File extension .jpg or .ppm is automatically added so do not include this +# Set to 'preview' together with best-preview feature enables special naming +# convention for preview shots. See motion guide for details +picture_filename CAM3_%v-%Y%m%d%H%M%S-%q + + +############################################################ +# Live Stream Server +############################################################ + +# The mini-http server listens to this port for requests (default: 0 = disabled) +stream_port 8083 + +# Command to be executed when a picture (.ppm|.jpg) is saved (default: none) +# The filename of the picture is appended as an argument for the command. +#on_picture_save /usr/local/motion-extras/camparse2.pl + +# Command to be executed when a movie file (.mpg|.avi) is closed. (default: none) +# Filename of movie is appended as an argument for the command. +#on_movie_end /usr/local/motion-extras/mpegparse2.pl + diff --git a/config/motion/camera4.conf b/config/motion/camera4.conf new file mode 100644 index 0000000..da94f40 --- /dev/null +++ b/config/motion/camera4.conf @@ -0,0 +1,71 @@ +# /etc/motion/camera4.conf +# +# This config file was generated by motion 4.0.1 + +########################################################### +# Capture device options +############################################################ + +# Camera Id +# Consistent identification number to assign to each camera across multiple +# invocations of Motion. +# Default: The order when the camera file was read +# camera_id = 4 + +# Videodevice to be used for capturing (default /dev/video0) +# for FreeBSD default is /dev/bktr0 +videodevice /dev/video3 + +# The video input to be used (default: -1) +# Should normally be set to 1 for video/TV cards, and -1 for USB cameras +input -1 + +# Draw a user defined text on the images using same options as C function strftime(3) +# Default: Not defined = no text +# Text is placed in lower left corner +text_left CAMERA 4 + + +############################################################ +# Target Directories and filenames For Images And Films +# For the options snapshot_, picture_, mpeg_ and timelapse_filename +# you can use conversion specifiers +# %Y = year, %m = month, %d = date, +# %H = hour, %M = minute, %S = second, +# %v = event, %q = frame number, %t = camera id number, +# %D = changed pixels, %N = noise level, +# %i and %J = width and height of motion area, +# %K and %L = X and Y coordinates of motion center +# %C = value defined by text_event +# Quotation marks round string are allowed. +############################################################ + +# Target base directory for pictures and films +# Recommended to use absolute patch. (Default: current working directory) +#target_dir /tmp/motion/cam4 + +# File path for motion triggered images (jpeg or ppm) relative to target_dir +# Default: %v-%Y%m%d%H%M%S-%q +# Default value is equivalent to legacy oldlayout option +# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H/%M/%S-%q +# File extension .jpg or .ppm is automatically added so do not include this +# Set to 'preview' together with best-preview feature enables special naming +# convention for preview shots. See motion guide for details +picture_filename CAM4_%v-%Y%m%d%H%M%S-%q + + +############################################################ +# Live Stream Server +############################################################ + +# The mini-http server listens to this port for requests (default: 0 = disabled) +stream_port 8084 + +# Command to be executed when a picture (.ppm|.jpg) is saved (default: none) +# The filename of the picture is appended as an argument for the command. +#on_picture_save /usr/local/motion-extras/camparse2.pl + +# Command to be executed when a movie file (.mpg|.avi) is closed. (default: none) +# Filename of movie is appended as an argument for the command. +#on_movie_end /usr/local/motion-extras/mpegparse2.pl + diff --git a/config/motion/motion.conf b/config/motion/motion.conf index 0d2853a..22cb76e 100644 --- a/config/motion/motion.conf +++ b/config/motion/motion.conf @@ -1,6 +1,6 @@ # Rename this distribution example file to motion.conf # -# This config file was generated by motion 3.2.11 +# This config file was generated by motion 4.0.1 ############################################################ @@ -8,10 +8,10 @@ ############################################################ # Start in daemon (background) mode and release terminal (default: off) -daemon on +daemon off # File to store the process ID, also called pid file. (default: not defined) -process_id_file /var/run/motion.pid +process_id_file /var/run/motion/motion.pid ############################################################ # Basic Setup Mode @@ -20,6 +20,16 @@ process_id_file /var/run/motion.pid # Start in Setup-Mode, daemon disabled. (default: off) setup_mode off + +# Use a file to save logs messages, if not defined stderr and syslog is used. (default: not defined) +;logfile /tmp/motion.log + +# Level of log messages [1..9] (EMG, ALR, CRT, ERR, WRN, NTC, INF, DBG, ALL). (default: 6 / NTC) +log_level 6 + +# Filter to log messages by type (COR, STR, ENC, NET, DBL, EVT, TRK, VID, ALL). (default: ALL) +log_type all + ########################################################### # Capture device options ############################################################ @@ -28,32 +38,43 @@ setup_mode off # for FreeBSD default is /dev/bktr0 videodevice /dev/video0 -# v4l2_palette allows to choose preferable palette to be use by motion -# to capture from those supported by your videodevice. (default: 8) +# v4l2_palette allows one to choose preferable palette to be use by motion +# to capture from those supported by your videodevice. (default: 17) # E.g. if your videodevice supports both V4L2_PIX_FMT_SBGGR8 and # V4L2_PIX_FMT_MJPEG then motion will by default use V4L2_PIX_FMT_MJPEG. -# Setting v4l2_palette to 1 forces motion to use V4L2_PIX_FMT_SBGGR8 +# Setting v4l2_palette to 2 forces motion to use V4L2_PIX_FMT_SBGGR8 # instead. # # Values : # V4L2_PIX_FMT_SN9C10X : 0 'S910' -# V4L2_PIX_FMT_SBGGR8 : 1 'BA81' -# V4L2_PIX_FMT_MJPEG : 2 'MJPEG' -# V4L2_PIX_FMT_JPEG : 3 'JPEG' -# V4L2_PIX_FMT_RGB24 : 4 'RGB3' -# V4L2_PIX_FMT_UYVY : 5 'UYVY' -# V4L2_PIX_FMT_YUYV : 6 'YUYV' -# V4L2_PIX_FMT_YUV422P : 7 '422P' -# V4L2_PIX_FMT_YUV420 : 8 'YU12' -v4l2_palette 8 +# V4L2_PIX_FMT_SBGGR16 : 1 'BYR2' +# V4L2_PIX_FMT_SBGGR8 : 2 'BA81' +# V4L2_PIX_FMT_SPCA561 : 3 'S561' +# V4L2_PIX_FMT_SGBRG8 : 4 'GBRG' +# V4L2_PIX_FMT_SGRBG8 : 5 'GRBG' +# V4L2_PIX_FMT_PAC207 : 6 'P207' +# V4L2_PIX_FMT_PJPG : 7 'PJPG' +# V4L2_PIX_FMT_MJPEG : 8 'MJPEG' +# V4L2_PIX_FMT_JPEG : 9 'JPEG' +# V4L2_PIX_FMT_RGB24 : 10 'RGB3' +# V4L2_PIX_FMT_SPCA501 : 11 'S501' +# V4L2_PIX_FMT_SPCA505 : 12 'S505' +# V4L2_PIX_FMT_SPCA508 : 13 'S508' +# V4L2_PIX_FMT_UYVY : 14 'UYVY' +# V4L2_PIX_FMT_YUYV : 15 'YUYV' +# V4L2_PIX_FMT_YUV422P : 16 '422P' +# V4L2_PIX_FMT_YUV420 : 17 'YU12' +# +v4l2_palette 17 # Tuner device to be used for capturing using tuner as source (default /dev/tuner0) # This is ONLY used for FreeBSD. Leave it commented out for Linux ; tunerdevice /dev/tuner0 -# The video input to be used (default: 8) -# Should normally be set to 0 or 1 for video/TV cards, and 8 for USB cameras -input 8 +# The video input to be used (default: -1) +# Should normally be set to 0 or 1 for video/TV cards, and -1 for USB cameras +# Set to 0 for uvideo(4) on OpenBSD +input -1 # The video norm to use (only for video capture and TV tuner cards) # Values: 0 (PAL), 1 (NTSC), 2 (SECAM), 3 (PAL NC no colour). Default: 0 (PAL) @@ -62,8 +83,17 @@ norm 0 # The frequency to set the tuner to (kHz) (only for TV tuner cards) (default: 0) frequency 0 +# Override the power line frequency for the webcam. (normally not necessary) +# Values: +# -1 : Do not modify device setting +# 0 : Power line frequency Disabled +# 1 : 50hz +# 2 : 60hz +# 3 : Auto +power_line_frequency -1 + # Rotate image this number of degrees. The rotation affects all saved images as -# well as mpeg movies. Valid values: 0 (default = no rotation), 90, 180 and 270. +# well as movies. Valid values: 0 (default = no rotation), 90, 180 and 270. rotate 0 # Image width (pixels). Valid range: Camera dependent, default: 352 @@ -81,8 +111,9 @@ framerate 2 # This option is used when you want to capture images at a rate lower than 2 per second. minimum_frame_time 0 -# URL to use if you are using a network camera, size will be autodetected (incl http:// ftp:// or file:///) -# Must be a URL that returns single jpeg pictures or a raw mjpeg stream. Default: Not defined +# URL to use if you are using a network camera, size will be autodetected (incl http:// ftp:// mjpg:// rtsp:// mjpeg:// or file:///) +# Must be a URL that returns single jpeg pictures or a raw mjpeg stream. A trailing slash may be required for some cameras. +# Default: Not defined ; netcam_url value # Username and password for network camera (only if required). Default: not defined @@ -90,32 +121,44 @@ minimum_frame_time 0 ; netcam_userpass value # The setting for keep-alive of network socket, should improve performance on compatible net cameras. -# 1.0: The historical implementation using HTTP/1.0, closing the socket after each http request. -# keep_alive: Use HTTP/1.0 requests with keep alive header to reuse the same connection. -# 1.1: Use HTTP/1.1 requests that support keep alive as default. -# Default: 1.0 -; netcam_http 1.0 +# off: The historical implementation using HTTP/1.0, closing the socket after each http request. +# force: Use HTTP/1.0 requests with keep alive header to reuse the same connection. +# on: Use HTTP/1.1 requests that support keep alive as default. +# Default: off +netcam_keepalive off # URL to use for a netcam proxy server, if required, e.g. "http://myproxy". # If a port number other than 80 is needed, use "http://myproxy:1234". # Default: not defined -; netcam_proxy value +; netcam_proxy value # Set less strict jpeg checks for network cameras with a poor/buggy firmware. # Default: off netcam_tolerant_check off +# RTSP connection uses TCP to communicate to the camera. Can prevent image corruption. +# Default: on +rtsp_uses_tcp on + +# Name of camera to use if you are using a camera accessed through OpenMax/MMAL +# Default: Not defined +; mmalcam_name vc.ril.camera + +# Camera control parameters (see raspivid/raspistill tool documentation) +# Default: Not defined +; mmalcam_control_params -hf + # Let motion regulate the brightness of a video device (default: off). # The auto_brightness feature uses the brightness option as its target value. # If brightness is zero auto_brightness will adjust to average brightness value 128. # Only recommended for cameras without auto brightness -auto_brightness on +auto_brightness off # Set the initial brightness of a video device. # If auto_brightness is enabled, this value defines the average brightness level # which Motion will try and adjust to. # Valid range 0-255, default 0 = disabled -brightness 128 +brightness 0 # Set the contrast of a video device. # Valid range 0-255, default 0 = disabled @@ -165,12 +208,13 @@ noise_tune on # Recommended value is EedDl. Any combination (and number of) of E, e, d, and D is valid. # (l)abeling must only be used once and the 'l' must be the last letter. # Comment out to disable -despeckle EedDl +despeckle_filter EedDl # Detect motion in predefined areas (1 - 9). Areas are numbered like that: 1 2 3 # A script (on_area_detected) is started immediately when motion is 4 5 6 # detected in one of the given areas, but only once during an event. 7 8 9 -# One or more areas can be specified with this option. (Default: not defined) +# One or more areas can be specified with this option. Take care: This option +# does NOT restrict detection to these areas! (Default: not defined) ; area_detect value # PGM file to use as a sensitivity mask. @@ -194,24 +238,26 @@ minimum_motion_frames 1 # was detected that will be output at motion detection. # Recommended range: 0 to 5 (default: 0) # Do not use large values! Large values will cause Motion to skip video frames and -# cause unsmooth mpegs. To smooth mpegs use larger values of post_capture instead. -pre_capture 5 +# cause unsmooth movies. To smooth movies use larger values of post_capture instead. +pre_capture 2 # Number of frames to capture after motion is no longer detected (default: 0) -post_capture 5 +post_capture 2 -# Gap is the seconds of no motion detection that triggers the end of an event +# Event Gap is the seconds of no motion detection that triggers the end of an event. # An event is defined as a series of motion images taken within a short timeframe. -# Recommended value is 60 seconds (Default). The value 0 is allowed and disables -# events causing all Motion to be written to one single mpeg file and no pre_capture. -gap 0 +# Recommended value is 60 seconds (Default). The value -1 is allowed and disables +# events causing all Motion to be written to one single movie file and no pre_capture. +# If set to 0, motion is running in gapless mode. Movies don't have gaps anymore. An +# event ends right after no more motion is detected and post_capture is over. +event_gap 60 -# Maximum length in seconds of an mpeg movie -# When value is exceeded a new mpeg file is created. (Default: 0 = infinite) -max_mpeg_time 86400 +# Maximum length in seconds of a movie +# When value is exceeded a new movie file is created. (Default: 0 = infinite) +max_movie_time 0 # Always save images even if there was no motion (default: off) -output_all off +emulate_motion off ############################################################ @@ -224,33 +270,33 @@ output_all off # Picture with most motion of an event is saved when set to 'best'. # Picture with motion nearest center of picture is saved when set to 'center'. # Can be used as preview shot for the corresponding movie. -output_normal off +output_pictures on # Output pictures with only the pixels moving object (ghost images) (default: off) -output_motion off +output_debug_pictures off # The quality (in percent) to be used by the jpeg compression (default: 75) quality 75 -# Output ppm images instead of jpeg (default: off) -ppm off - +# Type of output images +# Valid values: jpeg, ppm (default: jpeg) +picture_type jpeg ############################################################ # FFMPEG related options -# Film (mpeg) file output, and deinterlacing of the video input +# Film (movies) file output, and deinterlacing of the video input # The options movie_filename and timelapse_filename are also used # by the ffmpeg feature ############################################################ -# Use ffmpeg to encode mpeg movies in realtime (default: off) -ffmpeg_cap_new off +# Use ffmpeg to encode movies in realtime (default: off) +ffmpeg_output_movies on # Use ffmpeg to make movies with only the pixels moving # object (ghost images) (default: off) -ffmpeg_cap_motion off +ffmpeg_output_debug_movies off -# Use ffmpeg to encode a timelapse movie +# Use ffmpeg to encode a timelapse movie # Default value 0 = off - else save frame every Nth second ffmpeg_timelapse 0 @@ -260,31 +306,63 @@ ffmpeg_timelapse_mode daily # Bitrate to be used by the ffmpeg encoder (default: 400000) # This option is ignored if ffmpeg_variable_bitrate is not 0 (disabled) -ffmpeg_bps 500000 +ffmpeg_bps 400000 # Enables and defines variable bitrate for the ffmpeg encoder. # ffmpeg_bps is ignored if variable bitrate is enabled. # Valid values: 0 (default) = fixed bitrate defined by ffmpeg_bps, -# or the range 2 - 31 where 2 means best quality and 31 is worst. +# or the range 1 - 100 where 1 means worst quality and 100 is best. ffmpeg_variable_bitrate 0 # Codec to used by ffmpeg for the video compression. -# Timelapse mpegs are always made in mpeg1 format independent from this option. -# Supported formats are: mpeg1 (ffmpeg-0.4.8 only), mpeg4 (default), and msmpeg4. -# mpeg1 - gives you files with extension .mpg +# Timelapse videos have two options. +# mpg - Creates mpg file with mpeg-2 encoding. +# If motion is shutdown and restarted, new pics will be appended +# to any previously created file with name indicated for timelapse. +# mpeg4 - Creates avi file with the default encoding. +# If motion is shutdown and restarted, new pics will create a +# new file with the name indicated for timelapse. +# Supported formats are: # mpeg4 or msmpeg4 - gives you files with extension .avi # msmpeg4 is recommended for use with Windows Media Player because # it requires no installation of codec on the Windows client. # swf - gives you a flash film with extension .swf # flv - gives you a flash video with extension .flv -# ffv1 - FF video codec 1 for Lossless Encoding ( experimental ) -# mov - QuickTime ( testing ) -ffmpeg_video_codec msmpeg4 +# ffv1 - FF video codec 1 for Lossless Encoding +# mov - QuickTime +# mp4 - MPEG-4 Part 14 H264 encoding +# mkv - Matroska H264 encoding +# hevc - H.265 / HEVC (High Efficiency Video Coding) +ffmpeg_video_codec mpeg4 -# Use ffmpeg to deinterlace video. Necessary if you use an analog camera -# and see horizontal combing on moving objects in video or pictures. -# (default: off) -ffmpeg_deinterlace off +# When creating videos, should frames be duplicated in order +# to keep up with the requested frames per second +# (default: true) +ffmpeg_duplicate_frames true + +############################################################ +# SDL Window +############################################################ + +# Number of motion thread to show in SDL Window (default: 0 = disabled) +#sdl_threadnr 0 + +############################################################ +# External pipe to video encoder +# Replacement for FFMPEG builtin encoder for ffmpeg_output_movies only. +# The options movie_filename and timelapse_filename are also used +# by the ffmpeg feature +############################################################# + +# Bool to enable or disable extpipe (default: off) +use_extpipe off + +# External program (full path and opts) to pipe raw video to +# Generally, use '-' for STDIN... +;extpipe mencoder -demuxer rawvideo -rawvideo w=%w:h=%h:i420 -ovc x264 -x264encopts bframes=4:frameref=1:subq=1:scenecut=-1:nob_adapt:threads=1:keyint=1000:8x8dct:vbv_bufsize=4000:crf=24:partitions=i8x8,i4x4:vbv_maxrate=800:no-chroma-me -vf denoise3d=16:12:48:4,pp=lb -of avi -o %f.avi - -fps %fps +;extpipe x264 - --input-res %wx%h --fps %fps --bitrate 2000 --preset ultrafast --quiet -o %f.mp4 +;extpipe mencoder -demuxer rawvideo -rawvideo w=%w:h=%h:fps=%fps -ovc x264 -x264encopts preset=ultrafast -of lavf -o %f.mp4 - -fps %fps +;extpipe ffmpeg -y -f rawvideo -pix_fmt yuv420p -video_size %wx%h -framerate %fps -i pipe:0 -vcodec libx264 -preset ultrafast -f mp4 %f.mp4 ############################################################ @@ -299,7 +377,7 @@ snapshot_interval 0 # Text Display # %Y = year, %m = month, %d = date, # %H = hour, %M = minute, %S = second, %T = HH:MM:SS, -# %v = event, %q = frame number, %t = thread (camera) number, +# %v = event, %q = frame number, %t = camera id number, # %D = changed pixels, %N = noise level, \n = new line, # %i and %J = width and height of motion area, # %K and %L = X and Y coordinates of motion center @@ -309,9 +387,17 @@ snapshot_interval 0 ############################################################ # Locate and draw a box around the moving object. -# Valid values: on, off and preview (default: off) +# Valid values: on, off, preview (default: off) # Set to 'preview' will only draw a box in preview_shot pictures. -locate off +locate_motion_mode off + +# Set the look and style of the locate box if enabled. +# Valid values: box, redbox, cross, redcross (default: box) +# Set to 'box' will draw the traditional box. +# Set to 'redbox' will draw a red box. +# Set to 'cross' will draw a little cross to mark center. +# Set to 'redcross' will draw a little red cross to mark center. +locate_motion_style box # Draws the timestamp using same options as C function strftime(3) # Default: %Y-%m-%d\n%T = date in ISO format and time in 24 hour clock @@ -321,7 +407,7 @@ text_right %Y-%m-%d\n%T-%q # Draw a user defined text on the images using same options as C function strftime(3) # Default: Not defined = no text # Text is placed in lower left corner -text_left CAMERA %t\nhttp://www.ipfire.org +; text_left CAMERA %t # Draw the number of changed pixed on the images (default: off) # Will normally be set to off except when you setup and adjust the motion settings @@ -340,13 +426,18 @@ text_event %Y%m%d%H%M%S text_double off +# Text to include in a JPEG EXIF comment +# May be any text, including conversion specifiers. +# The EXIF timestamp is included independent of this text. +;exif_text %i%J/%K%L + ############################################################ # Target Directories and filenames For Images And Films -# For the options snapshot_, jpeg_, mpeg_ and timelapse_filename +# For the options snapshot_, picture_, movie_ and timelapse_filename # you can use conversion specifiers # %Y = year, %m = month, %d = date, # %H = hour, %M = minute, %S = second, -# %v = event, %q = frame number, %t = thread (camera) number, +# %v = event, %q = frame number, %t = camera id number, # %D = changed pixels, %N = noise level, # %i and %J = width and height of motion area, # %K and %L = X and Y coordinates of motion center @@ -356,7 +447,7 @@ text_double off # Target base directory for pictures and films # Recommended to use absolute path. (Default: current working directory) -target_dir /var/motion/cam1 +#target_dir /tmp/motion # File path for snapshots (jpeg or ppm) relative to target_dir # Default: %v-%Y%m%d%H%M%S-snapshot @@ -374,73 +465,90 @@ snapshot_filename %v-%Y%m%d%H%M%S-snapshot # File extension .jpg or .ppm is automatically added so do not include this # Set to 'preview' together with best-preview feature enables special naming # convention for preview shots. See motion guide for details -jpeg_filename %v-%Y%m%d%H%M%S-%q +picture_filename %v-%Y%m%d%H%M%S-%q -# File path for motion triggered ffmpeg films (mpeg) relative to target_dir +# File path for motion triggered ffmpeg films (movies) relative to target_dir # Default: %v-%Y%m%d%H%M%S -# Default value is equivalent to legacy oldlayout option -# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H%M%S -# File extension .mpg or .avi is automatically added so do not include this -# This option was previously called ffmpeg_filename +# File extensions(.mpg .avi) are automatically added so do not include them movie_filename %v-%Y%m%d%H%M%S -# File path for timelapse mpegs relative to target_dir +# File path for timelapse movies relative to target_dir # Default: %Y%m%d-timelapse -# Default value is near equivalent to legacy oldlayout option -# For Motion 3.0 compatible mode choose: %Y/%m/%d-timelapse -# File extension .mpg is automatically added so do not include this +# File extensions(.mpg .avi) are automatically added so do not include them timelapse_filename %Y%m%d-timelapse +############################################################ +# Global Network Options +############################################################ +# Enable IPv6 (default: off) +ipv6_enabled off ############################################################ -# Live Webcam Server +# Live Stream Server ############################################################ # The mini-http server listens to this port for requests (default: 0 = disabled) -webcam_port 2500 +stream_port 8081 -# Quality of the jpeg images produced (default: 50) -webcam_quality 50 +# Quality of the jpeg (in percent) images produced (default: 50) +stream_quality 50 # Output frames at 1 fps when no motion is detected and increase to the -# rate given by webcam_maxrate when motion is detected (default: off) -webcam_motion off +# rate given by stream_maxrate when motion is detected (default: off) +stream_motion off -# Maximum framerate for webcam streams (default: 1) -webcam_maxrate 1 +# Maximum framerate for stream streams (default: 1) +stream_maxrate 1 -# Restrict webcam connections to localhost only (default: on) -webcam_localhost off +# Restrict stream connections to localhost only (default: on) +stream_localhost on # Limits the number of images per connection (default: 0 = unlimited) -# Number can be defined by multiplying actual webcam rate by desired number of seconds -# Actual webcam rate is the smallest of the numbers framerate and webcam_maxrate -webcam_limit 0 +# Number can be defined by multiplying actual stream rate by desired number of seconds +# Actual stream rate is the smallest of the numbers framerate and stream_maxrate +stream_limit 0 +# Set the authentication method (default: 0) +# 0 = disabled +# 1 = Basic authentication +# 2 = MD5 digest (the safer authentication) +stream_auth_method 0 + +# Authentication for the stream. Syntax username:password +# Default: not defined (Disabled) +; stream_authentication username:password + +# Percentage to scale the stream image for preview +# Default: 25 +; stream_preview_scale 25 + +# Have stream preview image start on a new line +# Default: no +; stream_preview_newline no ############################################################ # HTTP Based Control ############################################################ # TCP/IP port for the http server to listen on (default: 0 = disabled) -control_port 0 +webcontrol_port 8080 # Restrict control connections to localhost only (default: on) -control_localhost on +webcontrol_localhost on # Output for http server, select off to choose raw text plain (default: on) -control_html_output on +webcontrol_html_output on # Authentication for the http based control. Syntax username:password # Default: not defined (Disabled) -; control_authentication username:password +; webcontrol_authentication username:password ############################################################ # Tracking (Pan/Tilt) -############################################################ +############################################################# -# Type of tracker (0=none (default), 1=stepper, 2=iomojo, 3=pwc, 4=generic, 5=uvcvideo) +# Type of tracker (0=none (default), 1=stepper, 2=iomojo, 3=pwc, 4=generic, 5=uvcvideo, 6=servo) # The generic type enables the definition of motion center and motion size to # be used with the conversion specifiers for options like on_motion_detected track_type 0 @@ -449,19 +557,37 @@ track_type 0 track_auto off # Serial port of motor (default: none) -; track_port value +;track_port /dev/ttyS0 # Motor number for x-axis (default: 0) -track_motorx 0 +;track_motorx 0 + +# Set motorx reverse (default: 0) +;track_motorx_reverse 0 # Motor number for y-axis (default: 0) -track_motory 0 +;track_motory 1 + +# Set motory reverse (default: 0) +;track_motory_reverse 0 # Maximum value on x-axis (default: 0) -track_maxx 0 +;track_maxx 200 + +# Minimum value on x-axis (default: 0) +;track_minx 50 # Maximum value on y-axis (default: 0) -track_maxy 0 +;track_maxy 200 + +# Minimum value on y-axis (default: 0) +;track_miny 50 + +# Center value on x-axis (default: 0) +;track_homex 128 + +# Center value on y-axis (default: 0) +;track_homey 128 # ID of an iomojo camera if used (default: 0) track_iomojo_id 0 @@ -492,7 +618,7 @@ track_stepsize 40 # You can use conversion specifiers for the on_xxxx commands # %Y = year, %m = month, %d = date, # %H = hour, %M = minute, %S = second, -# %v = event, %q = frame number, %t = thread (camera) number, +# %v = event, %q = frame number, %t = camera id number, # %D = changed pixels, %N = noise level, # %i and %J = width and height of motion area, # %K and %L = X and Y coordinates of motion center @@ -509,11 +635,11 @@ track_stepsize 40 quiet on # Command to be executed when an event starts. (default: none) -# An event starts at first motion detected after a period of no motion defined by gap +# An event starts at first motion detected after a period of no motion defined by event_gap ; on_event_start value # Command to be executed when an event ends after a period of no motion -# (default: none). The period of no motion is defined by option gap. +# (default: none). The period of no motion is defined by option event_gap. ; on_event_end value # Command to be executed when a picture (.ppm|.jpg) is saved (default: none) @@ -536,27 +662,27 @@ quiet on ; on_movie_end value # Command to be executed when a camera can't be opened or if it is lost -# NOTE: There is situations when motion doesn't detect a lost camera! -# It depends on the driver, some drivers don't detect a lost camera at all -# Some hang the motion thread. Some even hang the PC! (default: none) +# NOTE: There is situations when motion don't detect a lost camera! +# It depends on the driver, some drivers dosn't detect a lost camera at all +# Some hangs the motion thread. Some even hangs the PC! (default: none) ; on_camera_lost value -############################################################ -# Common Options For MySQL and PostgreSQL database features. -# Options require the MySQL/PostgreSQL options to be active also. -############################################################ +##################################################################### +# Common Options for database features. +# Options require database options to be active also. +##################################################################### -# Log to the database when creating motion triggered image file (default: on) -sql_log_image on +# Log to the database when creating motion triggered picture file (default: on) +; sql_log_picture on # Log to the database when creating a snapshot image file (default: on) -sql_log_snapshot on +; sql_log_snapshot on -# Log to the database when creating motion triggered mpeg file (default: off) -sql_log_mpeg off +# Log to the database when creating motion triggered movie file (default: off) +; sql_log_movie off -# Log to the database when creating timelapse mpeg file (default: off) -sql_log_timelapse off +# Log to the database when creating timelapse movies file (default: off) +; sql_log_timelapse off # SQL query string that is sent to the database # Use same conversion specifiers has for text features @@ -564,45 +690,46 @@ sql_log_timelapse off # %n = the number representing the file_type # %f = filename with full path # Default value: +# Create tables : +## +# Mysql +# CREATE TABLE security (camera int, filename char(80) not null, frame int, file_type int, time_stamp timestamp(14), event_time_stamp timestamp(14)); +# +# Postgresql +# CREATE TABLE security (camera int, filename char(80) not null, frame int, file_type int, time_stamp timestamp without time zone, event_time_stamp timestamp without time zone); +# # insert into security(camera, filename, frame, file_type, time_stamp, text_event) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C') -sql_query insert into security(camera, filename, frame, file_type, time_stamp, event_time_stamp) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C') +; sql_query insert into security(camera, filename, frame, file_type, time_stamp, event_time_stamp) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C') ############################################################ -# Database Options For MySQL +# Database Options ############################################################ -# Mysql database to log to (default: not defined) -; mysql_db value - -# The host on which the database is located (default: localhost) -; mysql_host value - -# User account name for MySQL database (default: not defined) -; mysql_user value +# database type : mysql, postgresql, sqlite3 (default : not defined) +; database_type mysql -# User password for MySQL database (default: not defined) -; mysql_password value +# database to log to (default: not defined) +# for sqlite3, the full path and name for the database. +; database_dbname motion +# The host on which the database is located (default: localhost) +; database_host 127.0.0.1 -############################################################ -# Database Options For PostgreSQL -############################################################ - -# PostgreSQL database to log to (default: not defined) -; pgsql_db value +# User account name for database (default: not defined) +; database_user motion -# The host on which the database is located (default: localhost) -; pgsql_host value +# User password for database (default: not defined) +; database_password changeme -# User account name for PostgreSQL database (default: not defined) -; pgsql_user value +# Port on which the database is located +# mysql 3306 , postgresql 5432 (default: not defined) +; database_port 3306 -# User password for PostgreSQL database (default: not defined) -; pgsql_password value +# Database wait time in milliseconds for locked database to +# be unlocked before returning database locked error (default 0) +; database_busy_timeout 0 -# Port on which the PostgreSQL database is located (default: 5432) -; pgsql_port 5432 ############################################################ @@ -619,19 +746,25 @@ sql_query insert into security(camera, filename, frame, file_type, time_stamp, e ############################################################## -# Thread config files - One for each camera. +# camera config files - One for each camera. # Except if only one camera - You only need this config file. -# If you have more than one camera you MUST define one thread +# If you have more than one camera you MUST define one camera # config file for each camera in addition to this config file. ############################################################## # Remember: If you have more than one camera you must have one -# thread file for each camera. E.g. 2 cameras requires 3 files: -# This motion.conf file AND thread1.conf and thread2.conf. +# camera file for each camera. E.g. 2 cameras requires 3 files: +# This motion.conf file AND camera1.conf and camera2.conf. # Only put the options that are unique to each camera in the -# thread config files. -; thread /usr/local/etc/thread1.conf -; thread /usr/local/etc/thread2.conf -; thread /usr/local/etc/thread3.conf -; thread /usr/local/etc/thread4.conf +# camera config files. +; camera /etc/motion/camera1.conf +; camera /etc/motion/camera2.conf +; camera /etc/motion/camera3.conf +; camera /etc/motion/camera4.conf + +############################################################## +# Camera config directory - One for each camera. +############################################################## +# +; camera_dir /etc/motion/conf.d diff --git a/config/rootfiles/packages/motion b/config/rootfiles/packages/motion index aa3e5b7..7905f8e 100644 --- a/config/rootfiles/packages/motion +++ b/config/rootfiles/packages/motion @@ -1,27 +1,29 @@ -#etc/motion-dist.conf -etc/motion.conf +etc/motion +#etc/motion/camera1.conf +#etc/motion/camera2.conf +#etc/motion/camera3.conf +#etc/motion/camera4.conf +#etc/motion/motion.conf usr/bin/motion -#usr/share/doc/motion-3.2.12 -#usr/share/doc/motion-3.2.12/CHANGELOG -#usr/share/doc/motion-3.2.12/COPYING -#usr/share/doc/motion-3.2.12/CREDITS -#usr/share/doc/motion-3.2.12/INSTALL -#usr/share/doc/motion-3.2.12/README -#usr/share/doc/motion-3.2.12/motion_guide.html +#usr/share/doc/motion +#usr/share/doc/motion/CHANGELOG +#usr/share/doc/motion/COPYING +#usr/share/doc/motion/CREDITS +#usr/share/doc/motion/README.md +#usr/share/doc/motion/mask1.png +#usr/share/doc/motion/motion_guide.html +#usr/share/doc/motion/normal.jpg +#usr/share/doc/motion/outputmotion1.jpg +#usr/share/doc/motion/outputnormal1.jpg #usr/share/man/man1/motion.1 -#usr/share/motion-3.2.12 -#usr/share/motion-3.2.12/examples -#usr/share/motion-3.2.12/examples/motion-dist.conf -#usr/share/motion-3.2.12/examples/motion.init-Debian -#usr/share/motion-3.2.12/examples/motion.init-Fedora -#usr/share/motion-3.2.12/examples/motion.init-FreeBSD.sh -#usr/share/motion-3.2.12/examples/motion.init-RH -#usr/share/motion-3.2.12/examples/thread1.conf -#usr/share/motion-3.2.12/examples/thread2.conf -#usr/share/motion-3.2.12/examples/thread3.conf -#usr/share/motion-3.2.12/examples/thread4.conf +#usr/share/motion +#usr/share/motion/examples +#usr/share/motion/examples/camera1-dist.conf +#usr/share/motion/examples/camera2-dist.conf +#usr/share/motion/examples/camera3-dist.conf +#usr/share/motion/examples/camera4-dist.conf +#usr/share/motion/examples/motion-dist.conf +#usr/share/motion/examples/motion.init-Debian +#usr/share/motion/examples/motion.init-FreeBSD.sh +#usr/share/motion/examples/motion.service var/ipfire/backup/addons/includes/motion -etc/rc.d/init.d/motion -etc/rc.d/rc0.d/K01motion -etc/rc.d/rc6.d/K01motion -etc/rc.d/rc3.d/S99motion diff --git a/lfs/motion b/lfs/motion index 39c6b73..0e70c1e 100644 --- a/lfs/motion +++ b/lfs/motion @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,16 +24,16 @@ include Config -VER = 3.2.12 +VER = 4.0.1 -THISAPP = motion-$(VER) +THISAPP = motion-release-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = motion -PAK_VER = 1 +PAK_VER = 2 DEPS = "ffmpeg" ############################################################################### @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1ba0065ed50509aaffb171594c689f46 +$(DL_FILE)_MD5 = 5c87f90c4118d8cf0fb14700db69118f install : $(TARGET) @@ -76,20 +76,14 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - #Install obsolete V4L1 videodev.h - cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h - - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && autoreconf + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --with-ffmpeg cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - cp -vf $(DIR_SRC)/config/motion/motion.conf /etc + rm -vf /etc/motion/*.conf + cp -vf $(DIR_SRC)/config/motion/*.conf /etc/motion/ install -v -m 644 $(DIR_SRC)/config/backup/includes/motion \ /var/ipfire/backup/addons/includes/motion - - #Remove obsolete V4L1 videodev.h - rm -f /usr/include/linux/videodev.h - @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.9.3 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 3/6] xvid: update to 1.3.4 2016-11-13 19:23 [PATCH 0/6] Update ffmepg and the packages that use it Marcel Lorenz 2016-11-13 19:23 ` [PATCH 1/6] ffmpeg and ffmpeg-libs: update 3.1.4 Marcel Lorenz 2016-11-13 19:23 ` [PATCH 2/6] motion: update to 4.0.1 Marcel Lorenz @ 2016-11-13 19:23 ` Marcel Lorenz 2016-11-13 19:23 ` [PATCH 4/6] minidlna: update to 1.1.5 Marcel Lorenz ` (2 subsequent siblings) 5 siblings, 0 replies; 15+ messages in thread From: Marcel Lorenz @ 2016-11-13 19:23 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 2458 bytes --] Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/packages/xvid | 2 +- lfs/xvid | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/rootfiles/packages/xvid b/config/rootfiles/packages/xvid index e29a760..17bee89 100644 --- a/config/rootfiles/packages/xvid +++ b/config/rootfiles/packages/xvid @@ -2,4 +2,4 @@ #usr/lib/libxvidcore.a usr/lib/libxvidcore.so usr/lib/libxvidcore.so.4 -usr/lib/libxvidcore.so.4.2 +usr/lib/libxvidcore.so.4.3 diff --git a/lfs/xvid b/lfs/xvid index abf03a5..68629ca 100644 --- a/lfs/xvid +++ b/lfs/xvid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.2.1 +VER = 1.3.4 THISAPP = xvidcore-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/xvidcore TARGET = $(DIR_INFO)/$(THISAPP) PROG = xvid -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3f57b3e153687fddefc9ccdf0dc737b7 +$(DL_FILE)_MD5 = 8cf4a42f280b03dae452080ef9e7c798 install : $(TARGET) @@ -80,8 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/build/generic && ./configure --prefix=/usr cd $(DIR_APP)/build/generic && make cd $(DIR_APP)/build/generic && make install - chmod -v 755 /usr/lib/libxvidcore.so.4.2 - ln -v -sf libxvidcore.so.4.2 /usr/lib/libxvidcore.so.4 - ln -v -sf libxvidcore.so.4 /usr/lib/libxvidcore.so + chmod -v 755 /usr/lib/libxvidcore.so.4.3 + ln -sfv libxvidcore.so.4.3 /usr/lib/libxvidcore.so.4 + ln -sfv libxvidcore.so.4 /usr/lib/libxvidcore.so @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.9.3 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 4/6] minidlna: update to 1.1.5 2016-11-13 19:23 [PATCH 0/6] Update ffmepg and the packages that use it Marcel Lorenz ` (2 preceding siblings ...) 2016-11-13 19:23 ` [PATCH 3/6] xvid: update to 1.3.4 Marcel Lorenz @ 2016-11-13 19:23 ` Marcel Lorenz 2016-11-13 19:23 ` [PATCH 5/6] apcupsd: update to 3.14.14 Marcel Lorenz 2016-11-13 19:24 ` [PATCH 6/6] mpd: update to 0.19.19 Marcel Lorenz 5 siblings, 0 replies; 15+ messages in thread From: Marcel Lorenz @ 2016-11-13 19:23 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 2188 bytes --] Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/packages/minidlna | 1 + lfs/minidlna | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/packages/minidlna b/config/rootfiles/packages/minidlna index f0b9536..42a83f8 100644 --- a/config/rootfiles/packages/minidlna +++ b/config/rootfiles/packages/minidlna @@ -7,6 +7,7 @@ usr/sbin/minidlnad #usr/share/locale/fr/LC_MESSAGES/minidlna.mo #usr/share/locale/it/LC_MESSAGES/minidlna.mo #usr/share/locale/ja/LC_MESSAGES/minidlna.mo +#usr/share/locale/ko/LC_MESSAGES/minidlna.mo #usr/share/locale/nb/LC_MESSAGES/minidlna.mo #usr/share/locale/nl/LC_MESSAGES/minidlna.mo #usr/share/locale/pl/LC_MESSAGES/minidlna.mo diff --git a/lfs/minidlna b/lfs/minidlna index 1c3f61c..a2ac9e9 100644 --- a/lfs/minidlna +++ b/lfs/minidlna @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.1.3 +VER = 1.1.5 THISAPP = minidlna-$(VER) DL_FILE = minidlna-$(VER).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = minidlna -PAK_VER = 4 +PAK_VER = 5 DEPS = "ffmpeg flac libexif libid3tag libogg" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 879027192c89e5376cdd2ae2d1aa33b4 +$(DL_FILE)_MD5 = 1970e553a1eb8a3e7e302e2ce292cbc4 install : $(TARGET) -- 2.9.3 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 5/6] apcupsd: update to 3.14.14 2016-11-13 19:23 [PATCH 0/6] Update ffmepg and the packages that use it Marcel Lorenz ` (3 preceding siblings ...) 2016-11-13 19:23 ` [PATCH 4/6] minidlna: update to 1.1.5 Marcel Lorenz @ 2016-11-13 19:23 ` Marcel Lorenz 2017-03-12 16:04 ` Michael Tremer 2016-11-13 19:24 ` [PATCH 6/6] mpd: update to 0.19.19 Marcel Lorenz 5 siblings, 1 reply; 15+ messages in thread From: Marcel Lorenz @ 2016-11-13 19:23 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 1514 bytes --] Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- lfs/apcupsd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lfs/apcupsd b/lfs/apcupsd index 4e9137b..3e2ba20 100644 --- a/lfs/apcupsd +++ b/lfs/apcupsd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 3.14.10 +VER = 3.14.14 THISAPP = apcupsd-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = apcupsd -PAK_VER = 5 +PAK_VER = 6 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23 +$(DL_FILE)_MD5 = cc8f5ced77f38906a274787acb9bc980 install : $(TARGET) -- 2.9.3 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 5/6] apcupsd: update to 3.14.14 2016-11-13 19:23 ` [PATCH 5/6] apcupsd: update to 3.14.14 Marcel Lorenz @ 2017-03-12 16:04 ` Michael Tremer 2017-03-12 16:08 ` Michael Tremer 2017-03-13 13:15 ` Marcel Lorenz 0 siblings, 2 replies; 15+ messages in thread From: Michael Tremer @ 2017-03-12 16:04 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 2081 bytes --] Is this patch actually supposed to be in this patchset? On Sun, 2016-11-13 at 20:23 +0100, Marcel Lorenz wrote: > Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> > --- > lfs/apcupsd | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/lfs/apcupsd b/lfs/apcupsd > index 4e9137b..3e2ba20 100644 > --- a/lfs/apcupsd > +++ b/lfs/apcupsd > @@ -1,7 +1,7 @@ > ############################################################################# > ## > # > # > # IPFire.org - A linux based > firewall # > -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> > # > +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> > # > # > # > # This program is free software: you can redistribute it and/or > modify # > # it under the terms of the GNU General Public License as published > by # > @@ -24,7 +24,7 @@ > > include Config > > -VER = 3.14.10 > +VER = 3.14.14 > > THISAPP = apcupsd-$(VER) > DL_FILE = $(THISAPP).tar.gz > @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) > DIR_APP = $(DIR_SRC)/$(THISAPP) > TARGET = $(DIR_INFO)/$(THISAPP) > PROG = apcupsd > -PAK_VER = 5 > +PAK_VER = 6 > > DEPS = "" > > @@ -44,7 +44,7 @@ objects = $(DL_FILE) > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > -$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23 > +$(DL_FILE)_MD5 = cc8f5ced77f38906a274787acb9bc980 > > install : $(TARGET) > [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 5/6] apcupsd: update to 3.14.14 2017-03-12 16:04 ` Michael Tremer @ 2017-03-12 16:08 ` Michael Tremer 2017-03-13 13:15 ` Marcel Lorenz 1 sibling, 0 replies; 15+ messages in thread From: Michael Tremer @ 2017-03-12 16:08 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 2326 bytes --] It builds, so I merged it for c110. On Sun, 2017-03-12 at 16:04 +0000, Michael Tremer wrote: > Is this patch actually supposed to be in this patchset? > > On Sun, 2016-11-13 at 20:23 +0100, Marcel Lorenz wrote: > > > > Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> > > --- > > lfs/apcupsd | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/lfs/apcupsd b/lfs/apcupsd > > index 4e9137b..3e2ba20 100644 > > --- a/lfs/apcupsd > > +++ b/lfs/apcupsd > > @@ -1,7 +1,7 @@ > > ########################################################################### > > ## > > ## > > # > > > > # > > # IPFire.org - A linux based > > firewall # > > -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> > > > > # > > +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> > > > > # > > # > > > > # > > # This program is free software: you can redistribute it and/or > > modify # > > # it under the terms of the GNU General Public License as published > > by # > > @@ -24,7 +24,7 @@ > > > > include Config > > > > -VER = 3.14.10 > > +VER = 3.14.14 > > > > THISAPP = apcupsd-$(VER) > > DL_FILE = $(THISAPP).tar.gz > > @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) > > DIR_APP = $(DIR_SRC)/$(THISAPP) > > TARGET = $(DIR_INFO)/$(THISAPP) > > PROG = apcupsd > > -PAK_VER = 5 > > +PAK_VER = 6 > > > > DEPS = "" > > > > @@ -44,7 +44,7 @@ objects = $(DL_FILE) > > > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > > > -$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23 > > +$(DL_FILE)_MD5 = cc8f5ced77f38906a274787acb9bc980 > > > > install : $(TARGET) > > [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 5/6] apcupsd: update to 3.14.14 2017-03-12 16:04 ` Michael Tremer 2017-03-12 16:08 ` Michael Tremer @ 2017-03-13 13:15 ` Marcel Lorenz 2017-03-13 14:14 ` Michael Tremer 1 sibling, 1 reply; 15+ messages in thread From: Marcel Lorenz @ 2017-03-13 13:15 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 2301 bytes --] The old version fails build after update ffmpeg and his dependencies, but I do not know exactly... Am 2017-03-12 17:04, schrieb Michael Tremer: > Is this patch actually supposed to be in this patchset? > > On Sun, 2016-11-13 at 20:23 +0100, Marcel Lorenz wrote: >> Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> >> --- >> lfs/apcupsd | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/lfs/apcupsd b/lfs/apcupsd >> index 4e9137b..3e2ba20 100644 >> --- a/lfs/apcupsd >> +++ b/lfs/apcupsd >> @@ -1,7 +1,7 @@ >> ############################################################################# >> ## >> # >> # >> # IPFire.org - A linux based >> firewall # >> -# Copyright (C) 2007-2012 IPFire >> Team <info(a)ipfire.org> >> # >> +# Copyright (C) 2007-2016 IPFire >> Team <info(a)ipfire.org> >> # >> # >> # >> # This program is free software: you can redistribute it and/or >> modify # >> # it under the terms of the GNU General Public License as published >> by # >> @@ -24,7 +24,7 @@ >> >> include Config >> >> -VER = 3.14.10 >> +VER = 3.14.14 >> >> THISAPP = apcupsd-$(VER) >> DL_FILE = $(THISAPP).tar.gz >> @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) >> DIR_APP = $(DIR_SRC)/$(THISAPP) >> TARGET = $(DIR_INFO)/$(THISAPP) >> PROG = apcupsd >> -PAK_VER = 5 >> +PAK_VER = 6 >> >> DEPS = "" >> >> @@ -44,7 +44,7 @@ objects = $(DL_FILE) >> >> $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >> >> -$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23 >> +$(DL_FILE)_MD5 = cc8f5ced77f38906a274787acb9bc980 >> >> install : $(TARGET) >> ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 5/6] apcupsd: update to 3.14.14 2017-03-13 13:15 ` Marcel Lorenz @ 2017-03-13 14:14 ` Michael Tremer 0 siblings, 0 replies; 15+ messages in thread From: Michael Tremer @ 2017-03-13 14:14 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 2647 bytes --] It built in the i586 and x86_64 nightly builds. So it's fine. On Mon, 2017-03-13 at 14:15 +0100, Marcel Lorenz wrote: > The old version fails build after update ffmpeg and his dependencies, > but I do not know exactly... > > Am 2017-03-12 17:04, schrieb Michael Tremer: > > > > Is this patch actually supposed to be in this patchset? > > > > On Sun, 2016-11-13 at 20:23 +0100, Marcel Lorenz wrote: > > > > > > Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> > > > --- > > > lfs/apcupsd | 8 ++++---- > > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > > > diff --git a/lfs/apcupsd b/lfs/apcupsd > > > index 4e9137b..3e2ba20 100644 > > > --- a/lfs/apcupsd > > > +++ b/lfs/apcupsd > > > @@ -1,7 +1,7 @@ > > > ######################################################################### > > > #### > > > ## > > > # > > > > > > # > > > # IPFire.org - A linux based > > > firewall # > > > -# Copyright (C) 2007-2012 IPFire > > > Team <info(a)ipfire.org> > > > # > > > +# Copyright (C) 2007-2016 IPFire > > > Team <info(a)ipfire.org> > > > # > > > # > > > > > > # > > > # This program is free software: you can redistribute it and/or > > > modify # > > > # it under the terms of the GNU General Public License as published > > > by # > > > @@ -24,7 +24,7 @@ > > > > > > include Config > > > > > > -VER = 3.14.10 > > > +VER = 3.14.14 > > > > > > THISAPP = apcupsd-$(VER) > > > DL_FILE = $(THISAPP).tar.gz > > > @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) > > > DIR_APP = $(DIR_SRC)/$(THISAPP) > > > TARGET = $(DIR_INFO)/$(THISAPP) > > > PROG = apcupsd > > > -PAK_VER = 5 > > > +PAK_VER = 6 > > > > > > DEPS = "" > > > > > > @@ -44,7 +44,7 @@ objects = $(DL_FILE) > > > > > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > > > > > -$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23 > > > +$(DL_FILE)_MD5 = cc8f5ced77f38906a274787acb9bc980 > > > > > > install : $(TARGET) > > > > [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 6/6] mpd: update to 0.19.19 2016-11-13 19:23 [PATCH 0/6] Update ffmepg and the packages that use it Marcel Lorenz ` (4 preceding siblings ...) 2016-11-13 19:23 ` [PATCH 5/6] apcupsd: update to 3.14.14 Marcel Lorenz @ 2016-11-13 19:24 ` Marcel Lorenz 5 siblings, 0 replies; 15+ messages in thread From: Marcel Lorenz @ 2016-11-13 19:24 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 2246 bytes --] Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- lfs/mpd | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/lfs/mpd b/lfs/mpd index 7b2c54d..280db3e 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,15 +24,15 @@ include Config -VER = 0.16.5 +VER = 0.19.19 THISAPP = mpd-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 14 +PAK_VER = 15 DEPS = "alsa faad2 ffmpeg-libs flac lame libmad libshout libogg libid3tag libvorbis" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f7564cff12035f6a1112cce770655df7 +$(DL_FILE)_MD5 = 6e4fca9a9c26dad08b61bac9a91802db install : $(TARGET) @@ -78,9 +78,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr \ - --disable-ipv6 \ - --sysconfdir=/etc \ - --disable-sqlite + --disable-ipv6 \ + --sysconfdir=/etc \ + --disable-sqlite \ + --enable-id3 \ + --enable-vorbis \ + --enable-expat \ + --enable-ffmpeg \ + --enable-flac \ + --enable-lame-encoder \ + --enable-wavpack \ + --enable-upnp \ + --disable-icu cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) -- 2.9.3 ^ permalink raw reply [flat|nested] 15+ messages in thread
[parent not found: <1479486635.4372.3@mail01.ipfire.org>]
* Re: [PATCH 1/6] ffmpeg and ffmpeg-libs: update 3.1.4 [not found] <1479486635.4372.3@mail01.ipfire.org> @ 2017-03-12 16:08 ` Michael Tremer 2017-03-13 13:23 ` Marcel Lorenz 0 siblings, 1 reply; 15+ messages in thread From: Michael Tremer @ 2017-03-12 16:08 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 26465 bytes --] On Fri, 2016-11-18 at 17:30 +0100, Jonatan Schlag wrote: > Hi, > > Am So, 13. Nov, 2016 um 8:23 schrieb Marcel Lorenz <marcel.lorenz(a)ipfire.org>: > > Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> > > --- > > config/rootfiles/packages/ffmpeg | 230 ++++++++++++++++++++++++++---- > > config/rootfiles/packages/ffmpeg-libs | 260 ++++++++++++++++++++++++++----- > > --- > > lfs/ffmpeg | 29 ++-- > > lfs/ffmpeg-libs | 6 +- > > 4 files changed, 424 insertions(+), 101 deletions(-) > > > > diff --git a/config/rootfiles/packages/ffmpeg > > b/config/rootfiles/packages/ffmpeg > > index d403ca1..aa7a96d 100644 > > --- a/config/rootfiles/packages/ffmpeg > > +++ b/config/rootfiles/packages/ffmpeg > > @@ -1,64 +1,240 @@ > > usr/bin/ffmpeg > > usr/bin/ffplay > > +usr/bin/ffprobe > > usr/bin/ffserver > > #usr/include/libavcodec > > #usr/include/libavcodec/avcodec.h > > -#usr/include/libavcodec/opt.h > > +#usr/include/libavcodec/avdct.h > > +#usr/include/libavcodec/avfft.h > > +#usr/include/libavcodec/d3d11va.h > > +#usr/include/libavcodec/dirac.h > > +#usr/include/libavcodec/dv_profile.h > > +#usr/include/libavcodec/dxva2.h > > +#usr/include/libavcodec/jni.h > > +#usr/include/libavcodec/qsv.h > > +#usr/include/libavcodec/vaapi.h > > +#usr/include/libavcodec/vda.h > > +#usr/include/libavcodec/vdpau.h > > +#usr/include/libavcodec/version.h > > +#usr/include/libavcodec/videotoolbox.h > > +#usr/include/libavcodec/vorbis_parser.h > > +#usr/include/libavcodec/xvmc.h > > #usr/include/libavdevice > > #usr/include/libavdevice/avdevice.h > > +#usr/include/libavdevice/version.h > > +#usr/include/libavfilter > > +#usr/include/libavfilter/avfilter.h > > +#usr/include/libavfilter/avfiltergraph.h > > +#usr/include/libavfilter/buffersink.h > > +#usr/include/libavfilter/buffersrc.h > > +#usr/include/libavfilter/version.h > > #usr/include/libavformat > > #usr/include/libavformat/avformat.h > > #usr/include/libavformat/avio.h > > -#usr/include/libavformat/rtsp.h > > -#usr/include/libavformat/rtspcodes.h > > +#usr/include/libavformat/version.h > > #usr/include/libavutil > > #usr/include/libavutil/adler32.h > > +#usr/include/libavutil/aes.h > > +#usr/include/libavutil/aes_ctr.h > > +#usr/include/libavutil/attributes.h > > +#usr/include/libavutil/audio_fifo.h > > +#usr/include/libavutil/avassert.h > > +#usr/include/libavutil/avconfig.h > > #usr/include/libavutil/avstring.h > > #usr/include/libavutil/avutil.h > > #usr/include/libavutil/base64.h > > +#usr/include/libavutil/blowfish.h > > +#usr/include/libavutil/bprint.h > > +#usr/include/libavutil/bswap.h > > +#usr/include/libavutil/buffer.h > > +#usr/include/libavutil/camellia.h > > +#usr/include/libavutil/cast5.h > > +#usr/include/libavutil/channel_layout.h > > #usr/include/libavutil/common.h > > +#usr/include/libavutil/cpu.h > > #usr/include/libavutil/crc.h > > +#usr/include/libavutil/des.h > > +#usr/include/libavutil/dict.h > > +#usr/include/libavutil/display.h > > +#usr/include/libavutil/downmix_info.h > > +#usr/include/libavutil/error.h > > +#usr/include/libavutil/eval.h > > +#usr/include/libavutil/ffversion.h > > #usr/include/libavutil/fifo.h > > -#usr/include/libavutil/intfloat_readwrite.h > > +#usr/include/libavutil/file.h > > +#usr/include/libavutil/frame.h > > +#usr/include/libavutil/hash.h > > +#usr/include/libavutil/hmac.h > > +#usr/include/libavutil/hwcontext.h > > +#usr/include/libavutil/hwcontext_cuda.h > > +#usr/include/libavutil/hwcontext_dxva2.h > > +#usr/include/libavutil/hwcontext_vaapi.h > > +#usr/include/libavutil/hwcontext_vdpau.h > > +#usr/include/libavutil/imgutils.h > > +#usr/include/libavutil/intfloat.h > > +#usr/include/libavutil/intreadwrite.h > > +#usr/include/libavutil/lfg.h > > #usr/include/libavutil/log.h > > #usr/include/libavutil/lzo.h > > +#usr/include/libavutil/macros.h > > +#usr/include/libavutil/mastering_display_metadata.h > > #usr/include/libavutil/mathematics.h > > #usr/include/libavutil/md5.h > > #usr/include/libavutil/mem.h > > -#usr/include/libavutil/random.h > > +#usr/include/libavutil/motion_vector.h > > +#usr/include/libavutil/murmur3.h > > +#usr/include/libavutil/opt.h > > +#usr/include/libavutil/parseutils.h > > +#usr/include/libavutil/pixdesc.h > > +#usr/include/libavutil/pixelutils.h > > +#usr/include/libavutil/pixfmt.h > > +#usr/include/libavutil/random_seed.h > > #usr/include/libavutil/rational.h > > -#usr/include/libavutil/sha1.h > > +#usr/include/libavutil/rc4.h > > +#usr/include/libavutil/replaygain.h > > +#usr/include/libavutil/ripemd.h > > +#usr/include/libavutil/samplefmt.h > > +#usr/include/libavutil/sha.h > > +#usr/include/libavutil/sha512.h > > +#usr/include/libavutil/stereo3d.h > > +#usr/include/libavutil/tea.h > > +#usr/include/libavutil/threadmessage.h > > +#usr/include/libavutil/time.h > > +#usr/include/libavutil/timecode.h > > +#usr/include/libavutil/timestamp.h > > +#usr/include/libavutil/tree.h > > +#usr/include/libavutil/twofish.h > > +#usr/include/libavutil/version.h > > +#usr/include/libavutil/xtea.h > > +#usr/include/libpostproc > > +#usr/include/libpostproc/postprocess.h > > +#usr/include/libpostproc/version.h > > +#usr/include/libswresample > > +#usr/include/libswresample/swresample.h > > +#usr/include/libswresample/version.h > > +#usr/include/libswscale > > +#usr/include/libswscale/swscale.h > > +#usr/include/libswscale/version.h > > #usr/lib/libavcodec.a > > #usr/lib/libavcodec.so > > -#usr/lib/libavcodec.so.51 > > -#usr/lib/libavcodec.so.51.54.0 > > +#usr/lib/libavcodec.so.57 > > +#usr/lib/libavcodec.so.57.48.101 > > #usr/lib/libavdevice.a > > #usr/lib/libavdevice.so > > -#usr/lib/libavdevice.so.52 > > -#usr/lib/libavdevice.so.52.0.0 > > +#usr/lib/libavdevice.so.57 > > +#usr/lib/libavdevice.so.57.0.101 > > +#usr/lib/libavfilter.a > > +#usr/lib/libavfilter.so > > +#usr/lib/libavfilter.so.6 > > +#usr/lib/libavfilter.so.6.47.100 > > #usr/lib/libavformat.a > > #usr/lib/libavformat.so > > -#usr/lib/libavformat.so.52 > > -#usr/lib/libavformat.so.52.13.0 > > +#usr/lib/libavformat.so.57 > > +#usr/lib/libavformat.so.57.41.100 > > #usr/lib/libavutil.a > > #usr/lib/libavutil.so > > -#usr/lib/libavutil.so.49 > > -#usr/lib/libavutil.so.49.6.0 > > -#usr/lib/pkgconfig > > +#usr/lib/libavutil.so.55 > > +#usr/lib/libavutil.so.55.28.100 > > +#usr/lib/libpostproc.a > > +#usr/lib/libpostproc.so > > +#usr/lib/libpostproc.so.54 > > +#usr/lib/libpostproc.so.54.0.100 > > +#usr/lib/libswresample.a > > +#usr/lib/libswresample.so > > +#usr/lib/libswresample.so.2 > > +#usr/lib/libswresample.so.2.1.100 > > +#usr/lib/libswscale.a > > +#usr/lib/libswscale.so > > +#usr/lib/libswscale.so.4 > > +#usr/lib/libswscale.so.4.1.100 > > #usr/lib/pkgconfig/libavcodec.pc > > #usr/lib/pkgconfig/libavdevice.pc > > +#usr/lib/pkgconfig/libavfilter.pc > > #usr/lib/pkgconfig/libavformat.pc > > #usr/lib/pkgconfig/libavutil.pc > > -#usr/lib/vhook > > -#usr/lib/vhook/drawtext.so > > -#usr/lib/vhook/fish.so > > -#usr/lib/vhook/null.so > > -#usr/lib/vhook/ppm.so > > -#usr/lib/vhook/watermark.so > > -#usr/include/libpostproc > > -#usr/include/libpostproc/postprocess.h > > -#usr/lib/libpostproc.a > > -#usr/lib/libpostproc.so > > -#usr/lib/libpostproc.so.51 > > -#usr/lib/libpostproc.so.51.1.0 > > #usr/lib/pkgconfig/libpostproc.pc > > +#usr/lib/pkgconfig/libswresample.pc > > +#usr/lib/pkgconfig/libswscale.pc > > +#usr/share/doc/ffmpeg > > +#usr/share/doc/ffmpeg/developer.html > > +#usr/share/doc/ffmpeg/faq.html > > +#usr/share/doc/ffmpeg/fate.html > > +#usr/share/doc/ffmpeg/ffmpeg-all.html > > +#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html > > +#usr/share/doc/ffmpeg/ffmpeg-codecs.html > > +#usr/share/doc/ffmpeg/ffmpeg-devices.html > > +#usr/share/doc/ffmpeg/ffmpeg-filters.html > > +#usr/share/doc/ffmpeg/ffmpeg-formats.html > > +#usr/share/doc/ffmpeg/ffmpeg-protocols.html > > +#usr/share/doc/ffmpeg/ffmpeg-resampler.html > > +#usr/share/doc/ffmpeg/ffmpeg-scaler.html > > +#usr/share/doc/ffmpeg/ffmpeg-utils.html > > +#usr/share/doc/ffmpeg/ffmpeg.html > > +#usr/share/doc/ffmpeg/ffplay-all.html > > +#usr/share/doc/ffmpeg/ffplay.html > > +#usr/share/doc/ffmpeg/ffprobe-all.html > > +#usr/share/doc/ffmpeg/ffprobe.html > > +#usr/share/doc/ffmpeg/ffserver-all.html > > +#usr/share/doc/ffmpeg/ffserver.html > > +#usr/share/doc/ffmpeg/general.html > > +#usr/share/doc/ffmpeg/git-howto.html > > +#usr/share/doc/ffmpeg/libavcodec.html > > +#usr/share/doc/ffmpeg/libavdevice.html > > +#usr/share/doc/ffmpeg/libavfilter.html > > +#usr/share/doc/ffmpeg/libavformat.html > > +#usr/share/doc/ffmpeg/libavutil.html > > +#usr/share/doc/ffmpeg/libswresample.html > > +#usr/share/doc/ffmpeg/libswscale.html > > +#usr/share/doc/ffmpeg/nut.html > > +#usr/share/doc/ffmpeg/platform.html > > +#usr/share/ffmpeg > > +#usr/share/ffmpeg/examples > > +#usr/share/ffmpeg/examples/Makefile > > +#usr/share/ffmpeg/examples/README > > +#usr/share/ffmpeg/examples/avio_dir_cmd.c > > +#usr/share/ffmpeg/examples/avio_reading.c > > +#usr/share/ffmpeg/examples/decoding_encoding.c > > +#usr/share/ffmpeg/examples/demuxing_decoding.c > > +#usr/share/ffmpeg/examples/extract_mvs.c > > +#usr/share/ffmpeg/examples/filter_audio.c > > +#usr/share/ffmpeg/examples/filtering_audio.c > > +#usr/share/ffmpeg/examples/filtering_video.c > > +#usr/share/ffmpeg/examples/http_multiclient.c > > +#usr/share/ffmpeg/examples/metadata.c > > +#usr/share/ffmpeg/examples/muxing.c > > +#usr/share/ffmpeg/examples/qsvdec.c > > +#usr/share/ffmpeg/examples/remuxing.c > > +#usr/share/ffmpeg/examples/resampling_audio.c > > +#usr/share/ffmpeg/examples/scaling_video.c > > +#usr/share/ffmpeg/examples/transcode_aac.c > > +#usr/share/ffmpeg/examples/transcoding.c > > +#usr/share/ffmpeg/ffprobe.xsd > > +#usr/share/ffmpeg/libvpx-1080p.ffpreset > > +#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset > > +#usr/share/ffmpeg/libvpx-360p.ffpreset > > +#usr/share/ffmpeg/libvpx-720p.ffpreset > > +#usr/share/ffmpeg/libvpx-720p50_60.ffpreset > > +#usr/share/man/man1/ffmpeg-all.1 > > +#usr/share/man/man1/ffmpeg-bitstream-filters.1 > > +#usr/share/man/man1/ffmpeg-codecs.1 > > +#usr/share/man/man1/ffmpeg-devices.1 > > +#usr/share/man/man1/ffmpeg-filters.1 > > +#usr/share/man/man1/ffmpeg-formats.1 > > +#usr/share/man/man1/ffmpeg-protocols.1 > > +#usr/share/man/man1/ffmpeg-resampler.1 > > +#usr/share/man/man1/ffmpeg-scaler.1 > > +#usr/share/man/man1/ffmpeg-utils.1 > > +#usr/share/man/man1/ffmpeg.1 > > +#usr/share/man/man1/ffplay-all.1 > > +#usr/share/man/man1/ffplay.1 > > +#usr/share/man/man1/ffprobe-all.1 > > +#usr/share/man/man1/ffprobe.1 > > +#usr/share/man/man1/ffserver-all.1 > > +#usr/share/man/man1/ffserver.1 > > +#usr/share/man/man3/libavcodec.3 > > +#usr/share/man/man3/libavdevice.3 > > +#usr/share/man/man3/libavfilter.3 > > +#usr/share/man/man3/libavformat.3 > > +#usr/share/man/man3/libavutil.3 > > +#usr/share/man/man3/libswresample.3 > > +#usr/share/man/man3/libswscale.3 > > diff --git a/config/rootfiles/packages/ffmpeg-libs > > b/config/rootfiles/packages/ffmpeg-libs > > index a58dcd5..1f401ec 100644 > > --- a/config/rootfiles/packages/ffmpeg-libs > > +++ b/config/rootfiles/packages/ffmpeg-libs > > @@ -1,64 +1,212 @@ > > #usr/bin/ffmpeg > > #usr/bin/ffplay > > #usr/bin/ffserver > > -#usr/include/libavcodec > > -#usr/include/libavcodec/avcodec.h > > -#usr/include/libavcodec/opt.h > > -#usr/include/libavdevice > > -#usr/include/libavdevice/avdevice.h > > -#usr/include/libavformat > > -#usr/include/libavformat/avformat.h > > -#usr/include/libavformat/avio.h > > -#usr/include/libavformat/rtsp.h > > -#usr/include/libavformat/rtspcodes.h > > -#usr/include/libavutil > > -#usr/include/libavutil/adler32.h > > -#usr/include/libavutil/avstring.h > > -#usr/include/libavutil/avutil.h > > -#usr/include/libavutil/base64.h > > -#usr/include/libavutil/common.h > > -#usr/include/libavutil/crc.h > > -#usr/include/libavutil/fifo.h > > -#usr/include/libavutil/intfloat_readwrite.h > > -#usr/include/libavutil/log.h > > -#usr/include/libavutil/lzo.h > > -#usr/include/libavutil/mathematics.h > > -#usr/include/libavutil/md5.h > > -#usr/include/libavutil/mem.h > > -#usr/include/libavutil/random.h > > -#usr/include/libavutil/rational.h > > -#usr/include/libavutil/sha1.h > > +#usr/bin/ffprobe > > +#usr/include/libavcodec/avdct.h > > +#usr/include/libavcodec/avfft.h > > +#usr/include/libavcodec/d3d11va.h > > +#usr/include/libavcodec/dirac.h > > +#usr/include/libavcodec/dv_profile.h > > +#usr/include/libavcodec/dxva2.h > > +#usr/include/libavcodec/jni.h > > +#usr/include/libavcodec/qsv.h > > +#usr/include/libavcodec/vaapi.h > > +#usr/include/libavcodec/vda.h > > +#usr/include/libavcodec/vdpau.h > > +#usr/include/libavcodec/version.h > > +#usr/include/libavcodec/videotoolbox.h > > +#usr/include/libavcodec/vorbis_parser.h > > +#usr/include/libavcodec/xvmc.h > > +#usr/include/libavdevice/version.h > > +#usr/include/libavfilter > > +#usr/include/libavfilter/avfilter.h > > +#usr/include/libavfilter/avfiltergraph.h > > +#usr/include/libavfilter/buffersink.h > > +#usr/include/libavfilter/buffersrc.h > > +#usr/include/libavfilter/version.h > > +#usr/include/libavformat/version.h > > +#usr/include/libavutil/aes.h > > +#usr/include/libavutil/aes_ctr.h > > +#usr/include/libavutil/attributes.h > > +#usr/include/libavutil/audio_fifo.h > > +#usr/include/libavutil/avassert.h > > +#usr/include/libavutil/avconfig.h > > +#usr/include/libavutil/blowfish.h > > +#usr/include/libavutil/bprint.h > > +#usr/include/libavutil/bswap.h > > +#usr/include/libavutil/buffer.h > > +#usr/include/libavutil/camellia.h > > +#usr/include/libavutil/cast5.h > > +#usr/include/libavutil/channel_layout.h > > +#usr/include/libavutil/cpu.h > > +#usr/include/libavutil/des.h > > +#usr/include/libavutil/dict.h > > +#usr/include/libavutil/display.h > > +#usr/include/libavutil/downmix_info.h > > +#usr/include/libavutil/error.h > > +#usr/include/libavutil/eval.h > > +#usr/include/libavutil/ffversion.h > > +#usr/include/libavutil/file.h > > +#usr/include/libavutil/frame.h > > +#usr/include/libavutil/hash.h > > +#usr/include/libavutil/hmac.h > > +#usr/include/libavutil/hwcontext.h > > +#usr/include/libavutil/hwcontext_cuda.h > > +#usr/include/libavutil/hwcontext_dxva2.h > > +#usr/include/libavutil/hwcontext_vaapi.h > > +#usr/include/libavutil/hwcontext_vdpau.h > > +#usr/include/libavutil/imgutils.h > > +#usr/include/libavutil/intfloat.h > > +#usr/include/libavutil/intreadwrite.h > > +#usr/include/libavutil/lfg.h > > +#usr/include/libavutil/macros.h > > +#usr/include/libavutil/mastering_display_metadata.h > > +#usr/include/libavutil/motion_vector.h > > +#usr/include/libavutil/murmur3.h > > +#usr/include/libavutil/opt.h > > +#usr/include/libavutil/parseutils.h > > +#usr/include/libavutil/pixdesc.h > > +#usr/include/libavutil/pixelutils.h > > +#usr/include/libavutil/pixfmt.h > > +#usr/include/libavutil/random_seed.h > > +#usr/include/libavutil/rc4.h > > +#usr/include/libavutil/replaygain.h > > +#usr/include/libavutil/ripemd.h > > +#usr/include/libavutil/samplefmt.h > > +#usr/include/libavutil/sha.h > > +#usr/include/libavutil/sha512.h > > +#usr/include/libavutil/stereo3d.h > > +#usr/include/libavutil/tea.h > > +#usr/include/libavutil/threadmessage.h > > +#usr/include/libavutil/time.h > > +#usr/include/libavutil/timecode.h > > +#usr/include/libavutil/timestamp.h > > +#usr/include/libavutil/tree.h > > +#usr/include/libavutil/twofish.h > > +#usr/include/libavutil/version.h > > +#usr/include/libavutil/xtea.h > > +#usr/include/libpostproc/version.h > > +#usr/include/libswresample > > +#usr/include/libswresample/swresample.h > > +#usr/include/libswresample/version.h > > +#usr/include/libswscale > > +#usr/include/libswscale/swscale.h > > +#usr/include/libswscale/version.h, > > #usr/lib/libavcodec.a > > -usr/lib/libavcodec.so > > -usr/lib/libavcodec.so.51 > > -usr/lib/libavcodec.so.51.54.0 > > +#usr/lib/libavcodec.so > > +usr/lib/libavcodec.so.57 > > +usr/lib/libavcodec.so.57.48.101 > > #usr/lib/libavdevice.a > > -usr/lib/libavdevice.so > > -usr/lib/libavdevice.so.52 > > -usr/lib/libavdevice.so.52.0.0 > > +#usr/lib/libavdevice.so > > +usr/lib/libavdevice.so.57 > > +usr/lib/libavdevice.so.57.0.101 > > +#usr/lib/libavfilter.a > > +#usr/lib/libavfilter.so > > +usr/lib/libavfilter.so.6 > > +usr/lib/libavfilter.so.6.47.100 > > #usr/lib/libavformat.a > > -usr/lib/libavformat.so > > -usr/lib/libavformat.so.52 > > -usr/lib/libavformat.so.52.13.0 > > +#usr/lib/libavformat.so > > +usr/lib/libavformat.so.57 > > +usr/lib/libavformat.so.57.41.100 > > #usr/lib/libavutil.a > > -usr/lib/libavutil.so > > -usr/lib/libavutil.so.49 > > -usr/lib/libavutil.so.49.6.0 > > -#usr/lib/pkgconfig > > -usr/lib/pkgconfig/libavcodec.pc > > -usr/lib/pkgconfig/libavdevice.pc > > -usr/lib/pkgconfig/libavformat.pc > > -usr/lib/pkgconfig/libavutil.pc > > -#usr/lib/vhook > > -usr/lib/vhook/drawtext.so > > -usr/lib/vhook/fish.so > > -usr/lib/vhook/null.so > > -usr/lib/vhook/ppm.so > > -usr/lib/vhook/watermark.so > > -#usr/include/libpostproc > > -#usr/include/libpostproc/postprocess.h > > +#usr/lib/libavutil.so > > +usr/lib/libavutil.so.55 > > +usr/lib/libavutil.so.55.28.100 > > #usr/lib/libpostproc.a > > -usr/lib/libpostproc.so > > -usr/lib/libpostproc.so.51 > > -usr/lib/libpostproc.so.51.1.0 > > -usr/lib/pkgconfig/libpostproc.pc > > +#usr/lib/libpostproc.so > > +usr/lib/libpostproc.so.54 > > +usr/lib/libpostproc.so.54.0.100 > > +#usr/lib/libswresample.a > > +#usr/lib/libswresample.so > > +usr/lib/libswresample.so.2 > > +usr/lib/libswresample.so.2.1.100 > > +#usr/lib/libswscale.a > > +#usr/lib/libswscale.so > > +usr/lib/libswscale.so.4 > > +usr/lib/libswscale.so.4.1.100 > > +#usr/lib/pkgconfig/libavfilter.pc > > +#usr/lib/pkgconfig/libswresample.pc > > +#usr/lib/pkgconfig/libswscale.pc > > +#usr/share/doc/ffmpeg > > +#usr/share/doc/ffmpeg/developer.html > > +#usr/share/doc/ffmpeg/faq.html > > +#usr/share/doc/ffmpeg/fate.html > > +#usr/share/doc/ffmpeg/ffmpeg-all.html > > +#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html > > +#usr/share/doc/ffmpeg/ffmpeg-codecs.html > > +#usr/share/doc/ffmpeg/ffmpeg-devices.html > > +#usr/share/doc/ffmpeg/ffmpeg-filters.html > > +#usr/share/doc/ffmpeg/ffmpeg-formats.html > > +#usr/share/doc/ffmpeg/ffmpeg-protocols.html > > +#usr/share/doc/ffmpeg/ffmpeg-resampler.html > > +#usr/share/doc/ffmpeg/ffmpeg-scaler.html > > +#usr/share/doc/ffmpeg/ffmpeg-utils.html > > +#usr/share/doc/ffmpeg/ffmpeg.html > > +#usr/share/doc/ffmpeg/ffplay-all.html > > +#usr/share/doc/ffmpeg/ffplay.html > > +#usr/share/doc/ffmpeg/ffprobe-all.html > > +#usr/share/doc/ffmpeg/ffprobe.html > > +#usr/share/doc/ffmpeg/ffserver-all.html > > +#usr/share/doc/ffmpeg/ffserver.html > > +#usr/share/doc/ffmpeg/general.html > > +#usr/share/doc/ffmpeg/git-howto.html > > +#usr/share/doc/ffmpeg/libavcodec.html > > +#usr/share/doc/ffmpeg/libavdevice.html > > +#usr/share/doc/ffmpeg/libavfilter.html > > +#usr/share/doc/ffmpeg/libavformat.html > > +#usr/share/doc/ffmpeg/libavutil.html > > +#usr/share/doc/ffmpeg/libswresample.html > > +#usr/share/doc/ffmpeg/libswscale.html > > +#usr/share/doc/ffmpeg/nut.html > > +#usr/share/doc/ffmpeg/platform.html > > +#usr/share/ffmpeg > > +#usr/share/ffmpeg/examples > > +#usr/share/ffmpeg/examples/Makefile > > +#usr/share/ffmpeg/examples/README > > +#usr/share/ffmpeg/examples/avio_dir_cmd.c > > +#usr/share/ffmpeg/examples/avio_reading.c > > +#usr/share/ffmpeg/examples/decoding_encoding.c > > +#usr/share/ffmpeg/examples/demuxing_decoding.c > > +#usr/share/ffmpeg/examples/extract_mvs.c > > +#usr/share/ffmpeg/examples/filter_audio.c > > +#usr/share/ffmpeg/examples/filtering_audio.c > > +#usr/share/ffmpeg/examples/filtering_video.c > > +#usr/share/ffmpeg/examples/http_multiclient.c > > +#usr/share/ffmpeg/examples/metadata.c > > +#usr/share/ffmpeg/examples/muxing.c > > +#usr/share/ffmpeg/examples/qsvdec.c > > +#usr/share/ffmpeg/examples/remuxing.c > > +#usr/share/ffmpeg/examples/resampling_audio.c > > +#usr/share/ffmpeg/examples/scaling_video.c > > +#usr/share/ffmpeg/examples/transcode_aac.c > > +#usr/share/ffmpeg/examples/transcoding.c > > +#usr/share/ffmpeg/ffprobe.xsd > > +#usr/share/ffmpeg/libvpx-1080p.ffpreset > > +#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset > > +#usr/share/ffmpeg/libvpx-360p.ffpreset > > +#usr/share/ffmpeg/libvpx-720p.ffpreset > > +#usr/share/ffmpeg/libvpx-720p50_60.ffpreset > > +#usr/share/man/man1/ffmpeg-all.1 > > +#usr/share/man/man1/ffmpeg-bitstream-filters.1 > > +#usr/share/man/man1/ffmpeg-codecs.1 > > +#usr/share/man/man1/ffmpeg-devices.1 > > +#usr/share/man/man1/ffmpeg-filters.1 > > +#usr/share/man/man1/ffmpeg-formats.1 > > +#usr/share/man/man1/ffmpeg-protocols.1 > > +#usr/share/man/man1/ffmpeg-resampler.1 > > +#usr/share/man/man1/ffmpeg-scaler.1 > > +#usr/share/man/man1/ffmpeg-utils.1 > > +#usr/share/man/man1/ffmpeg.1 > > +#usr/share/man/man1/ffplay-all.1 > > +#usr/share/man/man1/ffplay.1 > > +#usr/share/man/man1/ffprobe-all.1 > > +#usr/share/man/man1/ffprobe.1 > > +#usr/share/man/man1/ffserver-all.1 > > +#usr/share/man/man1/ffserver.1 > > +#usr/share/man/man3/libavcodec.3 > > +#usr/share/man/man3/libavdevice.3 > > +#usr/share/man/man3/libavfilter.3 > > +#usr/share/man/man3/libavformat.3 > > +#usr/share/man/man3/libavutil.3 > > +#usr/share/man/man3/libswresample.3 > > +#usr/share/man/man3/libswscale.3 > > diff --git a/lfs/ffmpeg b/lfs/ffmpeg > > index b383886..76c0c73 100644 > > --- a/lfs/ffmpeg > > +++ b/lfs/ffmpeg > > @@ -1,7 +1,7 @@ > > ########################################################################### > > #### > > # > > # > > # IPFire.org - A linux based > > firewall # > > -# Copyright (C) 2007 Michael Tremer & Christian > > Schmidt # > > +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> > > # > > # > > # > > # This program is free software: you can redistribute it and/or > > modify # > > # it under the terms of the GNU General Public License as published > > by # > > @@ -24,19 +24,19 @@ > > > > include Config > > > > -VER = 2008-04-13 > > -THISAPP = ffmpeg-export-$(VER) > > +VER = 3.1.4 > > +THISAPP = ffmpeg-$(VER) > > DL_FILE = $(THISAPP).tar.bz2 > > DL_FROM = $(URL_IPFIRE) > > DIR_APP = $(DIR_SRC)/$(THISAPP) > > TARGET = $(DIR_INFO)/$(THISAPP) > > PROG = ffmpeg > > -PAK_VER = 5 > > +PAK_VER = 6 > > > > DEPS = "ffmpeg-libs sdl lame libvorbis xvid" > > > > # Don't use PIC for libavcodec > > -CFLAGS += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack > > +#CFLAGS += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack > Why did you comment these C flags out? Did we need them no longer or are there > another reasons? These disable hardening and were probably introduced to avoid any issues with inline assembly that uses the %ebx register. To confirm if this is removed in the new release someone could just remove the CFLAGS and rebuild this on i586. If that goes through, everything is fine. > > > > > > ########################################################################### > > #### > > # Top-level Rules > > @@ -46,7 +46,7 @@ objects = $(DL_FILE) > > > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > > > -$(DL_FILE)_MD5 = 017ab929ff92be552debb65c589c2183 > > +$(DL_FILE)_MD5 = 1c099ec01cef5caadd05a4f78561c560 > > > > install : $(TARGET) > > > > @@ -79,14 +79,13 @@ $(subst %,%_MD5,$(objects)) : > > $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > > @$(PREBUILD) > > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) > > - ln -s $(THISAPP) /usr/src/ffmpeg > > - cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \ > > - --enable-shared \ > > - > > --enable-postproc \ > > - > > --enable-pthreads \ > > - > > --enable-gpl > > - cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE) > > - cd $(DIR_SRC)/ffmpeg && make install > > - cd $(DIR_SRC)/ffmpeg && make install-libs > > + cd $(DIR_APP) && ./configure --prefix=/usr \ > > + --enable-shared \ > > + --enable-postproc \ > > + --enable-pthreads \ > > + --enable-gpl > > + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) > > + cd $(DIR_APP) && make install > > + cd $(DIR_APP) && make install-libs > > @rm -rf $(DIR_APP) > > @$(POSTBUILD) > > diff --git a/lfs/ffmpeg-libs b/lfs/ffmpeg-libs > > index b29c978..8762964 100644 > > --- a/lfs/ffmpeg-libs > > +++ b/lfs/ffmpeg-libs > > @@ -1,7 +1,7 @@ > > ########################################################################### > > #### > > # > > # > > # IPFire.org - A linux based > > firewall # > > -# Copyright (C) 2007 Michael Tremer & Christian > > Schmidt # > > +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> > > # > > # > > # > > # This program is free software: you can redistribute it and/or > > modify # > > # it under the terms of the GNU General Public License as published > > by # > > @@ -24,10 +24,10 @@ > > > > include Config > > > > -VER = 2008-04-13 > > +VER = 3.1.4 > > THISAPP = ffmpeg-export-$(VER) > > PROG = ffmpeg-libs > > -PAK_VER = 5 > > +PAK_VER = 6 > > > > DEPS = "" > > > > -- > > 2.9.3 > Regards Jonatan [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/6] ffmpeg and ffmpeg-libs: update 3.1.4 2017-03-12 16:08 ` [PATCH 1/6] ffmpeg and ffmpeg-libs: update 3.1.4 Michael Tremer @ 2017-03-13 13:23 ` Marcel Lorenz 2017-03-13 14:15 ` Michael Tremer 0 siblings, 1 reply; 15+ messages in thread From: Marcel Lorenz @ 2017-03-13 13:23 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 28100 bytes --] This much newer ffmpeg version has only little to do with the old. I forget to remove die CFALGS line in the patch. I can make a new without. On my test with mpd i had no problems. Am 2017-03-12 17:08, schrieb Michael Tremer: > On Fri, 2016-11-18 at 17:30 +0100, Jonatan Schlag wrote: >> Hi, >> >> Am So, 13. Nov, 2016 um 8:23 schrieb Marcel Lorenz >> <marcel.lorenz(a)ipfire.org>: >> > Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> >> > --- >> > config/rootfiles/packages/ffmpeg | 230 ++++++++++++++++++++++++++---- >> > config/rootfiles/packages/ffmpeg-libs | 260 ++++++++++++++++++++++++++----- >> > --- >> > lfs/ffmpeg | 29 ++-- >> > lfs/ffmpeg-libs | 6 +- >> > 4 files changed, 424 insertions(+), 101 deletions(-) >> > >> > diff --git a/config/rootfiles/packages/ffmpeg >> > b/config/rootfiles/packages/ffmpeg >> > index d403ca1..aa7a96d 100644 >> > --- a/config/rootfiles/packages/ffmpeg >> > +++ b/config/rootfiles/packages/ffmpeg >> > @@ -1,64 +1,240 @@ >> > usr/bin/ffmpeg >> > usr/bin/ffplay >> > +usr/bin/ffprobe >> > usr/bin/ffserver >> > #usr/include/libavcodec >> > #usr/include/libavcodec/avcodec.h >> > -#usr/include/libavcodec/opt.h >> > +#usr/include/libavcodec/avdct.h >> > +#usr/include/libavcodec/avfft.h >> > +#usr/include/libavcodec/d3d11va.h >> > +#usr/include/libavcodec/dirac.h >> > +#usr/include/libavcodec/dv_profile.h >> > +#usr/include/libavcodec/dxva2.h >> > +#usr/include/libavcodec/jni.h >> > +#usr/include/libavcodec/qsv.h >> > +#usr/include/libavcodec/vaapi.h >> > +#usr/include/libavcodec/vda.h >> > +#usr/include/libavcodec/vdpau.h >> > +#usr/include/libavcodec/version.h >> > +#usr/include/libavcodec/videotoolbox.h >> > +#usr/include/libavcodec/vorbis_parser.h >> > +#usr/include/libavcodec/xvmc.h >> > #usr/include/libavdevice >> > #usr/include/libavdevice/avdevice.h >> > +#usr/include/libavdevice/version.h >> > +#usr/include/libavfilter >> > +#usr/include/libavfilter/avfilter.h >> > +#usr/include/libavfilter/avfiltergraph.h >> > +#usr/include/libavfilter/buffersink.h >> > +#usr/include/libavfilter/buffersrc.h >> > +#usr/include/libavfilter/version.h >> > #usr/include/libavformat >> > #usr/include/libavformat/avformat.h >> > #usr/include/libavformat/avio.h >> > -#usr/include/libavformat/rtsp.h >> > -#usr/include/libavformat/rtspcodes.h >> > +#usr/include/libavformat/version.h >> > #usr/include/libavutil >> > #usr/include/libavutil/adler32.h >> > +#usr/include/libavutil/aes.h >> > +#usr/include/libavutil/aes_ctr.h >> > +#usr/include/libavutil/attributes.h >> > +#usr/include/libavutil/audio_fifo.h >> > +#usr/include/libavutil/avassert.h >> > +#usr/include/libavutil/avconfig.h >> > #usr/include/libavutil/avstring.h >> > #usr/include/libavutil/avutil.h >> > #usr/include/libavutil/base64.h >> > +#usr/include/libavutil/blowfish.h >> > +#usr/include/libavutil/bprint.h >> > +#usr/include/libavutil/bswap.h >> > +#usr/include/libavutil/buffer.h >> > +#usr/include/libavutil/camellia.h >> > +#usr/include/libavutil/cast5.h >> > +#usr/include/libavutil/channel_layout.h >> > #usr/include/libavutil/common.h >> > +#usr/include/libavutil/cpu.h >> > #usr/include/libavutil/crc.h >> > +#usr/include/libavutil/des.h >> > +#usr/include/libavutil/dict.h >> > +#usr/include/libavutil/display.h >> > +#usr/include/libavutil/downmix_info.h >> > +#usr/include/libavutil/error.h >> > +#usr/include/libavutil/eval.h >> > +#usr/include/libavutil/ffversion.h >> > #usr/include/libavutil/fifo.h >> > -#usr/include/libavutil/intfloat_readwrite.h >> > +#usr/include/libavutil/file.h >> > +#usr/include/libavutil/frame.h >> > +#usr/include/libavutil/hash.h >> > +#usr/include/libavutil/hmac.h >> > +#usr/include/libavutil/hwcontext.h >> > +#usr/include/libavutil/hwcontext_cuda.h >> > +#usr/include/libavutil/hwcontext_dxva2.h >> > +#usr/include/libavutil/hwcontext_vaapi.h >> > +#usr/include/libavutil/hwcontext_vdpau.h >> > +#usr/include/libavutil/imgutils.h >> > +#usr/include/libavutil/intfloat.h >> > +#usr/include/libavutil/intreadwrite.h >> > +#usr/include/libavutil/lfg.h >> > #usr/include/libavutil/log.h >> > #usr/include/libavutil/lzo.h >> > +#usr/include/libavutil/macros.h >> > +#usr/include/libavutil/mastering_display_metadata.h >> > #usr/include/libavutil/mathematics.h >> > #usr/include/libavutil/md5.h >> > #usr/include/libavutil/mem.h >> > -#usr/include/libavutil/random.h >> > +#usr/include/libavutil/motion_vector.h >> > +#usr/include/libavutil/murmur3.h >> > +#usr/include/libavutil/opt.h >> > +#usr/include/libavutil/parseutils.h >> > +#usr/include/libavutil/pixdesc.h >> > +#usr/include/libavutil/pixelutils.h >> > +#usr/include/libavutil/pixfmt.h >> > +#usr/include/libavutil/random_seed.h >> > #usr/include/libavutil/rational.h >> > -#usr/include/libavutil/sha1.h >> > +#usr/include/libavutil/rc4.h >> > +#usr/include/libavutil/replaygain.h >> > +#usr/include/libavutil/ripemd.h >> > +#usr/include/libavutil/samplefmt.h >> > +#usr/include/libavutil/sha.h >> > +#usr/include/libavutil/sha512.h >> > +#usr/include/libavutil/stereo3d.h >> > +#usr/include/libavutil/tea.h >> > +#usr/include/libavutil/threadmessage.h >> > +#usr/include/libavutil/time.h >> > +#usr/include/libavutil/timecode.h >> > +#usr/include/libavutil/timestamp.h >> > +#usr/include/libavutil/tree.h >> > +#usr/include/libavutil/twofish.h >> > +#usr/include/libavutil/version.h >> > +#usr/include/libavutil/xtea.h >> > +#usr/include/libpostproc >> > +#usr/include/libpostproc/postprocess.h >> > +#usr/include/libpostproc/version.h >> > +#usr/include/libswresample >> > +#usr/include/libswresample/swresample.h >> > +#usr/include/libswresample/version.h >> > +#usr/include/libswscale >> > +#usr/include/libswscale/swscale.h >> > +#usr/include/libswscale/version.h >> > #usr/lib/libavcodec.a >> > #usr/lib/libavcodec.so >> > -#usr/lib/libavcodec.so.51 >> > -#usr/lib/libavcodec.so.51.54.0 >> > +#usr/lib/libavcodec.so.57 >> > +#usr/lib/libavcodec.so.57.48.101 >> > #usr/lib/libavdevice.a >> > #usr/lib/libavdevice.so >> > -#usr/lib/libavdevice.so.52 >> > -#usr/lib/libavdevice.so.52.0.0 >> > +#usr/lib/libavdevice.so.57 >> > +#usr/lib/libavdevice.so.57.0.101 >> > +#usr/lib/libavfilter.a >> > +#usr/lib/libavfilter.so >> > +#usr/lib/libavfilter.so.6 >> > +#usr/lib/libavfilter.so.6.47.100 >> > #usr/lib/libavformat.a >> > #usr/lib/libavformat.so >> > -#usr/lib/libavformat.so.52 >> > -#usr/lib/libavformat.so.52.13.0 >> > +#usr/lib/libavformat.so.57 >> > +#usr/lib/libavformat.so.57.41.100 >> > #usr/lib/libavutil.a >> > #usr/lib/libavutil.so >> > -#usr/lib/libavutil.so.49 >> > -#usr/lib/libavutil.so.49.6.0 >> > -#usr/lib/pkgconfig >> > +#usr/lib/libavutil.so.55 >> > +#usr/lib/libavutil.so.55.28.100 >> > +#usr/lib/libpostproc.a >> > +#usr/lib/libpostproc.so >> > +#usr/lib/libpostproc.so.54 >> > +#usr/lib/libpostproc.so.54.0.100 >> > +#usr/lib/libswresample.a >> > +#usr/lib/libswresample.so >> > +#usr/lib/libswresample.so.2 >> > +#usr/lib/libswresample.so.2.1.100 >> > +#usr/lib/libswscale.a >> > +#usr/lib/libswscale.so >> > +#usr/lib/libswscale.so.4 >> > +#usr/lib/libswscale.so.4.1.100 >> > #usr/lib/pkgconfig/libavcodec.pc >> > #usr/lib/pkgconfig/libavdevice.pc >> > +#usr/lib/pkgconfig/libavfilter.pc >> > #usr/lib/pkgconfig/libavformat.pc >> > #usr/lib/pkgconfig/libavutil.pc >> > -#usr/lib/vhook >> > -#usr/lib/vhook/drawtext.so >> > -#usr/lib/vhook/fish.so >> > -#usr/lib/vhook/null.so >> > -#usr/lib/vhook/ppm.so >> > -#usr/lib/vhook/watermark.so >> > -#usr/include/libpostproc >> > -#usr/include/libpostproc/postprocess.h >> > -#usr/lib/libpostproc.a >> > -#usr/lib/libpostproc.so >> > -#usr/lib/libpostproc.so.51 >> > -#usr/lib/libpostproc.so.51.1.0 >> > #usr/lib/pkgconfig/libpostproc.pc >> > +#usr/lib/pkgconfig/libswresample.pc >> > +#usr/lib/pkgconfig/libswscale.pc >> > +#usr/share/doc/ffmpeg >> > +#usr/share/doc/ffmpeg/developer.html >> > +#usr/share/doc/ffmpeg/faq.html >> > +#usr/share/doc/ffmpeg/fate.html >> > +#usr/share/doc/ffmpeg/ffmpeg-all.html >> > +#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html >> > +#usr/share/doc/ffmpeg/ffmpeg-codecs.html >> > +#usr/share/doc/ffmpeg/ffmpeg-devices.html >> > +#usr/share/doc/ffmpeg/ffmpeg-filters.html >> > +#usr/share/doc/ffmpeg/ffmpeg-formats.html >> > +#usr/share/doc/ffmpeg/ffmpeg-protocols.html >> > +#usr/share/doc/ffmpeg/ffmpeg-resampler.html >> > +#usr/share/doc/ffmpeg/ffmpeg-scaler.html >> > +#usr/share/doc/ffmpeg/ffmpeg-utils.html >> > +#usr/share/doc/ffmpeg/ffmpeg.html >> > +#usr/share/doc/ffmpeg/ffplay-all.html >> > +#usr/share/doc/ffmpeg/ffplay.html >> > +#usr/share/doc/ffmpeg/ffprobe-all.html >> > +#usr/share/doc/ffmpeg/ffprobe.html >> > +#usr/share/doc/ffmpeg/ffserver-all.html >> > +#usr/share/doc/ffmpeg/ffserver.html >> > +#usr/share/doc/ffmpeg/general.html >> > +#usr/share/doc/ffmpeg/git-howto.html >> > +#usr/share/doc/ffmpeg/libavcodec.html >> > +#usr/share/doc/ffmpeg/libavdevice.html >> > +#usr/share/doc/ffmpeg/libavfilter.html >> > +#usr/share/doc/ffmpeg/libavformat.html >> > +#usr/share/doc/ffmpeg/libavutil.html >> > +#usr/share/doc/ffmpeg/libswresample.html >> > +#usr/share/doc/ffmpeg/libswscale.html >> > +#usr/share/doc/ffmpeg/nut.html >> > +#usr/share/doc/ffmpeg/platform.html >> > +#usr/share/ffmpeg >> > +#usr/share/ffmpeg/examples >> > +#usr/share/ffmpeg/examples/Makefile >> > +#usr/share/ffmpeg/examples/README >> > +#usr/share/ffmpeg/examples/avio_dir_cmd.c >> > +#usr/share/ffmpeg/examples/avio_reading.c >> > +#usr/share/ffmpeg/examples/decoding_encoding.c >> > +#usr/share/ffmpeg/examples/demuxing_decoding.c >> > +#usr/share/ffmpeg/examples/extract_mvs.c >> > +#usr/share/ffmpeg/examples/filter_audio.c >> > +#usr/share/ffmpeg/examples/filtering_audio.c >> > +#usr/share/ffmpeg/examples/filtering_video.c >> > +#usr/share/ffmpeg/examples/http_multiclient.c >> > +#usr/share/ffmpeg/examples/metadata.c >> > +#usr/share/ffmpeg/examples/muxing.c >> > +#usr/share/ffmpeg/examples/qsvdec.c >> > +#usr/share/ffmpeg/examples/remuxing.c >> > +#usr/share/ffmpeg/examples/resampling_audio.c >> > +#usr/share/ffmpeg/examples/scaling_video.c >> > +#usr/share/ffmpeg/examples/transcode_aac.c >> > +#usr/share/ffmpeg/examples/transcoding.c >> > +#usr/share/ffmpeg/ffprobe.xsd >> > +#usr/share/ffmpeg/libvpx-1080p.ffpreset >> > +#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset >> > +#usr/share/ffmpeg/libvpx-360p.ffpreset >> > +#usr/share/ffmpeg/libvpx-720p.ffpreset >> > +#usr/share/ffmpeg/libvpx-720p50_60.ffpreset >> > +#usr/share/man/man1/ffmpeg-all.1 >> > +#usr/share/man/man1/ffmpeg-bitstream-filters.1 >> > +#usr/share/man/man1/ffmpeg-codecs.1 >> > +#usr/share/man/man1/ffmpeg-devices.1 >> > +#usr/share/man/man1/ffmpeg-filters.1 >> > +#usr/share/man/man1/ffmpeg-formats.1 >> > +#usr/share/man/man1/ffmpeg-protocols.1 >> > +#usr/share/man/man1/ffmpeg-resampler.1 >> > +#usr/share/man/man1/ffmpeg-scaler.1 >> > +#usr/share/man/man1/ffmpeg-utils.1 >> > +#usr/share/man/man1/ffmpeg.1 >> > +#usr/share/man/man1/ffplay-all.1 >> > +#usr/share/man/man1/ffplay.1 >> > +#usr/share/man/man1/ffprobe-all.1 >> > +#usr/share/man/man1/ffprobe.1 >> > +#usr/share/man/man1/ffserver-all.1 >> > +#usr/share/man/man1/ffserver.1 >> > +#usr/share/man/man3/libavcodec.3 >> > +#usr/share/man/man3/libavdevice.3 >> > +#usr/share/man/man3/libavfilter.3 >> > +#usr/share/man/man3/libavformat.3 >> > +#usr/share/man/man3/libavutil.3 >> > +#usr/share/man/man3/libswresample.3 >> > +#usr/share/man/man3/libswscale.3 >> > diff --git a/config/rootfiles/packages/ffmpeg-libs >> > b/config/rootfiles/packages/ffmpeg-libs >> > index a58dcd5..1f401ec 100644 >> > --- a/config/rootfiles/packages/ffmpeg-libs >> > +++ b/config/rootfiles/packages/ffmpeg-libs >> > @@ -1,64 +1,212 @@ >> > #usr/bin/ffmpeg >> > #usr/bin/ffplay >> > #usr/bin/ffserver >> > -#usr/include/libavcodec >> > -#usr/include/libavcodec/avcodec.h >> > -#usr/include/libavcodec/opt.h >> > -#usr/include/libavdevice >> > -#usr/include/libavdevice/avdevice.h >> > -#usr/include/libavformat >> > -#usr/include/libavformat/avformat.h >> > -#usr/include/libavformat/avio.h >> > -#usr/include/libavformat/rtsp.h >> > -#usr/include/libavformat/rtspcodes.h >> > -#usr/include/libavutil >> > -#usr/include/libavutil/adler32.h >> > -#usr/include/libavutil/avstring.h >> > -#usr/include/libavutil/avutil.h >> > -#usr/include/libavutil/base64.h >> > -#usr/include/libavutil/common.h >> > -#usr/include/libavutil/crc.h >> > -#usr/include/libavutil/fifo.h >> > -#usr/include/libavutil/intfloat_readwrite.h >> > -#usr/include/libavutil/log.h >> > -#usr/include/libavutil/lzo.h >> > -#usr/include/libavutil/mathematics.h >> > -#usr/include/libavutil/md5.h >> > -#usr/include/libavutil/mem.h >> > -#usr/include/libavutil/random.h >> > -#usr/include/libavutil/rational.h >> > -#usr/include/libavutil/sha1.h >> > +#usr/bin/ffprobe >> > +#usr/include/libavcodec/avdct.h >> > +#usr/include/libavcodec/avfft.h >> > +#usr/include/libavcodec/d3d11va.h >> > +#usr/include/libavcodec/dirac.h >> > +#usr/include/libavcodec/dv_profile.h >> > +#usr/include/libavcodec/dxva2.h >> > +#usr/include/libavcodec/jni.h >> > +#usr/include/libavcodec/qsv.h >> > +#usr/include/libavcodec/vaapi.h >> > +#usr/include/libavcodec/vda.h >> > +#usr/include/libavcodec/vdpau.h >> > +#usr/include/libavcodec/version.h >> > +#usr/include/libavcodec/videotoolbox.h >> > +#usr/include/libavcodec/vorbis_parser.h >> > +#usr/include/libavcodec/xvmc.h >> > +#usr/include/libavdevice/version.h >> > +#usr/include/libavfilter >> > +#usr/include/libavfilter/avfilter.h >> > +#usr/include/libavfilter/avfiltergraph.h >> > +#usr/include/libavfilter/buffersink.h >> > +#usr/include/libavfilter/buffersrc.h >> > +#usr/include/libavfilter/version.h >> > +#usr/include/libavformat/version.h >> > +#usr/include/libavutil/aes.h >> > +#usr/include/libavutil/aes_ctr.h >> > +#usr/include/libavutil/attributes.h >> > +#usr/include/libavutil/audio_fifo.h >> > +#usr/include/libavutil/avassert.h >> > +#usr/include/libavutil/avconfig.h >> > +#usr/include/libavutil/blowfish.h >> > +#usr/include/libavutil/bprint.h >> > +#usr/include/libavutil/bswap.h >> > +#usr/include/libavutil/buffer.h >> > +#usr/include/libavutil/camellia.h >> > +#usr/include/libavutil/cast5.h >> > +#usr/include/libavutil/channel_layout.h >> > +#usr/include/libavutil/cpu.h >> > +#usr/include/libavutil/des.h >> > +#usr/include/libavutil/dict.h >> > +#usr/include/libavutil/display.h >> > +#usr/include/libavutil/downmix_info.h >> > +#usr/include/libavutil/error.h >> > +#usr/include/libavutil/eval.h >> > +#usr/include/libavutil/ffversion.h >> > +#usr/include/libavutil/file.h >> > +#usr/include/libavutil/frame.h >> > +#usr/include/libavutil/hash.h >> > +#usr/include/libavutil/hmac.h >> > +#usr/include/libavutil/hwcontext.h >> > +#usr/include/libavutil/hwcontext_cuda.h >> > +#usr/include/libavutil/hwcontext_dxva2.h >> > +#usr/include/libavutil/hwcontext_vaapi.h >> > +#usr/include/libavutil/hwcontext_vdpau.h >> > +#usr/include/libavutil/imgutils.h >> > +#usr/include/libavutil/intfloat.h >> > +#usr/include/libavutil/intreadwrite.h >> > +#usr/include/libavutil/lfg.h >> > +#usr/include/libavutil/macros.h >> > +#usr/include/libavutil/mastering_display_metadata.h >> > +#usr/include/libavutil/motion_vector.h >> > +#usr/include/libavutil/murmur3.h >> > +#usr/include/libavutil/opt.h >> > +#usr/include/libavutil/parseutils.h >> > +#usr/include/libavutil/pixdesc.h >> > +#usr/include/libavutil/pixelutils.h >> > +#usr/include/libavutil/pixfmt.h >> > +#usr/include/libavutil/random_seed.h >> > +#usr/include/libavutil/rc4.h >> > +#usr/include/libavutil/replaygain.h >> > +#usr/include/libavutil/ripemd.h >> > +#usr/include/libavutil/samplefmt.h >> > +#usr/include/libavutil/sha.h >> > +#usr/include/libavutil/sha512.h >> > +#usr/include/libavutil/stereo3d.h >> > +#usr/include/libavutil/tea.h >> > +#usr/include/libavutil/threadmessage.h >> > +#usr/include/libavutil/time.h >> > +#usr/include/libavutil/timecode.h >> > +#usr/include/libavutil/timestamp.h >> > +#usr/include/libavutil/tree.h >> > +#usr/include/libavutil/twofish.h >> > +#usr/include/libavutil/version.h >> > +#usr/include/libavutil/xtea.h >> > +#usr/include/libpostproc/version.h >> > +#usr/include/libswresample >> > +#usr/include/libswresample/swresample.h >> > +#usr/include/libswresample/version.h >> > +#usr/include/libswscale >> > +#usr/include/libswscale/swscale.h >> > +#usr/include/libswscale/version.h, >> > #usr/lib/libavcodec.a >> > -usr/lib/libavcodec.so >> > -usr/lib/libavcodec.so.51 >> > -usr/lib/libavcodec.so.51.54.0 >> > +#usr/lib/libavcodec.so >> > +usr/lib/libavcodec.so.57 >> > +usr/lib/libavcodec.so.57.48.101 >> > #usr/lib/libavdevice.a >> > -usr/lib/libavdevice.so >> > -usr/lib/libavdevice.so.52 >> > -usr/lib/libavdevice.so.52.0.0 >> > +#usr/lib/libavdevice.so >> > +usr/lib/libavdevice.so.57 >> > +usr/lib/libavdevice.so.57.0.101 >> > +#usr/lib/libavfilter.a >> > +#usr/lib/libavfilter.so >> > +usr/lib/libavfilter.so.6 >> > +usr/lib/libavfilter.so.6.47.100 >> > #usr/lib/libavformat.a >> > -usr/lib/libavformat.so >> > -usr/lib/libavformat.so.52 >> > -usr/lib/libavformat.so.52.13.0 >> > +#usr/lib/libavformat.so >> > +usr/lib/libavformat.so.57 >> > +usr/lib/libavformat.so.57.41.100 >> > #usr/lib/libavutil.a >> > -usr/lib/libavutil.so >> > -usr/lib/libavutil.so.49 >> > -usr/lib/libavutil.so.49.6.0 >> > -#usr/lib/pkgconfig >> > -usr/lib/pkgconfig/libavcodec.pc >> > -usr/lib/pkgconfig/libavdevice.pc >> > -usr/lib/pkgconfig/libavformat.pc >> > -usr/lib/pkgconfig/libavutil.pc >> > -#usr/lib/vhook >> > -usr/lib/vhook/drawtext.so >> > -usr/lib/vhook/fish.so >> > -usr/lib/vhook/null.so >> > -usr/lib/vhook/ppm.so >> > -usr/lib/vhook/watermark.so >> > -#usr/include/libpostproc >> > -#usr/include/libpostproc/postprocess.h >> > +#usr/lib/libavutil.so >> > +usr/lib/libavutil.so.55 >> > +usr/lib/libavutil.so.55.28.100 >> > #usr/lib/libpostproc.a >> > -usr/lib/libpostproc.so >> > -usr/lib/libpostproc.so.51 >> > -usr/lib/libpostproc.so.51.1.0 >> > -usr/lib/pkgconfig/libpostproc.pc >> > +#usr/lib/libpostproc.so >> > +usr/lib/libpostproc.so.54 >> > +usr/lib/libpostproc.so.54.0.100 >> > +#usr/lib/libswresample.a >> > +#usr/lib/libswresample.so >> > +usr/lib/libswresample.so.2 >> > +usr/lib/libswresample.so.2.1.100 >> > +#usr/lib/libswscale.a >> > +#usr/lib/libswscale.so >> > +usr/lib/libswscale.so.4 >> > +usr/lib/libswscale.so.4.1.100 >> > +#usr/lib/pkgconfig/libavfilter.pc >> > +#usr/lib/pkgconfig/libswresample.pc >> > +#usr/lib/pkgconfig/libswscale.pc >> > +#usr/share/doc/ffmpeg >> > +#usr/share/doc/ffmpeg/developer.html >> > +#usr/share/doc/ffmpeg/faq.html >> > +#usr/share/doc/ffmpeg/fate.html >> > +#usr/share/doc/ffmpeg/ffmpeg-all.html >> > +#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html >> > +#usr/share/doc/ffmpeg/ffmpeg-codecs.html >> > +#usr/share/doc/ffmpeg/ffmpeg-devices.html >> > +#usr/share/doc/ffmpeg/ffmpeg-filters.html >> > +#usr/share/doc/ffmpeg/ffmpeg-formats.html >> > +#usr/share/doc/ffmpeg/ffmpeg-protocols.html >> > +#usr/share/doc/ffmpeg/ffmpeg-resampler.html >> > +#usr/share/doc/ffmpeg/ffmpeg-scaler.html >> > +#usr/share/doc/ffmpeg/ffmpeg-utils.html >> > +#usr/share/doc/ffmpeg/ffmpeg.html >> > +#usr/share/doc/ffmpeg/ffplay-all.html >> > +#usr/share/doc/ffmpeg/ffplay.html >> > +#usr/share/doc/ffmpeg/ffprobe-all.html >> > +#usr/share/doc/ffmpeg/ffprobe.html >> > +#usr/share/doc/ffmpeg/ffserver-all.html >> > +#usr/share/doc/ffmpeg/ffserver.html >> > +#usr/share/doc/ffmpeg/general.html >> > +#usr/share/doc/ffmpeg/git-howto.html >> > +#usr/share/doc/ffmpeg/libavcodec.html >> > +#usr/share/doc/ffmpeg/libavdevice.html >> > +#usr/share/doc/ffmpeg/libavfilter.html >> > +#usr/share/doc/ffmpeg/libavformat.html >> > +#usr/share/doc/ffmpeg/libavutil.html >> > +#usr/share/doc/ffmpeg/libswresample.html >> > +#usr/share/doc/ffmpeg/libswscale.html >> > +#usr/share/doc/ffmpeg/nut.html >> > +#usr/share/doc/ffmpeg/platform.html >> > +#usr/share/ffmpeg >> > +#usr/share/ffmpeg/examples >> > +#usr/share/ffmpeg/examples/Makefile >> > +#usr/share/ffmpeg/examples/README >> > +#usr/share/ffmpeg/examples/avio_dir_cmd.c >> > +#usr/share/ffmpeg/examples/avio_reading.c >> > +#usr/share/ffmpeg/examples/decoding_encoding.c >> > +#usr/share/ffmpeg/examples/demuxing_decoding.c >> > +#usr/share/ffmpeg/examples/extract_mvs.c >> > +#usr/share/ffmpeg/examples/filter_audio.c >> > +#usr/share/ffmpeg/examples/filtering_audio.c >> > +#usr/share/ffmpeg/examples/filtering_video.c >> > +#usr/share/ffmpeg/examples/http_multiclient.c >> > +#usr/share/ffmpeg/examples/metadata.c >> > +#usr/share/ffmpeg/examples/muxing.c >> > +#usr/share/ffmpeg/examples/qsvdec.c >> > +#usr/share/ffmpeg/examples/remuxing.c >> > +#usr/share/ffmpeg/examples/resampling_audio.c >> > +#usr/share/ffmpeg/examples/scaling_video.c >> > +#usr/share/ffmpeg/examples/transcode_aac.c >> > +#usr/share/ffmpeg/examples/transcoding.c >> > +#usr/share/ffmpeg/ffprobe.xsd >> > +#usr/share/ffmpeg/libvpx-1080p.ffpreset >> > +#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset >> > +#usr/share/ffmpeg/libvpx-360p.ffpreset >> > +#usr/share/ffmpeg/libvpx-720p.ffpreset >> > +#usr/share/ffmpeg/libvpx-720p50_60.ffpreset >> > +#usr/share/man/man1/ffmpeg-all.1 >> > +#usr/share/man/man1/ffmpeg-bitstream-filters.1 >> > +#usr/share/man/man1/ffmpeg-codecs.1 >> > +#usr/share/man/man1/ffmpeg-devices.1 >> > +#usr/share/man/man1/ffmpeg-filters.1 >> > +#usr/share/man/man1/ffmpeg-formats.1 >> > +#usr/share/man/man1/ffmpeg-protocols.1 >> > +#usr/share/man/man1/ffmpeg-resampler.1 >> > +#usr/share/man/man1/ffmpeg-scaler.1 >> > +#usr/share/man/man1/ffmpeg-utils.1 >> > +#usr/share/man/man1/ffmpeg.1 >> > +#usr/share/man/man1/ffplay-all.1 >> > +#usr/share/man/man1/ffplay.1 >> > +#usr/share/man/man1/ffprobe-all.1 >> > +#usr/share/man/man1/ffprobe.1 >> > +#usr/share/man/man1/ffserver-all.1 >> > +#usr/share/man/man1/ffserver.1 >> > +#usr/share/man/man3/libavcodec.3 >> > +#usr/share/man/man3/libavdevice.3 >> > +#usr/share/man/man3/libavfilter.3 >> > +#usr/share/man/man3/libavformat.3 >> > +#usr/share/man/man3/libavutil.3 >> > +#usr/share/man/man3/libswresample.3 >> > +#usr/share/man/man3/libswscale.3 >> > diff --git a/lfs/ffmpeg b/lfs/ffmpeg >> > index b383886..76c0c73 100644 >> > --- a/lfs/ffmpeg >> > +++ b/lfs/ffmpeg >> > @@ -1,7 +1,7 @@ >> > ########################################################################### >> > #### >> > # >> > # >> > # IPFire.org - A linux based >> > firewall # >> > -# Copyright (C) 2007 Michael Tremer & Christian >> > Schmidt # >> > +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> >> > # >> > # >> > # >> > # This program is free software: you can redistribute it and/or >> > modify # >> > # it under the terms of the GNU General Public License as published >> > by # >> > @@ -24,19 +24,19 @@ >> > >> > include Config >> > >> > -VER = 2008-04-13 >> > -THISAPP = ffmpeg-export-$(VER) >> > +VER = 3.1.4 >> > +THISAPP = ffmpeg-$(VER) >> > DL_FILE = $(THISAPP).tar.bz2 >> > DL_FROM = $(URL_IPFIRE) >> > DIR_APP = $(DIR_SRC)/$(THISAPP) >> > TARGET = $(DIR_INFO)/$(THISAPP) >> > PROG = ffmpeg >> > -PAK_VER = 5 >> > +PAK_VER = 6 >> > >> > DEPS = "ffmpeg-libs sdl lame libvorbis xvid" >> > >> > # Don't use PIC for libavcodec >> > -CFLAGS += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack >> > +#CFLAGS += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack >> Why did you comment these C flags out? Did we need them no longer or >> are there >> another reasons? > > These disable hardening and were probably introduced to avoid any > issues with > inline assembly that uses the %ebx register. To confirm if this is > removed in > the new release someone could just remove the CFLAGS and rebuild this > on i586. > If that goes through, everything is fine. > >> > >> > >> > ########################################################################### >> > #### >> > # Top-level Rules >> > @@ -46,7 +46,7 @@ objects = $(DL_FILE) >> > >> > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >> > >> > -$(DL_FILE)_MD5 = 017ab929ff92be552debb65c589c2183 >> > +$(DL_FILE)_MD5 = 1c099ec01cef5caadd05a4f78561c560 >> > >> > install : $(TARGET) >> > >> > @@ -79,14 +79,13 @@ $(subst %,%_MD5,$(objects)) : >> > $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> > @$(PREBUILD) >> > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) >> > - ln -s $(THISAPP) /usr/src/ffmpeg >> > - cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \ >> > - --enable-shared \ >> > - >> > --enable-postproc \ >> > - >> > --enable-pthreads \ >> > - >> > --enable-gpl >> > - cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE) >> > - cd $(DIR_SRC)/ffmpeg && make install >> > - cd $(DIR_SRC)/ffmpeg && make install-libs >> > + cd $(DIR_APP) && ./configure --prefix=/usr \ >> > + --enable-shared \ >> > + --enable-postproc \ >> > + --enable-pthreads \ >> > + --enable-gpl >> > + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) >> > + cd $(DIR_APP) && make install >> > + cd $(DIR_APP) && make install-libs >> > @rm -rf $(DIR_APP) >> > @$(POSTBUILD) >> > diff --git a/lfs/ffmpeg-libs b/lfs/ffmpeg-libs >> > index b29c978..8762964 100644 >> > --- a/lfs/ffmpeg-libs >> > +++ b/lfs/ffmpeg-libs >> > @@ -1,7 +1,7 @@ >> > ########################################################################### >> > #### >> > # >> > # >> > # IPFire.org - A linux based >> > firewall # >> > -# Copyright (C) 2007 Michael Tremer & Christian >> > Schmidt # >> > +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> >> > # >> > # >> > # >> > # This program is free software: you can redistribute it and/or >> > modify # >> > # it under the terms of the GNU General Public License as published >> > by # >> > @@ -24,10 +24,10 @@ >> > >> > include Config >> > >> > -VER = 2008-04-13 >> > +VER = 3.1.4 >> > THISAPP = ffmpeg-export-$(VER) >> > PROG = ffmpeg-libs >> > -PAK_VER = 5 >> > +PAK_VER = 6 >> > >> > DEPS = "" >> > >> > -- >> > 2.9.3 >> Regards Jonatan ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/6] ffmpeg and ffmpeg-libs: update 3.1.4 2017-03-13 13:23 ` Marcel Lorenz @ 2017-03-13 14:15 ` Michael Tremer 2017-03-14 9:09 ` Marcel Lorenz 0 siblings, 1 reply; 15+ messages in thread From: Michael Tremer @ 2017-03-13 14:15 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 30584 bytes --] Could you submit a clean version of that patch again then? Maybe check if there has been an update of ffmpeg in the meantime. Best, -Michael On Mon, 2017-03-13 at 14:23 +0100, Marcel Lorenz wrote: > This much newer ffmpeg version has only little to do with the old. > I forget to remove die CFALGS line in the patch. > I can make a new without. On my test with mpd i had no problems. > > Am 2017-03-12 17:08, schrieb Michael Tremer: > > > > On Fri, 2016-11-18 at 17:30 +0100, Jonatan Schlag wrote: > > > > > > Hi, > > > > > > Am So, 13. Nov, 2016 um 8:23 schrieb Marcel Lorenz > > > <marcel.lorenz(a)ipfire.org>: > > > > > > > > Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> > > > > --- > > > > config/rootfiles/packages/ffmpeg | 230 ++++++++++++++++++++++++++- > > > > --- > > > > config/rootfiles/packages/ffmpeg-libs | 260 ++++++++++++++++++++++++++- > > > > ---- > > > > --- > > > > lfs/ffmpeg | 29 ++-- > > > > lfs/ffmpeg-libs | 6 +- > > > > 4 files changed, 424 insertions(+), 101 deletions(-) > > > > > > > > diff --git a/config/rootfiles/packages/ffmpeg > > > > b/config/rootfiles/packages/ffmpeg > > > > index d403ca1..aa7a96d 100644 > > > > --- a/config/rootfiles/packages/ffmpeg > > > > +++ b/config/rootfiles/packages/ffmpeg > > > > @@ -1,64 +1,240 @@ > > > > usr/bin/ffmpeg > > > > usr/bin/ffplay > > > > +usr/bin/ffprobe > > > > usr/bin/ffserver > > > > #usr/include/libavcodec > > > > #usr/include/libavcodec/avcodec.h > > > > -#usr/include/libavcodec/opt.h > > > > +#usr/include/libavcodec/avdct.h > > > > +#usr/include/libavcodec/avfft.h > > > > +#usr/include/libavcodec/d3d11va.h > > > > +#usr/include/libavcodec/dirac.h > > > > +#usr/include/libavcodec/dv_profile.h > > > > +#usr/include/libavcodec/dxva2.h > > > > +#usr/include/libavcodec/jni.h > > > > +#usr/include/libavcodec/qsv.h > > > > +#usr/include/libavcodec/vaapi.h > > > > +#usr/include/libavcodec/vda.h > > > > +#usr/include/libavcodec/vdpau.h > > > > +#usr/include/libavcodec/version.h > > > > +#usr/include/libavcodec/videotoolbox.h > > > > +#usr/include/libavcodec/vorbis_parser.h > > > > +#usr/include/libavcodec/xvmc.h > > > > #usr/include/libavdevice > > > > #usr/include/libavdevice/avdevice.h > > > > +#usr/include/libavdevice/version.h > > > > +#usr/include/libavfilter > > > > +#usr/include/libavfilter/avfilter.h > > > > +#usr/include/libavfilter/avfiltergraph.h > > > > +#usr/include/libavfilter/buffersink.h > > > > +#usr/include/libavfilter/buffersrc.h > > > > +#usr/include/libavfilter/version.h > > > > #usr/include/libavformat > > > > #usr/include/libavformat/avformat.h > > > > #usr/include/libavformat/avio.h > > > > -#usr/include/libavformat/rtsp.h > > > > -#usr/include/libavformat/rtspcodes.h > > > > +#usr/include/libavformat/version.h > > > > #usr/include/libavutil > > > > #usr/include/libavutil/adler32.h > > > > +#usr/include/libavutil/aes.h > > > > +#usr/include/libavutil/aes_ctr.h > > > > +#usr/include/libavutil/attributes.h > > > > +#usr/include/libavutil/audio_fifo.h > > > > +#usr/include/libavutil/avassert.h > > > > +#usr/include/libavutil/avconfig.h > > > > #usr/include/libavutil/avstring.h > > > > #usr/include/libavutil/avutil.h > > > > #usr/include/libavutil/base64.h > > > > +#usr/include/libavutil/blowfish.h > > > > +#usr/include/libavutil/bprint.h > > > > +#usr/include/libavutil/bswap.h > > > > +#usr/include/libavutil/buffer.h > > > > +#usr/include/libavutil/camellia.h > > > > +#usr/include/libavutil/cast5.h > > > > +#usr/include/libavutil/channel_layout.h > > > > #usr/include/libavutil/common.h > > > > +#usr/include/libavutil/cpu.h > > > > #usr/include/libavutil/crc.h > > > > +#usr/include/libavutil/des.h > > > > +#usr/include/libavutil/dict.h > > > > +#usr/include/libavutil/display.h > > > > +#usr/include/libavutil/downmix_info.h > > > > +#usr/include/libavutil/error.h > > > > +#usr/include/libavutil/eval.h > > > > +#usr/include/libavutil/ffversion.h > > > > #usr/include/libavutil/fifo.h > > > > -#usr/include/libavutil/intfloat_readwrite.h > > > > +#usr/include/libavutil/file.h > > > > +#usr/include/libavutil/frame.h > > > > +#usr/include/libavutil/hash.h > > > > +#usr/include/libavutil/hmac.h > > > > +#usr/include/libavutil/hwcontext.h > > > > +#usr/include/libavutil/hwcontext_cuda.h > > > > +#usr/include/libavutil/hwcontext_dxva2.h > > > > +#usr/include/libavutil/hwcontext_vaapi.h > > > > +#usr/include/libavutil/hwcontext_vdpau.h > > > > +#usr/include/libavutil/imgutils.h > > > > +#usr/include/libavutil/intfloat.h > > > > +#usr/include/libavutil/intreadwrite.h > > > > +#usr/include/libavutil/lfg.h > > > > #usr/include/libavutil/log.h > > > > #usr/include/libavutil/lzo.h > > > > +#usr/include/libavutil/macros.h > > > > +#usr/include/libavutil/mastering_display_metadata.h > > > > #usr/include/libavutil/mathematics.h > > > > #usr/include/libavutil/md5.h > > > > #usr/include/libavutil/mem.h > > > > -#usr/include/libavutil/random.h > > > > +#usr/include/libavutil/motion_vector.h > > > > +#usr/include/libavutil/murmur3.h > > > > +#usr/include/libavutil/opt.h > > > > +#usr/include/libavutil/parseutils.h > > > > +#usr/include/libavutil/pixdesc.h > > > > +#usr/include/libavutil/pixelutils.h > > > > +#usr/include/libavutil/pixfmt.h > > > > +#usr/include/libavutil/random_seed.h > > > > #usr/include/libavutil/rational.h > > > > -#usr/include/libavutil/sha1.h > > > > +#usr/include/libavutil/rc4.h > > > > +#usr/include/libavutil/replaygain.h > > > > +#usr/include/libavutil/ripemd.h > > > > +#usr/include/libavutil/samplefmt.h > > > > +#usr/include/libavutil/sha.h > > > > +#usr/include/libavutil/sha512.h > > > > +#usr/include/libavutil/stereo3d.h > > > > +#usr/include/libavutil/tea.h > > > > +#usr/include/libavutil/threadmessage.h > > > > +#usr/include/libavutil/time.h > > > > +#usr/include/libavutil/timecode.h > > > > +#usr/include/libavutil/timestamp.h > > > > +#usr/include/libavutil/tree.h > > > > +#usr/include/libavutil/twofish.h > > > > +#usr/include/libavutil/version.h > > > > +#usr/include/libavutil/xtea.h > > > > +#usr/include/libpostproc > > > > +#usr/include/libpostproc/postprocess.h > > > > +#usr/include/libpostproc/version.h > > > > +#usr/include/libswresample > > > > +#usr/include/libswresample/swresample.h > > > > +#usr/include/libswresample/version.h > > > > +#usr/include/libswscale > > > > +#usr/include/libswscale/swscale.h > > > > +#usr/include/libswscale/version.h > > > > #usr/lib/libavcodec.a > > > > #usr/lib/libavcodec.so > > > > -#usr/lib/libavcodec.so.51 > > > > -#usr/lib/libavcodec.so.51.54.0 > > > > +#usr/lib/libavcodec.so.57 > > > > +#usr/lib/libavcodec.so.57.48.101 > > > > #usr/lib/libavdevice.a > > > > #usr/lib/libavdevice.so > > > > -#usr/lib/libavdevice.so.52 > > > > -#usr/lib/libavdevice.so.52.0.0 > > > > +#usr/lib/libavdevice.so.57 > > > > +#usr/lib/libavdevice.so.57.0.101 > > > > +#usr/lib/libavfilter.a > > > > +#usr/lib/libavfilter.so > > > > +#usr/lib/libavfilter.so.6 > > > > +#usr/lib/libavfilter.so.6.47.100 > > > > #usr/lib/libavformat.a > > > > #usr/lib/libavformat.so > > > > -#usr/lib/libavformat.so.52 > > > > -#usr/lib/libavformat.so.52.13.0 > > > > +#usr/lib/libavformat.so.57 > > > > +#usr/lib/libavformat.so.57.41.100 > > > > #usr/lib/libavutil.a > > > > #usr/lib/libavutil.so > > > > -#usr/lib/libavutil.so.49 > > > > -#usr/lib/libavutil.so.49.6.0 > > > > -#usr/lib/pkgconfig > > > > +#usr/lib/libavutil.so.55 > > > > +#usr/lib/libavutil.so.55.28.100 > > > > +#usr/lib/libpostproc.a > > > > +#usr/lib/libpostproc.so > > > > +#usr/lib/libpostproc.so.54 > > > > +#usr/lib/libpostproc.so.54.0.100 > > > > +#usr/lib/libswresample.a > > > > +#usr/lib/libswresample.so > > > > +#usr/lib/libswresample.so.2 > > > > +#usr/lib/libswresample.so.2.1.100 > > > > +#usr/lib/libswscale.a > > > > +#usr/lib/libswscale.so > > > > +#usr/lib/libswscale.so.4 > > > > +#usr/lib/libswscale.so.4.1.100 > > > > #usr/lib/pkgconfig/libavcodec.pc > > > > #usr/lib/pkgconfig/libavdevice.pc > > > > +#usr/lib/pkgconfig/libavfilter.pc > > > > #usr/lib/pkgconfig/libavformat.pc > > > > #usr/lib/pkgconfig/libavutil.pc > > > > -#usr/lib/vhook > > > > -#usr/lib/vhook/drawtext.so > > > > -#usr/lib/vhook/fish.so > > > > -#usr/lib/vhook/null.so > > > > -#usr/lib/vhook/ppm.so > > > > -#usr/lib/vhook/watermark.so > > > > -#usr/include/libpostproc > > > > -#usr/include/libpostproc/postprocess.h > > > > -#usr/lib/libpostproc.a > > > > -#usr/lib/libpostproc.so > > > > -#usr/lib/libpostproc.so.51 > > > > -#usr/lib/libpostproc.so.51.1.0 > > > > #usr/lib/pkgconfig/libpostproc.pc > > > > +#usr/lib/pkgconfig/libswresample.pc > > > > +#usr/lib/pkgconfig/libswscale.pc > > > > +#usr/share/doc/ffmpeg > > > > +#usr/share/doc/ffmpeg/developer.html > > > > +#usr/share/doc/ffmpeg/faq.html > > > > +#usr/share/doc/ffmpeg/fate.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-all.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-codecs.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-devices.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-filters.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-formats.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-protocols.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-resampler.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-scaler.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-utils.html > > > > +#usr/share/doc/ffmpeg/ffmpeg.html > > > > +#usr/share/doc/ffmpeg/ffplay-all.html > > > > +#usr/share/doc/ffmpeg/ffplay.html > > > > +#usr/share/doc/ffmpeg/ffprobe-all.html > > > > +#usr/share/doc/ffmpeg/ffprobe.html > > > > +#usr/share/doc/ffmpeg/ffserver-all.html > > > > +#usr/share/doc/ffmpeg/ffserver.html > > > > +#usr/share/doc/ffmpeg/general.html > > > > +#usr/share/doc/ffmpeg/git-howto.html > > > > +#usr/share/doc/ffmpeg/libavcodec.html > > > > +#usr/share/doc/ffmpeg/libavdevice.html > > > > +#usr/share/doc/ffmpeg/libavfilter.html > > > > +#usr/share/doc/ffmpeg/libavformat.html > > > > +#usr/share/doc/ffmpeg/libavutil.html > > > > +#usr/share/doc/ffmpeg/libswresample.html > > > > +#usr/share/doc/ffmpeg/libswscale.html > > > > +#usr/share/doc/ffmpeg/nut.html > > > > +#usr/share/doc/ffmpeg/platform.html > > > > +#usr/share/ffmpeg > > > > +#usr/share/ffmpeg/examples > > > > +#usr/share/ffmpeg/examples/Makefile > > > > +#usr/share/ffmpeg/examples/README > > > > +#usr/share/ffmpeg/examples/avio_dir_cmd.c > > > > +#usr/share/ffmpeg/examples/avio_reading.c > > > > +#usr/share/ffmpeg/examples/decoding_encoding.c > > > > +#usr/share/ffmpeg/examples/demuxing_decoding.c > > > > +#usr/share/ffmpeg/examples/extract_mvs.c > > > > +#usr/share/ffmpeg/examples/filter_audio.c > > > > +#usr/share/ffmpeg/examples/filtering_audio.c > > > > +#usr/share/ffmpeg/examples/filtering_video.c > > > > +#usr/share/ffmpeg/examples/http_multiclient.c > > > > +#usr/share/ffmpeg/examples/metadata.c > > > > +#usr/share/ffmpeg/examples/muxing.c > > > > +#usr/share/ffmpeg/examples/qsvdec.c > > > > +#usr/share/ffmpeg/examples/remuxing.c > > > > +#usr/share/ffmpeg/examples/resampling_audio.c > > > > +#usr/share/ffmpeg/examples/scaling_video.c > > > > +#usr/share/ffmpeg/examples/transcode_aac.c > > > > +#usr/share/ffmpeg/examples/transcoding.c > > > > +#usr/share/ffmpeg/ffprobe.xsd > > > > +#usr/share/ffmpeg/libvpx-1080p.ffpreset > > > > +#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset > > > > +#usr/share/ffmpeg/libvpx-360p.ffpreset > > > > +#usr/share/ffmpeg/libvpx-720p.ffpreset > > > > +#usr/share/ffmpeg/libvpx-720p50_60.ffpreset > > > > +#usr/share/man/man1/ffmpeg-all.1 > > > > +#usr/share/man/man1/ffmpeg-bitstream-filters.1 > > > > +#usr/share/man/man1/ffmpeg-codecs.1 > > > > +#usr/share/man/man1/ffmpeg-devices.1 > > > > +#usr/share/man/man1/ffmpeg-filters.1 > > > > +#usr/share/man/man1/ffmpeg-formats.1 > > > > +#usr/share/man/man1/ffmpeg-protocols.1 > > > > +#usr/share/man/man1/ffmpeg-resampler.1 > > > > +#usr/share/man/man1/ffmpeg-scaler.1 > > > > +#usr/share/man/man1/ffmpeg-utils.1 > > > > +#usr/share/man/man1/ffmpeg.1 > > > > +#usr/share/man/man1/ffplay-all.1 > > > > +#usr/share/man/man1/ffplay.1 > > > > +#usr/share/man/man1/ffprobe-all.1 > > > > +#usr/share/man/man1/ffprobe.1 > > > > +#usr/share/man/man1/ffserver-all.1 > > > > +#usr/share/man/man1/ffserver.1 > > > > +#usr/share/man/man3/libavcodec.3 > > > > +#usr/share/man/man3/libavdevice.3 > > > > +#usr/share/man/man3/libavfilter.3 > > > > +#usr/share/man/man3/libavformat.3 > > > > +#usr/share/man/man3/libavutil.3 > > > > +#usr/share/man/man3/libswresample.3 > > > > +#usr/share/man/man3/libswscale.3 > > > > diff --git a/config/rootfiles/packages/ffmpeg-libs > > > > b/config/rootfiles/packages/ffmpeg-libs > > > > index a58dcd5..1f401ec 100644 > > > > --- a/config/rootfiles/packages/ffmpeg-libs > > > > +++ b/config/rootfiles/packages/ffmpeg-libs > > > > @@ -1,64 +1,212 @@ > > > > #usr/bin/ffmpeg > > > > #usr/bin/ffplay > > > > #usr/bin/ffserver > > > > -#usr/include/libavcodec > > > > -#usr/include/libavcodec/avcodec.h > > > > -#usr/include/libavcodec/opt.h > > > > -#usr/include/libavdevice > > > > -#usr/include/libavdevice/avdevice.h > > > > -#usr/include/libavformat > > > > -#usr/include/libavformat/avformat.h > > > > -#usr/include/libavformat/avio.h > > > > -#usr/include/libavformat/rtsp.h > > > > -#usr/include/libavformat/rtspcodes.h > > > > -#usr/include/libavutil > > > > -#usr/include/libavutil/adler32.h > > > > -#usr/include/libavutil/avstring.h > > > > -#usr/include/libavutil/avutil.h > > > > -#usr/include/libavutil/base64.h > > > > -#usr/include/libavutil/common.h > > > > -#usr/include/libavutil/crc.h > > > > -#usr/include/libavutil/fifo.h > > > > -#usr/include/libavutil/intfloat_readwrite.h > > > > -#usr/include/libavutil/log.h > > > > -#usr/include/libavutil/lzo.h > > > > -#usr/include/libavutil/mathematics.h > > > > -#usr/include/libavutil/md5.h > > > > -#usr/include/libavutil/mem.h > > > > -#usr/include/libavutil/random.h > > > > -#usr/include/libavutil/rational.h > > > > -#usr/include/libavutil/sha1.h > > > > +#usr/bin/ffprobe > > > > +#usr/include/libavcodec/avdct.h > > > > +#usr/include/libavcodec/avfft.h > > > > +#usr/include/libavcodec/d3d11va.h > > > > +#usr/include/libavcodec/dirac.h > > > > +#usr/include/libavcodec/dv_profile.h > > > > +#usr/include/libavcodec/dxva2.h > > > > +#usr/include/libavcodec/jni.h > > > > +#usr/include/libavcodec/qsv.h > > > > +#usr/include/libavcodec/vaapi.h > > > > +#usr/include/libavcodec/vda.h > > > > +#usr/include/libavcodec/vdpau.h > > > > +#usr/include/libavcodec/version.h > > > > +#usr/include/libavcodec/videotoolbox.h > > > > +#usr/include/libavcodec/vorbis_parser.h > > > > +#usr/include/libavcodec/xvmc.h > > > > +#usr/include/libavdevice/version.h > > > > +#usr/include/libavfilter > > > > +#usr/include/libavfilter/avfilter.h > > > > +#usr/include/libavfilter/avfiltergraph.h > > > > +#usr/include/libavfilter/buffersink.h > > > > +#usr/include/libavfilter/buffersrc.h > > > > +#usr/include/libavfilter/version.h > > > > +#usr/include/libavformat/version.h > > > > +#usr/include/libavutil/aes.h > > > > +#usr/include/libavutil/aes_ctr.h > > > > +#usr/include/libavutil/attributes.h > > > > +#usr/include/libavutil/audio_fifo.h > > > > +#usr/include/libavutil/avassert.h > > > > +#usr/include/libavutil/avconfig.h > > > > +#usr/include/libavutil/blowfish.h > > > > +#usr/include/libavutil/bprint.h > > > > +#usr/include/libavutil/bswap.h > > > > +#usr/include/libavutil/buffer.h > > > > +#usr/include/libavutil/camellia.h > > > > +#usr/include/libavutil/cast5.h > > > > +#usr/include/libavutil/channel_layout.h > > > > +#usr/include/libavutil/cpu.h > > > > +#usr/include/libavutil/des.h > > > > +#usr/include/libavutil/dict.h > > > > +#usr/include/libavutil/display.h > > > > +#usr/include/libavutil/downmix_info.h > > > > +#usr/include/libavutil/error.h > > > > +#usr/include/libavutil/eval.h > > > > +#usr/include/libavutil/ffversion.h > > > > +#usr/include/libavutil/file.h > > > > +#usr/include/libavutil/frame.h > > > > +#usr/include/libavutil/hash.h > > > > +#usr/include/libavutil/hmac.h > > > > +#usr/include/libavutil/hwcontext.h > > > > +#usr/include/libavutil/hwcontext_cuda.h > > > > +#usr/include/libavutil/hwcontext_dxva2.h > > > > +#usr/include/libavutil/hwcontext_vaapi.h > > > > +#usr/include/libavutil/hwcontext_vdpau.h > > > > +#usr/include/libavutil/imgutils.h > > > > +#usr/include/libavutil/intfloat.h > > > > +#usr/include/libavutil/intreadwrite.h > > > > +#usr/include/libavutil/lfg.h > > > > +#usr/include/libavutil/macros.h > > > > +#usr/include/libavutil/mastering_display_metadata.h > > > > +#usr/include/libavutil/motion_vector.h > > > > +#usr/include/libavutil/murmur3.h > > > > +#usr/include/libavutil/opt.h > > > > +#usr/include/libavutil/parseutils.h > > > > +#usr/include/libavutil/pixdesc.h > > > > +#usr/include/libavutil/pixelutils.h > > > > +#usr/include/libavutil/pixfmt.h > > > > +#usr/include/libavutil/random_seed.h > > > > +#usr/include/libavutil/rc4.h > > > > +#usr/include/libavutil/replaygain.h > > > > +#usr/include/libavutil/ripemd.h > > > > +#usr/include/libavutil/samplefmt.h > > > > +#usr/include/libavutil/sha.h > > > > +#usr/include/libavutil/sha512.h > > > > +#usr/include/libavutil/stereo3d.h > > > > +#usr/include/libavutil/tea.h > > > > +#usr/include/libavutil/threadmessage.h > > > > +#usr/include/libavutil/time.h > > > > +#usr/include/libavutil/timecode.h > > > > +#usr/include/libavutil/timestamp.h > > > > +#usr/include/libavutil/tree.h > > > > +#usr/include/libavutil/twofish.h > > > > +#usr/include/libavutil/version.h > > > > +#usr/include/libavutil/xtea.h > > > > +#usr/include/libpostproc/version.h > > > > +#usr/include/libswresample > > > > +#usr/include/libswresample/swresample.h > > > > +#usr/include/libswresample/version.h > > > > +#usr/include/libswscale > > > > +#usr/include/libswscale/swscale.h > > > > +#usr/include/libswscale/version.h, > > > > #usr/lib/libavcodec.a > > > > -usr/lib/libavcodec.so > > > > -usr/lib/libavcodec.so.51 > > > > -usr/lib/libavcodec.so.51.54.0 > > > > +#usr/lib/libavcodec.so > > > > +usr/lib/libavcodec.so.57 > > > > +usr/lib/libavcodec.so.57.48.101 > > > > #usr/lib/libavdevice.a > > > > -usr/lib/libavdevice.so > > > > -usr/lib/libavdevice.so.52 > > > > -usr/lib/libavdevice.so.52.0.0 > > > > +#usr/lib/libavdevice.so > > > > +usr/lib/libavdevice.so.57 > > > > +usr/lib/libavdevice.so.57.0.101 > > > > +#usr/lib/libavfilter.a > > > > +#usr/lib/libavfilter.so > > > > +usr/lib/libavfilter.so.6 > > > > +usr/lib/libavfilter.so.6.47.100 > > > > #usr/lib/libavformat.a > > > > -usr/lib/libavformat.so > > > > -usr/lib/libavformat.so.52 > > > > -usr/lib/libavformat.so.52.13.0 > > > > +#usr/lib/libavformat.so > > > > +usr/lib/libavformat.so.57 > > > > +usr/lib/libavformat.so.57.41.100 > > > > #usr/lib/libavutil.a > > > > -usr/lib/libavutil.so > > > > -usr/lib/libavutil.so.49 > > > > -usr/lib/libavutil.so.49.6.0 > > > > -#usr/lib/pkgconfig > > > > -usr/lib/pkgconfig/libavcodec.pc > > > > -usr/lib/pkgconfig/libavdevice.pc > > > > -usr/lib/pkgconfig/libavformat.pc > > > > -usr/lib/pkgconfig/libavutil.pc > > > > -#usr/lib/vhook > > > > -usr/lib/vhook/drawtext.so > > > > -usr/lib/vhook/fish.so > > > > -usr/lib/vhook/null.so > > > > -usr/lib/vhook/ppm.so > > > > -usr/lib/vhook/watermark.so > > > > -#usr/include/libpostproc > > > > -#usr/include/libpostproc/postprocess.h > > > > +#usr/lib/libavutil.so > > > > +usr/lib/libavutil.so.55 > > > > +usr/lib/libavutil.so.55.28.100 > > > > #usr/lib/libpostproc.a > > > > -usr/lib/libpostproc.so > > > > -usr/lib/libpostproc.so.51 > > > > -usr/lib/libpostproc.so.51.1.0 > > > > -usr/lib/pkgconfig/libpostproc.pc > > > > +#usr/lib/libpostproc.so > > > > +usr/lib/libpostproc.so.54 > > > > +usr/lib/libpostproc.so.54.0.100 > > > > +#usr/lib/libswresample.a > > > > +#usr/lib/libswresample.so > > > > +usr/lib/libswresample.so.2 > > > > +usr/lib/libswresample.so.2.1.100 > > > > +#usr/lib/libswscale.a > > > > +#usr/lib/libswscale.so > > > > +usr/lib/libswscale.so.4 > > > > +usr/lib/libswscale.so.4.1.100 > > > > +#usr/lib/pkgconfig/libavfilter.pc > > > > +#usr/lib/pkgconfig/libswresample.pc > > > > +#usr/lib/pkgconfig/libswscale.pc > > > > +#usr/share/doc/ffmpeg > > > > +#usr/share/doc/ffmpeg/developer.html > > > > +#usr/share/doc/ffmpeg/faq.html > > > > +#usr/share/doc/ffmpeg/fate.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-all.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-codecs.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-devices.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-filters.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-formats.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-protocols.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-resampler.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-scaler.html > > > > +#usr/share/doc/ffmpeg/ffmpeg-utils.html > > > > +#usr/share/doc/ffmpeg/ffmpeg.html > > > > +#usr/share/doc/ffmpeg/ffplay-all.html > > > > +#usr/share/doc/ffmpeg/ffplay.html > > > > +#usr/share/doc/ffmpeg/ffprobe-all.html > > > > +#usr/share/doc/ffmpeg/ffprobe.html > > > > +#usr/share/doc/ffmpeg/ffserver-all.html > > > > +#usr/share/doc/ffmpeg/ffserver.html > > > > +#usr/share/doc/ffmpeg/general.html > > > > +#usr/share/doc/ffmpeg/git-howto.html > > > > +#usr/share/doc/ffmpeg/libavcodec.html > > > > +#usr/share/doc/ffmpeg/libavdevice.html > > > > +#usr/share/doc/ffmpeg/libavfilter.html > > > > +#usr/share/doc/ffmpeg/libavformat.html > > > > +#usr/share/doc/ffmpeg/libavutil.html > > > > +#usr/share/doc/ffmpeg/libswresample.html > > > > +#usr/share/doc/ffmpeg/libswscale.html > > > > +#usr/share/doc/ffmpeg/nut.html > > > > +#usr/share/doc/ffmpeg/platform.html > > > > +#usr/share/ffmpeg > > > > +#usr/share/ffmpeg/examples > > > > +#usr/share/ffmpeg/examples/Makefile > > > > +#usr/share/ffmpeg/examples/README > > > > +#usr/share/ffmpeg/examples/avio_dir_cmd.c > > > > +#usr/share/ffmpeg/examples/avio_reading.c > > > > +#usr/share/ffmpeg/examples/decoding_encoding.c > > > > +#usr/share/ffmpeg/examples/demuxing_decoding.c > > > > +#usr/share/ffmpeg/examples/extract_mvs.c > > > > +#usr/share/ffmpeg/examples/filter_audio.c > > > > +#usr/share/ffmpeg/examples/filtering_audio.c > > > > +#usr/share/ffmpeg/examples/filtering_video.c > > > > +#usr/share/ffmpeg/examples/http_multiclient.c > > > > +#usr/share/ffmpeg/examples/metadata.c > > > > +#usr/share/ffmpeg/examples/muxing.c > > > > +#usr/share/ffmpeg/examples/qsvdec.c > > > > +#usr/share/ffmpeg/examples/remuxing.c > > > > +#usr/share/ffmpeg/examples/resampling_audio.c > > > > +#usr/share/ffmpeg/examples/scaling_video.c > > > > +#usr/share/ffmpeg/examples/transcode_aac.c > > > > +#usr/share/ffmpeg/examples/transcoding.c > > > > +#usr/share/ffmpeg/ffprobe.xsd > > > > +#usr/share/ffmpeg/libvpx-1080p.ffpreset > > > > +#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset > > > > +#usr/share/ffmpeg/libvpx-360p.ffpreset > > > > +#usr/share/ffmpeg/libvpx-720p.ffpreset > > > > +#usr/share/ffmpeg/libvpx-720p50_60.ffpreset > > > > +#usr/share/man/man1/ffmpeg-all.1 > > > > +#usr/share/man/man1/ffmpeg-bitstream-filters.1 > > > > +#usr/share/man/man1/ffmpeg-codecs.1 > > > > +#usr/share/man/man1/ffmpeg-devices.1 > > > > +#usr/share/man/man1/ffmpeg-filters.1 > > > > +#usr/share/man/man1/ffmpeg-formats.1 > > > > +#usr/share/man/man1/ffmpeg-protocols.1 > > > > +#usr/share/man/man1/ffmpeg-resampler.1 > > > > +#usr/share/man/man1/ffmpeg-scaler.1 > > > > +#usr/share/man/man1/ffmpeg-utils.1 > > > > +#usr/share/man/man1/ffmpeg.1 > > > > +#usr/share/man/man1/ffplay-all.1 > > > > +#usr/share/man/man1/ffplay.1 > > > > +#usr/share/man/man1/ffprobe-all.1 > > > > +#usr/share/man/man1/ffprobe.1 > > > > +#usr/share/man/man1/ffserver-all.1 > > > > +#usr/share/man/man1/ffserver.1 > > > > +#usr/share/man/man3/libavcodec.3 > > > > +#usr/share/man/man3/libavdevice.3 > > > > +#usr/share/man/man3/libavfilter.3 > > > > +#usr/share/man/man3/libavformat.3 > > > > +#usr/share/man/man3/libavutil.3 > > > > +#usr/share/man/man3/libswresample.3 > > > > +#usr/share/man/man3/libswscale.3 > > > > diff --git a/lfs/ffmpeg b/lfs/ffmpeg > > > > index b383886..76c0c73 100644 > > > > --- a/lfs/ffmpeg > > > > +++ b/lfs/ffmpeg > > > > @@ -1,7 +1,7 @@ > > > > ####################################################################### > > > > #### > > > > #### > > > > # > > > > > > > > # > > > > # IPFire.org - A linux based > > > > firewall # > > > > -# Copyright (C) 2007 Michael Tremer & Christian > > > > Schmidt # > > > > +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> > > > > > > > > # > > > > # > > > > > > > > # > > > > # This program is free software: you can redistribute it and/or > > > > modify # > > > > # it under the terms of the GNU General Public License as published > > > > by # > > > > @@ -24,19 +24,19 @@ > > > > > > > > include Config > > > > > > > > -VER = 2008-04-13 > > > > -THISAPP = ffmpeg-export-$(VER) > > > > +VER = 3.1.4 > > > > +THISAPP = ffmpeg-$(VER) > > > > DL_FILE = $(THISAPP).tar.bz2 > > > > DL_FROM = $(URL_IPFIRE) > > > > DIR_APP = $(DIR_SRC)/$(THISAPP) > > > > TARGET = $(DIR_INFO)/$(THISAPP) > > > > PROG = ffmpeg > > > > -PAK_VER = 5 > > > > +PAK_VER = 6 > > > > > > > > DEPS = "ffmpeg-libs sdl lame libvorbis xvid" > > > > > > > > # Don't use PIC for libavcodec > > > > -CFLAGS += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack > > > > +#CFLAGS += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack > > > Why did you comment these C flags out? Did we need them no longer or > > > are there > > > another reasons? > > > > These disable hardening and were probably introduced to avoid any > > issues with > > inline assembly that uses the %ebx register. To confirm if this is > > removed in > > the new release someone could just remove the CFLAGS and rebuild this > > on i586. > > If that goes through, everything is fine. > > > > > > > > > > > > > > > > > > > > > ####################################################################### > > > > #### > > > > #### > > > > # Top-level Rules > > > > @@ -46,7 +46,7 @@ objects = $(DL_FILE) > > > > > > > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > > > > > > > -$(DL_FILE)_MD5 = 017ab929ff92be552debb65c589c2183 > > > > +$(DL_FILE)_MD5 = 1c099ec01cef5caadd05a4f78561c560 > > > > > > > > install : $(TARGET) > > > > > > > > @@ -79,14 +79,13 @@ $(subst %,%_MD5,$(objects)) : > > > > $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > > > > @$(PREBUILD) > > > > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf > > > > $(DIR_DL)/$(DL_FILE) > > > > - ln -s $(THISAPP) /usr/src/ffmpeg > > > > - cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \ > > > > - --enable-shared \ > > > > - > > > > > > > > --enable-postproc \ > > > > - > > > > > > > > --enable-pthreads \ > > > > - > > > > > > > > --enable-gpl > > > > - cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE) > > > > - cd $(DIR_SRC)/ffmpeg && make install > > > > - cd $(DIR_SRC)/ffmpeg && make install-libs > > > > + cd $(DIR_APP) && ./configure --prefix=/usr \ > > > > + --enable-shared \ > > > > + --enable-postproc \ > > > > + --enable-pthreads \ > > > > + --enable-gpl > > > > + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) > > > > + cd $(DIR_APP) && make install > > > > + cd $(DIR_APP) && make install-libs > > > > @rm -rf $(DIR_APP) > > > > @$(POSTBUILD) > > > > diff --git a/lfs/ffmpeg-libs b/lfs/ffmpeg-libs > > > > index b29c978..8762964 100644 > > > > --- a/lfs/ffmpeg-libs > > > > +++ b/lfs/ffmpeg-libs > > > > @@ -1,7 +1,7 @@ > > > > ####################################################################### > > > > #### > > > > #### > > > > # > > > > > > > > # > > > > # IPFire.org - A linux based > > > > firewall # > > > > -# Copyright (C) 2007 Michael Tremer & Christian > > > > Schmidt # > > > > +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> > > > > > > > > # > > > > # > > > > > > > > # > > > > # This program is free software: you can redistribute it and/or > > > > modify # > > > > # it under the terms of the GNU General Public License as published > > > > by # > > > > @@ -24,10 +24,10 @@ > > > > > > > > include Config > > > > > > > > -VER = 2008-04-13 > > > > +VER = 3.1.4 > > > > THISAPP = ffmpeg-export-$(VER) > > > > PROG = ffmpeg-libs > > > > -PAK_VER = 5 > > > > +PAK_VER = 6 > > > > > > > > DEPS = "" > > > > > > > > -- > > > > 2.9.3 > > > Regards Jonatan > [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/6] ffmpeg and ffmpeg-libs: update 3.1.4 2017-03-13 14:15 ` Michael Tremer @ 2017-03-14 9:09 ` Marcel Lorenz 0 siblings, 0 replies; 15+ messages in thread From: Marcel Lorenz @ 2017-03-14 9:09 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 31416 bytes --] i make a new patch with the new version 3.2.4. (last patch 3.1.4) Best, -Marcel Am 2017-03-13 15:15, schrieb Michael Tremer: > Could you submit a clean version of that patch again then? > > Maybe check if there has been an update of ffmpeg in the meantime. > > Best, > -Michael > > On Mon, 2017-03-13 at 14:23 +0100, Marcel Lorenz wrote: >> This much newer ffmpeg version has only little to do with the old. >> I forget to remove die CFALGS line in the patch. >> I can make a new without. On my test with mpd i had no problems. >> >> Am 2017-03-12 17:08, schrieb Michael Tremer: >> > >> > On Fri, 2016-11-18 at 17:30 +0100, Jonatan Schlag wrote: >> > > >> > > Hi, >> > > >> > > Am So, 13. Nov, 2016 um 8:23 schrieb Marcel Lorenz >> > > <marcel.lorenz(a)ipfire.org>: >> > > > >> > > > Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> >> > > > --- >> > > > config/rootfiles/packages/ffmpeg | 230 ++++++++++++++++++++++++++- >> > > > --- >> > > > config/rootfiles/packages/ffmpeg-libs | 260 ++++++++++++++++++++++++++- >> > > > ---- >> > > > --- >> > > > lfs/ffmpeg | 29 ++-- >> > > > lfs/ffmpeg-libs | 6 +- >> > > > 4 files changed, 424 insertions(+), 101 deletions(-) >> > > > >> > > > diff --git a/config/rootfiles/packages/ffmpeg >> > > > b/config/rootfiles/packages/ffmpeg >> > > > index d403ca1..aa7a96d 100644 >> > > > --- a/config/rootfiles/packages/ffmpeg >> > > > +++ b/config/rootfiles/packages/ffmpeg >> > > > @@ -1,64 +1,240 @@ >> > > > usr/bin/ffmpeg >> > > > usr/bin/ffplay >> > > > +usr/bin/ffprobe >> > > > usr/bin/ffserver >> > > > #usr/include/libavcodec >> > > > #usr/include/libavcodec/avcodec.h >> > > > -#usr/include/libavcodec/opt.h >> > > > +#usr/include/libavcodec/avdct.h >> > > > +#usr/include/libavcodec/avfft.h >> > > > +#usr/include/libavcodec/d3d11va.h >> > > > +#usr/include/libavcodec/dirac.h >> > > > +#usr/include/libavcodec/dv_profile.h >> > > > +#usr/include/libavcodec/dxva2.h >> > > > +#usr/include/libavcodec/jni.h >> > > > +#usr/include/libavcodec/qsv.h >> > > > +#usr/include/libavcodec/vaapi.h >> > > > +#usr/include/libavcodec/vda.h >> > > > +#usr/include/libavcodec/vdpau.h >> > > > +#usr/include/libavcodec/version.h >> > > > +#usr/include/libavcodec/videotoolbox.h >> > > > +#usr/include/libavcodec/vorbis_parser.h >> > > > +#usr/include/libavcodec/xvmc.h >> > > > #usr/include/libavdevice >> > > > #usr/include/libavdevice/avdevice.h >> > > > +#usr/include/libavdevice/version.h >> > > > +#usr/include/libavfilter >> > > > +#usr/include/libavfilter/avfilter.h >> > > > +#usr/include/libavfilter/avfiltergraph.h >> > > > +#usr/include/libavfilter/buffersink.h >> > > > +#usr/include/libavfilter/buffersrc.h >> > > > +#usr/include/libavfilter/version.h >> > > > #usr/include/libavformat >> > > > #usr/include/libavformat/avformat.h >> > > > #usr/include/libavformat/avio.h >> > > > -#usr/include/libavformat/rtsp.h >> > > > -#usr/include/libavformat/rtspcodes.h >> > > > +#usr/include/libavformat/version.h >> > > > #usr/include/libavutil >> > > > #usr/include/libavutil/adler32.h >> > > > +#usr/include/libavutil/aes.h >> > > > +#usr/include/libavutil/aes_ctr.h >> > > > +#usr/include/libavutil/attributes.h >> > > > +#usr/include/libavutil/audio_fifo.h >> > > > +#usr/include/libavutil/avassert.h >> > > > +#usr/include/libavutil/avconfig.h >> > > > #usr/include/libavutil/avstring.h >> > > > #usr/include/libavutil/avutil.h >> > > > #usr/include/libavutil/base64.h >> > > > +#usr/include/libavutil/blowfish.h >> > > > +#usr/include/libavutil/bprint.h >> > > > +#usr/include/libavutil/bswap.h >> > > > +#usr/include/libavutil/buffer.h >> > > > +#usr/include/libavutil/camellia.h >> > > > +#usr/include/libavutil/cast5.h >> > > > +#usr/include/libavutil/channel_layout.h >> > > > #usr/include/libavutil/common.h >> > > > +#usr/include/libavutil/cpu.h >> > > > #usr/include/libavutil/crc.h >> > > > +#usr/include/libavutil/des.h >> > > > +#usr/include/libavutil/dict.h >> > > > +#usr/include/libavutil/display.h >> > > > +#usr/include/libavutil/downmix_info.h >> > > > +#usr/include/libavutil/error.h >> > > > +#usr/include/libavutil/eval.h >> > > > +#usr/include/libavutil/ffversion.h >> > > > #usr/include/libavutil/fifo.h >> > > > -#usr/include/libavutil/intfloat_readwrite.h >> > > > +#usr/include/libavutil/file.h >> > > > +#usr/include/libavutil/frame.h >> > > > +#usr/include/libavutil/hash.h >> > > > +#usr/include/libavutil/hmac.h >> > > > +#usr/include/libavutil/hwcontext.h >> > > > +#usr/include/libavutil/hwcontext_cuda.h >> > > > +#usr/include/libavutil/hwcontext_dxva2.h >> > > > +#usr/include/libavutil/hwcontext_vaapi.h >> > > > +#usr/include/libavutil/hwcontext_vdpau.h >> > > > +#usr/include/libavutil/imgutils.h >> > > > +#usr/include/libavutil/intfloat.h >> > > > +#usr/include/libavutil/intreadwrite.h >> > > > +#usr/include/libavutil/lfg.h >> > > > #usr/include/libavutil/log.h >> > > > #usr/include/libavutil/lzo.h >> > > > +#usr/include/libavutil/macros.h >> > > > +#usr/include/libavutil/mastering_display_metadata.h >> > > > #usr/include/libavutil/mathematics.h >> > > > #usr/include/libavutil/md5.h >> > > > #usr/include/libavutil/mem.h >> > > > -#usr/include/libavutil/random.h >> > > > +#usr/include/libavutil/motion_vector.h >> > > > +#usr/include/libavutil/murmur3.h >> > > > +#usr/include/libavutil/opt.h >> > > > +#usr/include/libavutil/parseutils.h >> > > > +#usr/include/libavutil/pixdesc.h >> > > > +#usr/include/libavutil/pixelutils.h >> > > > +#usr/include/libavutil/pixfmt.h >> > > > +#usr/include/libavutil/random_seed.h >> > > > #usr/include/libavutil/rational.h >> > > > -#usr/include/libavutil/sha1.h >> > > > +#usr/include/libavutil/rc4.h >> > > > +#usr/include/libavutil/replaygain.h >> > > > +#usr/include/libavutil/ripemd.h >> > > > +#usr/include/libavutil/samplefmt.h >> > > > +#usr/include/libavutil/sha.h >> > > > +#usr/include/libavutil/sha512.h >> > > > +#usr/include/libavutil/stereo3d.h >> > > > +#usr/include/libavutil/tea.h >> > > > +#usr/include/libavutil/threadmessage.h >> > > > +#usr/include/libavutil/time.h >> > > > +#usr/include/libavutil/timecode.h >> > > > +#usr/include/libavutil/timestamp.h >> > > > +#usr/include/libavutil/tree.h >> > > > +#usr/include/libavutil/twofish.h >> > > > +#usr/include/libavutil/version.h >> > > > +#usr/include/libavutil/xtea.h >> > > > +#usr/include/libpostproc >> > > > +#usr/include/libpostproc/postprocess.h >> > > > +#usr/include/libpostproc/version.h >> > > > +#usr/include/libswresample >> > > > +#usr/include/libswresample/swresample.h >> > > > +#usr/include/libswresample/version.h >> > > > +#usr/include/libswscale >> > > > +#usr/include/libswscale/swscale.h >> > > > +#usr/include/libswscale/version.h >> > > > #usr/lib/libavcodec.a >> > > > #usr/lib/libavcodec.so >> > > > -#usr/lib/libavcodec.so.51 >> > > > -#usr/lib/libavcodec.so.51.54.0 >> > > > +#usr/lib/libavcodec.so.57 >> > > > +#usr/lib/libavcodec.so.57.48.101 >> > > > #usr/lib/libavdevice.a >> > > > #usr/lib/libavdevice.so >> > > > -#usr/lib/libavdevice.so.52 >> > > > -#usr/lib/libavdevice.so.52.0.0 >> > > > +#usr/lib/libavdevice.so.57 >> > > > +#usr/lib/libavdevice.so.57.0.101 >> > > > +#usr/lib/libavfilter.a >> > > > +#usr/lib/libavfilter.so >> > > > +#usr/lib/libavfilter.so.6 >> > > > +#usr/lib/libavfilter.so.6.47.100 >> > > > #usr/lib/libavformat.a >> > > > #usr/lib/libavformat.so >> > > > -#usr/lib/libavformat.so.52 >> > > > -#usr/lib/libavformat.so.52.13.0 >> > > > +#usr/lib/libavformat.so.57 >> > > > +#usr/lib/libavformat.so.57.41.100 >> > > > #usr/lib/libavutil.a >> > > > #usr/lib/libavutil.so >> > > > -#usr/lib/libavutil.so.49 >> > > > -#usr/lib/libavutil.so.49.6.0 >> > > > -#usr/lib/pkgconfig >> > > > +#usr/lib/libavutil.so.55 >> > > > +#usr/lib/libavutil.so.55.28.100 >> > > > +#usr/lib/libpostproc.a >> > > > +#usr/lib/libpostproc.so >> > > > +#usr/lib/libpostproc.so.54 >> > > > +#usr/lib/libpostproc.so.54.0.100 >> > > > +#usr/lib/libswresample.a >> > > > +#usr/lib/libswresample.so >> > > > +#usr/lib/libswresample.so.2 >> > > > +#usr/lib/libswresample.so.2.1.100 >> > > > +#usr/lib/libswscale.a >> > > > +#usr/lib/libswscale.so >> > > > +#usr/lib/libswscale.so.4 >> > > > +#usr/lib/libswscale.so.4.1.100 >> > > > #usr/lib/pkgconfig/libavcodec.pc >> > > > #usr/lib/pkgconfig/libavdevice.pc >> > > > +#usr/lib/pkgconfig/libavfilter.pc >> > > > #usr/lib/pkgconfig/libavformat.pc >> > > > #usr/lib/pkgconfig/libavutil.pc >> > > > -#usr/lib/vhook >> > > > -#usr/lib/vhook/drawtext.so >> > > > -#usr/lib/vhook/fish.so >> > > > -#usr/lib/vhook/null.so >> > > > -#usr/lib/vhook/ppm.so >> > > > -#usr/lib/vhook/watermark.so >> > > > -#usr/include/libpostproc >> > > > -#usr/include/libpostproc/postprocess.h >> > > > -#usr/lib/libpostproc.a >> > > > -#usr/lib/libpostproc.so >> > > > -#usr/lib/libpostproc.so.51 >> > > > -#usr/lib/libpostproc.so.51.1.0 >> > > > #usr/lib/pkgconfig/libpostproc.pc >> > > > +#usr/lib/pkgconfig/libswresample.pc >> > > > +#usr/lib/pkgconfig/libswscale.pc >> > > > +#usr/share/doc/ffmpeg >> > > > +#usr/share/doc/ffmpeg/developer.html >> > > > +#usr/share/doc/ffmpeg/faq.html >> > > > +#usr/share/doc/ffmpeg/fate.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-all.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-codecs.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-devices.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-filters.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-formats.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-protocols.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-resampler.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-scaler.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-utils.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg.html >> > > > +#usr/share/doc/ffmpeg/ffplay-all.html >> > > > +#usr/share/doc/ffmpeg/ffplay.html >> > > > +#usr/share/doc/ffmpeg/ffprobe-all.html >> > > > +#usr/share/doc/ffmpeg/ffprobe.html >> > > > +#usr/share/doc/ffmpeg/ffserver-all.html >> > > > +#usr/share/doc/ffmpeg/ffserver.html >> > > > +#usr/share/doc/ffmpeg/general.html >> > > > +#usr/share/doc/ffmpeg/git-howto.html >> > > > +#usr/share/doc/ffmpeg/libavcodec.html >> > > > +#usr/share/doc/ffmpeg/libavdevice.html >> > > > +#usr/share/doc/ffmpeg/libavfilter.html >> > > > +#usr/share/doc/ffmpeg/libavformat.html >> > > > +#usr/share/doc/ffmpeg/libavutil.html >> > > > +#usr/share/doc/ffmpeg/libswresample.html >> > > > +#usr/share/doc/ffmpeg/libswscale.html >> > > > +#usr/share/doc/ffmpeg/nut.html >> > > > +#usr/share/doc/ffmpeg/platform.html >> > > > +#usr/share/ffmpeg >> > > > +#usr/share/ffmpeg/examples >> > > > +#usr/share/ffmpeg/examples/Makefile >> > > > +#usr/share/ffmpeg/examples/README >> > > > +#usr/share/ffmpeg/examples/avio_dir_cmd.c >> > > > +#usr/share/ffmpeg/examples/avio_reading.c >> > > > +#usr/share/ffmpeg/examples/decoding_encoding.c >> > > > +#usr/share/ffmpeg/examples/demuxing_decoding.c >> > > > +#usr/share/ffmpeg/examples/extract_mvs.c >> > > > +#usr/share/ffmpeg/examples/filter_audio.c >> > > > +#usr/share/ffmpeg/examples/filtering_audio.c >> > > > +#usr/share/ffmpeg/examples/filtering_video.c >> > > > +#usr/share/ffmpeg/examples/http_multiclient.c >> > > > +#usr/share/ffmpeg/examples/metadata.c >> > > > +#usr/share/ffmpeg/examples/muxing.c >> > > > +#usr/share/ffmpeg/examples/qsvdec.c >> > > > +#usr/share/ffmpeg/examples/remuxing.c >> > > > +#usr/share/ffmpeg/examples/resampling_audio.c >> > > > +#usr/share/ffmpeg/examples/scaling_video.c >> > > > +#usr/share/ffmpeg/examples/transcode_aac.c >> > > > +#usr/share/ffmpeg/examples/transcoding.c >> > > > +#usr/share/ffmpeg/ffprobe.xsd >> > > > +#usr/share/ffmpeg/libvpx-1080p.ffpreset >> > > > +#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset >> > > > +#usr/share/ffmpeg/libvpx-360p.ffpreset >> > > > +#usr/share/ffmpeg/libvpx-720p.ffpreset >> > > > +#usr/share/ffmpeg/libvpx-720p50_60.ffpreset >> > > > +#usr/share/man/man1/ffmpeg-all.1 >> > > > +#usr/share/man/man1/ffmpeg-bitstream-filters.1 >> > > > +#usr/share/man/man1/ffmpeg-codecs.1 >> > > > +#usr/share/man/man1/ffmpeg-devices.1 >> > > > +#usr/share/man/man1/ffmpeg-filters.1 >> > > > +#usr/share/man/man1/ffmpeg-formats.1 >> > > > +#usr/share/man/man1/ffmpeg-protocols.1 >> > > > +#usr/share/man/man1/ffmpeg-resampler.1 >> > > > +#usr/share/man/man1/ffmpeg-scaler.1 >> > > > +#usr/share/man/man1/ffmpeg-utils.1 >> > > > +#usr/share/man/man1/ffmpeg.1 >> > > > +#usr/share/man/man1/ffplay-all.1 >> > > > +#usr/share/man/man1/ffplay.1 >> > > > +#usr/share/man/man1/ffprobe-all.1 >> > > > +#usr/share/man/man1/ffprobe.1 >> > > > +#usr/share/man/man1/ffserver-all.1 >> > > > +#usr/share/man/man1/ffserver.1 >> > > > +#usr/share/man/man3/libavcodec.3 >> > > > +#usr/share/man/man3/libavdevice.3 >> > > > +#usr/share/man/man3/libavfilter.3 >> > > > +#usr/share/man/man3/libavformat.3 >> > > > +#usr/share/man/man3/libavutil.3 >> > > > +#usr/share/man/man3/libswresample.3 >> > > > +#usr/share/man/man3/libswscale.3 >> > > > diff --git a/config/rootfiles/packages/ffmpeg-libs >> > > > b/config/rootfiles/packages/ffmpeg-libs >> > > > index a58dcd5..1f401ec 100644 >> > > > --- a/config/rootfiles/packages/ffmpeg-libs >> > > > +++ b/config/rootfiles/packages/ffmpeg-libs >> > > > @@ -1,64 +1,212 @@ >> > > > #usr/bin/ffmpeg >> > > > #usr/bin/ffplay >> > > > #usr/bin/ffserver >> > > > -#usr/include/libavcodec >> > > > -#usr/include/libavcodec/avcodec.h >> > > > -#usr/include/libavcodec/opt.h >> > > > -#usr/include/libavdevice >> > > > -#usr/include/libavdevice/avdevice.h >> > > > -#usr/include/libavformat >> > > > -#usr/include/libavformat/avformat.h >> > > > -#usr/include/libavformat/avio.h >> > > > -#usr/include/libavformat/rtsp.h >> > > > -#usr/include/libavformat/rtspcodes.h >> > > > -#usr/include/libavutil >> > > > -#usr/include/libavutil/adler32.h >> > > > -#usr/include/libavutil/avstring.h >> > > > -#usr/include/libavutil/avutil.h >> > > > -#usr/include/libavutil/base64.h >> > > > -#usr/include/libavutil/common.h >> > > > -#usr/include/libavutil/crc.h >> > > > -#usr/include/libavutil/fifo.h >> > > > -#usr/include/libavutil/intfloat_readwrite.h >> > > > -#usr/include/libavutil/log.h >> > > > -#usr/include/libavutil/lzo.h >> > > > -#usr/include/libavutil/mathematics.h >> > > > -#usr/include/libavutil/md5.h >> > > > -#usr/include/libavutil/mem.h >> > > > -#usr/include/libavutil/random.h >> > > > -#usr/include/libavutil/rational.h >> > > > -#usr/include/libavutil/sha1.h >> > > > +#usr/bin/ffprobe >> > > > +#usr/include/libavcodec/avdct.h >> > > > +#usr/include/libavcodec/avfft.h >> > > > +#usr/include/libavcodec/d3d11va.h >> > > > +#usr/include/libavcodec/dirac.h >> > > > +#usr/include/libavcodec/dv_profile.h >> > > > +#usr/include/libavcodec/dxva2.h >> > > > +#usr/include/libavcodec/jni.h >> > > > +#usr/include/libavcodec/qsv.h >> > > > +#usr/include/libavcodec/vaapi.h >> > > > +#usr/include/libavcodec/vda.h >> > > > +#usr/include/libavcodec/vdpau.h >> > > > +#usr/include/libavcodec/version.h >> > > > +#usr/include/libavcodec/videotoolbox.h >> > > > +#usr/include/libavcodec/vorbis_parser.h >> > > > +#usr/include/libavcodec/xvmc.h >> > > > +#usr/include/libavdevice/version.h >> > > > +#usr/include/libavfilter >> > > > +#usr/include/libavfilter/avfilter.h >> > > > +#usr/include/libavfilter/avfiltergraph.h >> > > > +#usr/include/libavfilter/buffersink.h >> > > > +#usr/include/libavfilter/buffersrc.h >> > > > +#usr/include/libavfilter/version.h >> > > > +#usr/include/libavformat/version.h >> > > > +#usr/include/libavutil/aes.h >> > > > +#usr/include/libavutil/aes_ctr.h >> > > > +#usr/include/libavutil/attributes.h >> > > > +#usr/include/libavutil/audio_fifo.h >> > > > +#usr/include/libavutil/avassert.h >> > > > +#usr/include/libavutil/avconfig.h >> > > > +#usr/include/libavutil/blowfish.h >> > > > +#usr/include/libavutil/bprint.h >> > > > +#usr/include/libavutil/bswap.h >> > > > +#usr/include/libavutil/buffer.h >> > > > +#usr/include/libavutil/camellia.h >> > > > +#usr/include/libavutil/cast5.h >> > > > +#usr/include/libavutil/channel_layout.h >> > > > +#usr/include/libavutil/cpu.h >> > > > +#usr/include/libavutil/des.h >> > > > +#usr/include/libavutil/dict.h >> > > > +#usr/include/libavutil/display.h >> > > > +#usr/include/libavutil/downmix_info.h >> > > > +#usr/include/libavutil/error.h >> > > > +#usr/include/libavutil/eval.h >> > > > +#usr/include/libavutil/ffversion.h >> > > > +#usr/include/libavutil/file.h >> > > > +#usr/include/libavutil/frame.h >> > > > +#usr/include/libavutil/hash.h >> > > > +#usr/include/libavutil/hmac.h >> > > > +#usr/include/libavutil/hwcontext.h >> > > > +#usr/include/libavutil/hwcontext_cuda.h >> > > > +#usr/include/libavutil/hwcontext_dxva2.h >> > > > +#usr/include/libavutil/hwcontext_vaapi.h >> > > > +#usr/include/libavutil/hwcontext_vdpau.h >> > > > +#usr/include/libavutil/imgutils.h >> > > > +#usr/include/libavutil/intfloat.h >> > > > +#usr/include/libavutil/intreadwrite.h >> > > > +#usr/include/libavutil/lfg.h >> > > > +#usr/include/libavutil/macros.h >> > > > +#usr/include/libavutil/mastering_display_metadata.h >> > > > +#usr/include/libavutil/motion_vector.h >> > > > +#usr/include/libavutil/murmur3.h >> > > > +#usr/include/libavutil/opt.h >> > > > +#usr/include/libavutil/parseutils.h >> > > > +#usr/include/libavutil/pixdesc.h >> > > > +#usr/include/libavutil/pixelutils.h >> > > > +#usr/include/libavutil/pixfmt.h >> > > > +#usr/include/libavutil/random_seed.h >> > > > +#usr/include/libavutil/rc4.h >> > > > +#usr/include/libavutil/replaygain.h >> > > > +#usr/include/libavutil/ripemd.h >> > > > +#usr/include/libavutil/samplefmt.h >> > > > +#usr/include/libavutil/sha.h >> > > > +#usr/include/libavutil/sha512.h >> > > > +#usr/include/libavutil/stereo3d.h >> > > > +#usr/include/libavutil/tea.h >> > > > +#usr/include/libavutil/threadmessage.h >> > > > +#usr/include/libavutil/time.h >> > > > +#usr/include/libavutil/timecode.h >> > > > +#usr/include/libavutil/timestamp.h >> > > > +#usr/include/libavutil/tree.h >> > > > +#usr/include/libavutil/twofish.h >> > > > +#usr/include/libavutil/version.h >> > > > +#usr/include/libavutil/xtea.h >> > > > +#usr/include/libpostproc/version.h >> > > > +#usr/include/libswresample >> > > > +#usr/include/libswresample/swresample.h >> > > > +#usr/include/libswresample/version.h >> > > > +#usr/include/libswscale >> > > > +#usr/include/libswscale/swscale.h >> > > > +#usr/include/libswscale/version.h, >> > > > #usr/lib/libavcodec.a >> > > > -usr/lib/libavcodec.so >> > > > -usr/lib/libavcodec.so.51 >> > > > -usr/lib/libavcodec.so.51.54.0 >> > > > +#usr/lib/libavcodec.so >> > > > +usr/lib/libavcodec.so.57 >> > > > +usr/lib/libavcodec.so.57.48.101 >> > > > #usr/lib/libavdevice.a >> > > > -usr/lib/libavdevice.so >> > > > -usr/lib/libavdevice.so.52 >> > > > -usr/lib/libavdevice.so.52.0.0 >> > > > +#usr/lib/libavdevice.so >> > > > +usr/lib/libavdevice.so.57 >> > > > +usr/lib/libavdevice.so.57.0.101 >> > > > +#usr/lib/libavfilter.a >> > > > +#usr/lib/libavfilter.so >> > > > +usr/lib/libavfilter.so.6 >> > > > +usr/lib/libavfilter.so.6.47.100 >> > > > #usr/lib/libavformat.a >> > > > -usr/lib/libavformat.so >> > > > -usr/lib/libavformat.so.52 >> > > > -usr/lib/libavformat.so.52.13.0 >> > > > +#usr/lib/libavformat.so >> > > > +usr/lib/libavformat.so.57 >> > > > +usr/lib/libavformat.so.57.41.100 >> > > > #usr/lib/libavutil.a >> > > > -usr/lib/libavutil.so >> > > > -usr/lib/libavutil.so.49 >> > > > -usr/lib/libavutil.so.49.6.0 >> > > > -#usr/lib/pkgconfig >> > > > -usr/lib/pkgconfig/libavcodec.pc >> > > > -usr/lib/pkgconfig/libavdevice.pc >> > > > -usr/lib/pkgconfig/libavformat.pc >> > > > -usr/lib/pkgconfig/libavutil.pc >> > > > -#usr/lib/vhook >> > > > -usr/lib/vhook/drawtext.so >> > > > -usr/lib/vhook/fish.so >> > > > -usr/lib/vhook/null.so >> > > > -usr/lib/vhook/ppm.so >> > > > -usr/lib/vhook/watermark.so >> > > > -#usr/include/libpostproc >> > > > -#usr/include/libpostproc/postprocess.h >> > > > +#usr/lib/libavutil.so >> > > > +usr/lib/libavutil.so.55 >> > > > +usr/lib/libavutil.so.55.28.100 >> > > > #usr/lib/libpostproc.a >> > > > -usr/lib/libpostproc.so >> > > > -usr/lib/libpostproc.so.51 >> > > > -usr/lib/libpostproc.so.51.1.0 >> > > > -usr/lib/pkgconfig/libpostproc.pc >> > > > +#usr/lib/libpostproc.so >> > > > +usr/lib/libpostproc.so.54 >> > > > +usr/lib/libpostproc.so.54.0.100 >> > > > +#usr/lib/libswresample.a >> > > > +#usr/lib/libswresample.so >> > > > +usr/lib/libswresample.so.2 >> > > > +usr/lib/libswresample.so.2.1.100 >> > > > +#usr/lib/libswscale.a >> > > > +#usr/lib/libswscale.so >> > > > +usr/lib/libswscale.so.4 >> > > > +usr/lib/libswscale.so.4.1.100 >> > > > +#usr/lib/pkgconfig/libavfilter.pc >> > > > +#usr/lib/pkgconfig/libswresample.pc >> > > > +#usr/lib/pkgconfig/libswscale.pc >> > > > +#usr/share/doc/ffmpeg >> > > > +#usr/share/doc/ffmpeg/developer.html >> > > > +#usr/share/doc/ffmpeg/faq.html >> > > > +#usr/share/doc/ffmpeg/fate.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-all.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-codecs.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-devices.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-filters.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-formats.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-protocols.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-resampler.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-scaler.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg-utils.html >> > > > +#usr/share/doc/ffmpeg/ffmpeg.html >> > > > +#usr/share/doc/ffmpeg/ffplay-all.html >> > > > +#usr/share/doc/ffmpeg/ffplay.html >> > > > +#usr/share/doc/ffmpeg/ffprobe-all.html >> > > > +#usr/share/doc/ffmpeg/ffprobe.html >> > > > +#usr/share/doc/ffmpeg/ffserver-all.html >> > > > +#usr/share/doc/ffmpeg/ffserver.html >> > > > +#usr/share/doc/ffmpeg/general.html >> > > > +#usr/share/doc/ffmpeg/git-howto.html >> > > > +#usr/share/doc/ffmpeg/libavcodec.html >> > > > +#usr/share/doc/ffmpeg/libavdevice.html >> > > > +#usr/share/doc/ffmpeg/libavfilter.html >> > > > +#usr/share/doc/ffmpeg/libavformat.html >> > > > +#usr/share/doc/ffmpeg/libavutil.html >> > > > +#usr/share/doc/ffmpeg/libswresample.html >> > > > +#usr/share/doc/ffmpeg/libswscale.html >> > > > +#usr/share/doc/ffmpeg/nut.html >> > > > +#usr/share/doc/ffmpeg/platform.html >> > > > +#usr/share/ffmpeg >> > > > +#usr/share/ffmpeg/examples >> > > > +#usr/share/ffmpeg/examples/Makefile >> > > > +#usr/share/ffmpeg/examples/README >> > > > +#usr/share/ffmpeg/examples/avio_dir_cmd.c >> > > > +#usr/share/ffmpeg/examples/avio_reading.c >> > > > +#usr/share/ffmpeg/examples/decoding_encoding.c >> > > > +#usr/share/ffmpeg/examples/demuxing_decoding.c >> > > > +#usr/share/ffmpeg/examples/extract_mvs.c >> > > > +#usr/share/ffmpeg/examples/filter_audio.c >> > > > +#usr/share/ffmpeg/examples/filtering_audio.c >> > > > +#usr/share/ffmpeg/examples/filtering_video.c >> > > > +#usr/share/ffmpeg/examples/http_multiclient.c >> > > > +#usr/share/ffmpeg/examples/metadata.c >> > > > +#usr/share/ffmpeg/examples/muxing.c >> > > > +#usr/share/ffmpeg/examples/qsvdec.c >> > > > +#usr/share/ffmpeg/examples/remuxing.c >> > > > +#usr/share/ffmpeg/examples/resampling_audio.c >> > > > +#usr/share/ffmpeg/examples/scaling_video.c >> > > > +#usr/share/ffmpeg/examples/transcode_aac.c >> > > > +#usr/share/ffmpeg/examples/transcoding.c >> > > > +#usr/share/ffmpeg/ffprobe.xsd >> > > > +#usr/share/ffmpeg/libvpx-1080p.ffpreset >> > > > +#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset >> > > > +#usr/share/ffmpeg/libvpx-360p.ffpreset >> > > > +#usr/share/ffmpeg/libvpx-720p.ffpreset >> > > > +#usr/share/ffmpeg/libvpx-720p50_60.ffpreset >> > > > +#usr/share/man/man1/ffmpeg-all.1 >> > > > +#usr/share/man/man1/ffmpeg-bitstream-filters.1 >> > > > +#usr/share/man/man1/ffmpeg-codecs.1 >> > > > +#usr/share/man/man1/ffmpeg-devices.1 >> > > > +#usr/share/man/man1/ffmpeg-filters.1 >> > > > +#usr/share/man/man1/ffmpeg-formats.1 >> > > > +#usr/share/man/man1/ffmpeg-protocols.1 >> > > > +#usr/share/man/man1/ffmpeg-resampler.1 >> > > > +#usr/share/man/man1/ffmpeg-scaler.1 >> > > > +#usr/share/man/man1/ffmpeg-utils.1 >> > > > +#usr/share/man/man1/ffmpeg.1 >> > > > +#usr/share/man/man1/ffplay-all.1 >> > > > +#usr/share/man/man1/ffplay.1 >> > > > +#usr/share/man/man1/ffprobe-all.1 >> > > > +#usr/share/man/man1/ffprobe.1 >> > > > +#usr/share/man/man1/ffserver-all.1 >> > > > +#usr/share/man/man1/ffserver.1 >> > > > +#usr/share/man/man3/libavcodec.3 >> > > > +#usr/share/man/man3/libavdevice.3 >> > > > +#usr/share/man/man3/libavfilter.3 >> > > > +#usr/share/man/man3/libavformat.3 >> > > > +#usr/share/man/man3/libavutil.3 >> > > > +#usr/share/man/man3/libswresample.3 >> > > > +#usr/share/man/man3/libswscale.3 >> > > > diff --git a/lfs/ffmpeg b/lfs/ffmpeg >> > > > index b383886..76c0c73 100644 >> > > > --- a/lfs/ffmpeg >> > > > +++ b/lfs/ffmpeg >> > > > @@ -1,7 +1,7 @@ >> > > > ####################################################################### >> > > > #### >> > > > #### >> > > > # >> > > > >> > > > # >> > > > # IPFire.org - A linux based >> > > > firewall # >> > > > -# Copyright (C) 2007 Michael Tremer & Christian >> > > > Schmidt # >> > > > +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> >> > > > >> > > > # >> > > > # >> > > > >> > > > # >> > > > # This program is free software: you can redistribute it and/or >> > > > modify # >> > > > # it under the terms of the GNU General Public License as published >> > > > by # >> > > > @@ -24,19 +24,19 @@ >> > > > >> > > > include Config >> > > > >> > > > -VER = 2008-04-13 >> > > > -THISAPP = ffmpeg-export-$(VER) >> > > > +VER = 3.1.4 >> > > > +THISAPP = ffmpeg-$(VER) >> > > > DL_FILE = $(THISAPP).tar.bz2 >> > > > DL_FROM = $(URL_IPFIRE) >> > > > DIR_APP = $(DIR_SRC)/$(THISAPP) >> > > > TARGET = $(DIR_INFO)/$(THISAPP) >> > > > PROG = ffmpeg >> > > > -PAK_VER = 5 >> > > > +PAK_VER = 6 >> > > > >> > > > DEPS = "ffmpeg-libs sdl lame libvorbis xvid" >> > > > >> > > > # Don't use PIC for libavcodec >> > > > -CFLAGS += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack >> > > > +#CFLAGS += -fno-PIC -fno-strict-aliasing -Wa,--noexecstack >> > > Why did you comment these C flags out? Did we need them no longer or >> > > are there >> > > another reasons? >> > >> > These disable hardening and were probably introduced to avoid any >> > issues with >> > inline assembly that uses the %ebx register. To confirm if this is >> > removed in >> > the new release someone could just remove the CFLAGS and rebuild this >> > on i586. >> > If that goes through, everything is fine. >> > >> > > >> > > > >> > > > >> > > > >> > > > ####################################################################### >> > > > #### >> > > > #### >> > > > # Top-level Rules >> > > > @@ -46,7 +46,7 @@ objects = $(DL_FILE) >> > > > >> > > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >> > > > >> > > > -$(DL_FILE)_MD5 = 017ab929ff92be552debb65c589c2183 >> > > > +$(DL_FILE)_MD5 = 1c099ec01cef5caadd05a4f78561c560 >> > > > >> > > > install : $(TARGET) >> > > > >> > > > @@ -79,14 +79,13 @@ $(subst %,%_MD5,$(objects)) : >> > > > $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> > > > @$(PREBUILD) >> > > > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf >> > > > $(DIR_DL)/$(DL_FILE) >> > > > - ln -s $(THISAPP) /usr/src/ffmpeg >> > > > - cd $(DIR_SRC)/ffmpeg && ./configure --prefix=/usr \ >> > > > - --enable-shared \ >> > > > - >> > > > >> > > > --enable-postproc \ >> > > > - >> > > > >> > > > --enable-pthreads \ >> > > > - >> > > > >> > > > --enable-gpl >> > > > - cd $(DIR_SRC)/ffmpeg && make $(MAKETUNING) $(EXTRA_MAKE) >> > > > - cd $(DIR_SRC)/ffmpeg && make install >> > > > - cd $(DIR_SRC)/ffmpeg && make install-libs >> > > > + cd $(DIR_APP) && ./configure --prefix=/usr \ >> > > > + --enable-shared \ >> > > > + --enable-postproc \ >> > > > + --enable-pthreads \ >> > > > + --enable-gpl >> > > > + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) >> > > > + cd $(DIR_APP) && make install >> > > > + cd $(DIR_APP) && make install-libs >> > > > @rm -rf $(DIR_APP) >> > > > @$(POSTBUILD) >> > > > diff --git a/lfs/ffmpeg-libs b/lfs/ffmpeg-libs >> > > > index b29c978..8762964 100644 >> > > > --- a/lfs/ffmpeg-libs >> > > > +++ b/lfs/ffmpeg-libs >> > > > @@ -1,7 +1,7 @@ >> > > > ####################################################################### >> > > > #### >> > > > #### >> > > > # >> > > > >> > > > # >> > > > # IPFire.org - A linux based >> > > > firewall # >> > > > -# Copyright (C) 2007 Michael Tremer & Christian >> > > > Schmidt # >> > > > +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> >> > > > >> > > > # >> > > > # >> > > > >> > > > # >> > > > # This program is free software: you can redistribute it and/or >> > > > modify # >> > > > # it under the terms of the GNU General Public License as published >> > > > by # >> > > > @@ -24,10 +24,10 @@ >> > > > >> > > > include Config >> > > > >> > > > -VER = 2008-04-13 >> > > > +VER = 3.1.4 >> > > > THISAPP = ffmpeg-export-$(VER) >> > > > PROG = ffmpeg-libs >> > > > -PAK_VER = 5 >> > > > +PAK_VER = 6 >> > > > >> > > > DEPS = "" >> > > > >> > > > -- >> > > > 2.9.3 >> > > Regards Jonatan >> ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2017-03-14 9:09 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-13 19:23 [PATCH 0/6] Update ffmepg and the packages that use it Marcel Lorenz
2016-11-13 19:23 ` [PATCH 1/6] ffmpeg and ffmpeg-libs: update 3.1.4 Marcel Lorenz
2016-11-13 19:23 ` [PATCH 2/6] motion: update to 4.0.1 Marcel Lorenz
2016-11-13 19:23 ` [PATCH 3/6] xvid: update to 1.3.4 Marcel Lorenz
2016-11-13 19:23 ` [PATCH 4/6] minidlna: update to 1.1.5 Marcel Lorenz
2016-11-13 19:23 ` [PATCH 5/6] apcupsd: update to 3.14.14 Marcel Lorenz
2017-03-12 16:04 ` Michael Tremer
2017-03-12 16:08 ` Michael Tremer
2017-03-13 13:15 ` Marcel Lorenz
2017-03-13 14:14 ` Michael Tremer
2016-11-13 19:24 ` [PATCH 6/6] mpd: update to 0.19.19 Marcel Lorenz
[not found] <1479486635.4372.3@mail01.ipfire.org>
2017-03-12 16:08 ` [PATCH 1/6] ffmpeg and ffmpeg-libs: update 3.1.4 Michael Tremer
2017-03-13 13:23 ` Marcel Lorenz
2017-03-13 14:15 ` Michael Tremer
2017-03-14 9:09 ` Marcel Lorenz
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox