Re: [PATCH] ffmpeg: Update to 4.4

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 11546 bytes --]

Hello,

Thank you for this patch.

I didn’t run a clean build and tried to only rebuild ffmpeg and check the timestamps after. They had all changed so I wasn’t sure.

Best,
-Michael

> On 6 May 2021, at 17:22, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> Hi Michael,
> 
> On 06/05/2021 11:52, Michael Tremer wrote:
>> Hey,
>> There seem to be a couple of problem with this patch:
>> * Won’t build on armv5tel which I have already fixed
>> * On i586, the static libraries cannot be stripped
>> Could you have a look please at why this is and ideally disable the static libraries? Passing —-disable-static does not seem to do the job.
> 
> I added --disable-static to the configure and for me it worked. The static libraries disappeared from the rootfiles.
> I will submit a patch shortly. Hopefully it helps with the i586 arch.
> 
> If I find static library entries are created with any IPFire package, should I aim to be disabling them by default?
> 
> Regards,
> 
> Adolf.
>> Best,
>> -Michael
>>> On 30 Apr 2021, at 09:08, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>> 
>>> - Update from 4.2.3 to 4.4
>>> - Update rootfile
>>> - Changelog
>>> version 4.4:
>>> - AudioToolbox output device
>>> - MacCaption demuxer
>>> - PGX decoder
>>> - chromanr video filter
>>> - VDPAU accelerated HEVC 10/12bit decoding
>>> - ADPCM IMA Ubisoft APM encoder
>>> - Rayman 2 APM muxer
>>> - AV1 encoding support SVT-AV1
>>> - Cineform HD encoder
>>> - ADPCM Argonaut Games encoder
>>> - Argonaut Games ASF muxer
>>> - AV1 Low overhead bitstream format demuxer
>>> - RPZA video encoder
>>> - ADPCM IMA MOFLEX decoder
>>> - MobiClip FastAudio decoder
>>> - MobiClip video decoder
>>> - MOFLEX demuxer
>>> - MODS demuxer
>>> - PhotoCD decoder
>>> - MCA demuxer
>>> - AV1 decoder (Hardware acceleration used only)
>>> - SVS demuxer
>>> - Argonaut Games BRP demuxer
>>> - DAT demuxer
>>> - aax demuxer
>>> - IPU decoder, parser and demuxer
>>> - Intel QSV-accelerated AV1 decoding
>>> - Argonaut Games Video decoder
>>> - libwavpack encoder removed
>>> - ACE demuxer
>>> - AVS3 demuxer
>>> - AVS3 video decoder via libuavs3d
>>> - Cintel RAW decoder
>>> - VDPAU accelerated VP9 10/12bit decoding
>>> - afreqshift and aphaseshift filters
>>> - High Voltage Software ADPCM encoder
>>> - LEGO Racers ALP (.tun & .pcm) muxer
>>> - AV1 VAAPI decoder
>>> - adenorm filter
>>> - ADPCM IMA AMV encoder
>>> - AMV muxer
>>> - NVDEC AV1 hwaccel
>>> - DXVA2/D3D11VA hardware accelerated AV1 decoding
>>> - speechnorm filter
>>> - SpeedHQ encoder
>>> - asupercut filter
>>> - asubcut filter
>>> - Microsoft Paint (MSP) version 2 decoder
>>> - Microsoft Paint (MSP) demuxer
>>> - AV1 monochrome encoding support via libaom >= 2.0.1
>>> - asuperpass and asuperstop filter
>>> - shufflepixels filter
>>> - tmidequalizer filter
>>> - estdif filter
>>> - epx filter
>>> - Dolby E parser
>>> - shear filter
>>> - kirsch filter
>>> - colortemperature filter
>>> - colorcontrast filter
>>> - PFM encoder
>>> - colorcorrect filter
>>> - binka demuxer
>>> - XBM parser
>>> - xbm_pipe demuxer
>>> - colorize filter
>>> - CRI parser
>>> - aexciter audio filter
>>> - exposure video filter
>>> - monochrome video filter
>>> - setts bitstream filter
>>> - vif video filter
>>> - OpenEXR image encoder
>>> - Simbiosis IMX decoder
>>> - Simbiosis IMX demuxer
>>> - Digital Pictures SGA demuxer and decoders
>>> - TTML subtitle encoder and muxer
>>> - identity video filter
>>> - msad video filter
>>> - gophers protocol
>>> - RIST protocol via librist
>>> version 4.3:
>>> - v360 filter
>>> - Intel QSV-accelerated MJPEG decoding
>>> - Intel QSV-accelerated VP9 decoding
>>> - Support for TrueHD in mp4
>>> - Support AMD AMF encoder on Linux (via Vulkan)
>>> - IMM5 video decoder
>>> - ZeroMQ protocol
>>> - support Sipro ACELP.KELVIN decoding
>>> - streamhash muxer
>>> - sierpinski video source
>>> - scroll video filter
>>> - photosensitivity filter
>>> - anlms filter
>>> - arnndn filter
>>> - bilateral filter
>>> - maskedmin and maskedmax filters
>>> - VDPAU VP9 hwaccel
>>> - median filter
>>> - QSV-accelerated VP9 encoding
>>> - AV1 encoding support via librav1e
>>> - AV1 frame merge bitstream filter
>>> - AV1 Annex B demuxer
>>> - axcorrelate filter
>>> - mvdv decoder
>>> - mvha decoder
>>> - MPEG-H 3D Audio support in mp4
>>> - thistogram filter
>>> - freezeframes filter
>>> - Argonaut Games ADPCM decoder
>>> - Argonaut Games ASF demuxer
>>> - xfade video filter
>>> - xfade_opencl filter
>>> - afirsrc audio filter source
>>> - pad_opencl filter
>>> - Simon & Schuster Interactive ADPCM decoder
>>> - Real War KVAG demuxer
>>> - CDToons video decoder
>>> - siren audio decoder
>>> - Rayman 2 ADPCM decoder
>>> - Rayman 2 APM demuxer
>>> - cas video filter
>>> - High Voltage Software ADPCM decoder
>>> - LEGO Racers ALP (.tun & .pcm) demuxer
>>> - AMQP 0-9-1 protocol (RabbitMQ)
>>> - Vulkan support
>>> - avgblur_vulkan, overlay_vulkan, scale_vulkan and chromaber_vulkan filters
>>> - ADPCM IMA MTF decoder
>>> - FWSE demuxer
>>> - DERF DPCM decoder
>>> - DERF demuxer
>>> - CRI HCA decoder
>>> - CRI HCA demuxer
>>> - overlay_cuda filter
>>> - switch from AvxSynth to AviSynth+ on Linux
>>> - mv30 decoder
>>> - Expanded styling support for 3GPP Timed Text Subtitles (movtext)
>>> - WebP parser
>>> - tmedian filter
>>> - maskedthreshold filter
>>> - Support for muxing pcm and pgs in m2ts
>>> - Cunning Developments ADPCM decoder
>>> - asubboost filter
>>> - Pro Pinball Series Soundbank demuxer
>>> - pcm_rechunk bitstream filter
>>> - scdet filter
>>> - NotchLC decoder
>>> - gradients source video filter
>>> - MediaFoundation encoder wrapper
>>> - untile filter
>>> - Simon & Schuster Interactive ADPCM encoder
>>> - PFM decoder
>>> - dblur video filter
>>> - Real War KVAG muxer
>>> 
>>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>> ---
>>> config/rootfiles/packages/ffmpeg | 29 ++++++++++++++++++++---------
>>> lfs/ffmpeg                       |  6 +++---
>>> 2 files changed, 23 insertions(+), 12 deletions(-)
>>> 
>>> diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg
>>> index c0659f5ab..633706172 100644
>>> --- a/config/rootfiles/packages/ffmpeg
>>> +++ b/config/rootfiles/packages/ffmpeg
>>> @@ -6,12 +6,18 @@ usr/bin/ffprobe
>>> #usr/include/libavcodec/avcodec.h
>>> #usr/include/libavcodec/avdct.h
>>> #usr/include/libavcodec/avfft.h
>>> +#usr/include/libavcodec/bsf.h
>>> +#usr/include/libavcodec/codec.h
>>> +#usr/include/libavcodec/codec_desc.h
>>> +#usr/include/libavcodec/codec_id.h
>>> +#usr/include/libavcodec/codec_par.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/mediacodec.h
>>> +#usr/include/libavcodec/packet.h
>>> #usr/include/libavcodec/qsv.h
>>> #usr/include/libavcodec/vaapi.h
>>> #usr/include/libavcodec/vdpau.h
>>> @@ -58,6 +64,7 @@ usr/bin/ffprobe
>>> #usr/include/libavutil/des.h
>>> #usr/include/libavutil/dict.h
>>> #usr/include/libavutil/display.h
>>> +#usr/include/libavutil/dovi_meta.h
>>> #usr/include/libavutil/downmix_info.h
>>> #usr/include/libavutil/encryption_info.h
>>> #usr/include/libavutil/error.h
>>> @@ -65,6 +72,7 @@ usr/bin/ffprobe
>>> #usr/include/libavutil/ffversion.h
>>> #usr/include/libavutil/fifo.h
>>> #usr/include/libavutil/file.h
>>> +#usr/include/libavutil/film_grain_params.h
>>> #usr/include/libavutil/frame.h
>>> #usr/include/libavutil/hash.h
>>> #usr/include/libavutil/hdr_dynamic_metadata.h
>>> @@ -75,10 +83,12 @@ usr/bin/ffprobe
>>> #usr/include/libavutil/hwcontext_drm.h
>>> #usr/include/libavutil/hwcontext_dxva2.h
>>> #usr/include/libavutil/hwcontext_mediacodec.h
>>> +#usr/include/libavutil/hwcontext_opencl.h
>>> #usr/include/libavutil/hwcontext_qsv.h
>>> #usr/include/libavutil/hwcontext_vaapi.h
>>> #usr/include/libavutil/hwcontext_vdpau.h
>>> #usr/include/libavutil/hwcontext_videotoolbox.h
>>> +#usr/include/libavutil/hwcontext_vulkan.h
>>> #usr/include/libavutil/imgutils.h
>>> #usr/include/libavutil/intfloat.h
>>> #usr/include/libavutil/intreadwrite.h
>>> @@ -116,6 +126,7 @@ usr/bin/ffprobe
>>> #usr/include/libavutil/twofish.h
>>> #usr/include/libavutil/tx.h
>>> #usr/include/libavutil/version.h
>>> +#usr/include/libavutil/video_enc_params.h
>>> #usr/include/libavutil/xtea.h
>>> #usr/include/libpostproc
>>> #usr/include/libpostproc/postprocess.h
>>> @@ -129,19 +140,19 @@ usr/bin/ffprobe
>>> #usr/lib/libavcodec.a
>>> #usr/lib/libavcodec.so
>>> usr/lib/libavcodec.so.58
>>> -usr/lib/libavcodec.so.58.54.100
>>> +usr/lib/libavcodec.so.58.134.100
>>> #usr/lib/libavdevice.a
>>> #usr/lib/libavdevice.so
>>> usr/lib/libavdevice.so.58
>>> -usr/lib/libavdevice.so.58.8.100
>>> +usr/lib/libavdevice.so.58.13.100
>>> #usr/lib/libavfilter.a
>>> #usr/lib/libavfilter.so
>>> usr/lib/libavfilter.so.7
>>> -usr/lib/libavfilter.so.7.57.100
>>> +usr/lib/libavfilter.so.7.110.100
>>> #usr/lib/libavformat.a
>>> #usr/lib/libavformat.so
>>> usr/lib/libavformat.so.58
>>> -usr/lib/libavformat.so.58.29.100
>>> +usr/lib/libavformat.so.58.76.100
>>> #usr/lib/libavresample.a
>>> #usr/lib/libavresample.so
>>> usr/lib/libavresample.so.4
>>> @@ -149,19 +160,19 @@ usr/lib/libavresample.so.4.0.0
>>> #usr/lib/libavutil.a
>>> #usr/lib/libavutil.so
>>> usr/lib/libavutil.so.56
>>> -usr/lib/libavutil.so.56.31.100
>>> +usr/lib/libavutil.so.56.70.100
>>> #usr/lib/libpostproc.a
>>> #usr/lib/libpostproc.so
>>> usr/lib/libpostproc.so.55
>>> -usr/lib/libpostproc.so.55.5.100
>>> +usr/lib/libpostproc.so.55.9.100
>>> #usr/lib/libswresample.a
>>> #usr/lib/libswresample.so
>>> usr/lib/libswresample.so.3
>>> -usr/lib/libswresample.so.3.5.100
>>> +usr/lib/libswresample.so.3.9.100
>>> #usr/lib/libswscale.a
>>> #usr/lib/libswscale.so
>>> usr/lib/libswscale.so.5
>>> -usr/lib/libswscale.so.5.5.100
>>> +usr/lib/libswscale.so.5.9.100
>>> #usr/lib/pkgconfig/libavcodec.pc
>>> #usr/lib/pkgconfig/libavdevice.pc
>>> #usr/lib/pkgconfig/libavfilter.pc
>>> @@ -204,7 +215,7 @@ usr/lib/libswscale.so.5.5.100
>>> #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_list_dir.c
>>> #usr/share/ffmpeg/examples/avio_reading.c
>>> #usr/share/ffmpeg/examples/decode_audio.c
>>> #usr/share/ffmpeg/examples/decode_video.c
>>> diff --git a/lfs/ffmpeg b/lfs/ffmpeg
>>> index 0795afff8..41b939c22 100644
>>> --- a/lfs/ffmpeg
>>> +++ b/lfs/ffmpeg
>>> @@ -24,7 +24,7 @@
>>> 
>>> include Config
>>> 
>>> -VER        = 4.2.3
>>> +VER        = 4.4
>>> 
>>> THISAPP    = ffmpeg-$(VER)
>>> DL_FILE    = $(THISAPP).tar.bz2
>>> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
>>> DIR_APP    = $(DIR_SRC)/$(THISAPP)
>>> TARGET     = $(DIR_INFO)/$(THISAPP)
>>> PROG       = ffmpeg
>>> -PAK_VER    = 10
>>> +PAK_VER    = 11
>>> 
>>> DEPS       = sdl lame libvorbis xvid
>>> 
>>> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
>>> 
>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>> 
>>> -$(DL_FILE)_MD5 = 695fad11f3baf27784e24cb0e977b65a
>>> +$(DL_FILE)_MD5 = aa46d2168f30becd4fd3b22d2e8a91ec
>>> 
>>> install : $(TARGET)
>>> 
>>> -- 
>>> 2.31.1
>>>