From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 1/6] ffmpeg and ffmpeg-libs: update 3.1.4
Date: Tue, 14 Mar 2017 10:09:30 +0100 [thread overview]
Message-ID: <885b27a97859a627968140dd867d3d32@ipfire.org> (raw)
In-Reply-To: <1489414546.10391.84.camel@ipfire.org>
[-- 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
>>
next prev parent reply other threads:[~2017-03-14 9:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1479486635.4372.3@mail01.ipfire.org>
2017-03-12 16:08 ` Michael Tremer
2017-03-13 13:23 ` Marcel Lorenz
2017-03-13 14:15 ` Michael Tremer
2017-03-14 9:09 ` Marcel Lorenz [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=885b27a97859a627968140dd867d3d32@ipfire.org \
--to=marcel.lorenz@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox