Re: [PATCH 1/2] ffmpeg: Update to version 5.1.2

Hello,

On 27 Nov 2022, at 12:14, Adolf Belka adolf.belka@ipfire.org wrote:

Hi Michael,

On 27/11/2022 12:55, Michael Tremer wrote:

...

Reviewed-by: Michael Tremer michael.tremer@ipfire.org With this, we will probably have to re-ship everything that is built against ffmpeg, as we have a couple of sobumps.

I did run ./make.sh find-dependencies against all the old so bumped libraries and non of them flagged up still being linked to anything but it is probably safer to re-ship as my use of find-dependencies has not always flagged up things that should have been shipped.

The command is kind of broken. In a fresh build, you would have built everything against the new version of ffmpeg and nothing will ever be linked against the old one because it wasn’t available at all at build time.

How do I find all the programs that are built against ffmpeg?

I suppose checking for any LFS files that have “ffmpeg” in their DEPS line will suffice.

For those, we will just have to increase the release version.

Best, -Michael

Regards, Adolf.

...

-Michael

...

On 25 Nov 2022, at 17:38, Adolf Belka adolf.belka@ipfire.org wrote:

• Update from version 4.4 to 5.1.2
• Update of rootfile
• avresample has been removed from ffmpeg and so ./configure option had to be removed
• many libraries had an so bump so checked with find-dependencies - nothing flagged
• Changelog version 5.1.2:
• avcodec/dstdec: Check for overflow in build_filter()
• avformat/spdifdec: Use 64bit to compute bit rate
• avformat/rpl: Use 64bit for duration computation
• avformat/xwma: Use av_rescale() for duration computation
• avformat/sdsdec: Use av_rescale() to avoid intermediate overflow in duration calculation
• avformat/sbgdec: Check ts_int in genrate_intervals
• avformat/sbgdec: clamp end_ts
• avformat/rmdec: check tag_size
• avformat/nutdec: Check fields
• avformat/flvdec: Use 64bit for sum_flv_tag_size
• avformat/jacosubdec: Fix overflow in get_shift()
• avformat/genh: Check nb_channels for IMA ADPCM
• avformat/dxa: avoid bpc overflows
• avformat/dhav: Use 64bit seek_back
• avformat/cafdec: Check that nb_frasmes fits within 64bit
• avformat/asfdec_o: Limit packet offset
• avformat/apm: Use 64bit for bit_rate computation
• avformat/ape: Check frames size
• avformat/icodec: Check nb_pal
• avformat/aiffdec: Use 64bit for block_duration use
• avformat/aiffdec: Check block_duration
• avformat/mxfdec: only probe max run in
• avformat/mxfdec: Check run_in is within 65536
• avcodec/mjpegdec: Check for unsupported bayer case
• avcodec/apedec: Fix integer overflow in filter_3800()
• avcodec/tta: Check 24bit scaling for overflow
• avcodec/mobiclip: Check quantizer for overflow
• avcodec/exr: Check preview psize
• avcodec/tiff: Fix loop detection
• libavformat/hls: Free keys
• avcodec/fmvc: Move frame allocation to a later stage
• avfilter/vf_showinfo: remove backspaces
• avcodec/speedhq: Check width
• avcodec/bink: disallow odd positioned scaled blocks
• avformat/cafenc: derive Opus frame size from the relevant stream parameters
• avformat/dashdec: Fix crash on invalid input/ENOMEM, fix leak
• lavc/videotoolbox: do not pass AVCodecContext to decoder output callback
• lavc/pthread_frame: always transfer stashed hwaccel state
• avcodec/arm/sbcenc: avoid callee preserved vfp registers
• avformat/riffdec: don't unconditionally overwrite WAVEFORMATEXTENSIBLE layout
• avfilter/vf_scale: overwrite the width and height expressions with the original values
• lavc/pthread_frame: avoid leaving stale hwaccel state in worker threads
• avutil/tests/.gitignore: Add channel_layout testtool version 5.1.1:
• avformat/asfdec_o: limit recursion depth in asf_read_unknown()
• avformat/mov: Check count sums in build_open_gop_key_points()
• doc/git-howto.texi: Document commit signing
• libavcodec/8bps: Check that line lengths fit within the buffer
• avcodec/midivid: Perform lzss_uncompress() before ff_reget_buffer()
• libavformat/iff: Check for overflow in body_end calculation
• avformat/avidec: Prevent entity expansion attacks
• avcodec/h263dec: Sanity check against minimal I/P frame size
• avcodec/hevcdec: Check s->ref in the md5 path similar to hwaccel
• avcodec/mpegaudiodec_template: use unsigned shift in handle_crc()
• avformat/subviewerdec: Make read_ts() more flexible
• avcodec/mjpegdec: bayer and rct are incompatible
• MAINTAINERS: Add ED25519 key for signing my commits in the future
• avcodec/pngdec: Fix APNG_DISPOSE_OP_BACKGROUND
• avcodec/libvpx: fix assembling vp9 packets with alpha channel
• fftools/ffmpeg_opt: try to propagate the requested output channel layout
• avcodec/libsvtav1: properly initialize the flush EbBufferHeaderType struct
• configure: enable the av1_frame_split bsf for the av1 decoder
• swresample/swresample: fill the correct buffer to print the output layout string
• ffprobe: restore reporting error code for failed inputs
• ipfsgateway: Remove default gateway
• avcodec/libspeexdec: Fix use of uninitialized value
• avformat/avisynth: use ch_layout.nb_channels for channel count
• fate/lavf-image: Disable file checksums for exr tests
• tests/fate-run: Allow to skip file checksums for lavf_image
• fate/imf: Rename IMF fate-target
• avcodec/alac: don't fail if channels aren't set during init() when extradata is valid
• configure: properly require libx264 if enabled version 5.1:
• add ipfs/ipns protocol support
• dialogue enhance audio filter
• dropped obsolete XvMC hwaccel
• pcm-bluray encoder
• DFPWM audio encoder/decoder and raw muxer/demuxer
• SITI filter
• Vizrt Binary Image encoder/decoder
• avsynctest source filter
• feedback video filter
• pixelize video filter
• colormap video filter
• colorchart video source filter
• multiply video filter
• PGS subtitle frame merge bitstream filter
• blurdetect filter
• tiltshelf audio filter
• QOI image format support
• ffprobe -o option
• virtualbass audio filter
• VDPAU AV1 hwaccel
• PHM image format support
• remap_opencl filter
• added chromakey_cuda filter version 5.0:
• ADPCM IMA Westwood encoder
• Westwood AUD muxer
• ADPCM IMA Acorn Replay decoder
• Argonaut Games CVG demuxer
• Argonaut Games CVG muxer
• Concatf protocol
• afwtdn audio filter
• audio and video segment filters
• Apple Graphics (SMC) encoder
• hsvkey and hsvhold video filters
• adecorrelate audio filter
• atilt audio filter
• grayworld video filter
• AV1 Low overhead bitstream format muxer
• swscale slice threading
• MSN Siren decoder
• scharr video filter
• apsyclip audio filter
• morpho video filter
• amr parser
• (a)latency filters
• GEM Raster image decoder
• asdr audio filter
• speex decoder
• limitdiff video filter
• xcorrelate video filter
• varblur video filter
• huesaturation video filter
• colorspectrum source video filter
• RTP packetizer for uncompressed video (RFC 4175)
• bitpacked encoder
• VideoToolbox VP9 hwaccel
• VideoToolbox ProRes hwaccel
• support loongarch.
• aspectralstats audio filter
• adynamicsmooth audio filter
• libplacebo filter
• vflip_vulkan, hflip_vulkan and flip_vulkan filters
• adynamicequalizer audio filter
• yadif_videotoolbox filter
• VideoToolbox ProRes encoder
• anlmf audio filter
• IMF demuxer (experimental)

Signed-off-by: Adolf Belka adolf.belka@ipfire.org

config/rootfiles/packages/ffmpeg | 55 ++++++++++++++++++-------------- lfs/ffmpeg | 11 +++---- 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg index 65dd0d360..fd27ea788 100644 --- a/config/rootfiles/packages/ffmpeg +++ b/config/rootfiles/packages/ffmpeg @@ -13,6 +13,7 @@ usr/bin/ffprobe #usr/include/libavcodec/codec_id.h #usr/include/libavcodec/codec_par.h #usr/include/libavcodec/d3d11va.h +#usr/include/libavcodec/defs.h #usr/include/libavcodec/dirac.h #usr/include/libavcodec/dv_profile.h #usr/include/libavcodec/dxva2.h @@ -20,27 +21,27 @@ usr/bin/ffprobe #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 #usr/include/libavcodec/version.h +#usr/include/libavcodec/version_major.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/libavdevice/version_major.h #usr/include/libavfilter #usr/include/libavfilter/avfilter.h #usr/include/libavfilter/buffersink.h #usr/include/libavfilter/buffersrc.h #usr/include/libavfilter/version.h +#usr/include/libavfilter/version_major.h #usr/include/libavformat #usr/include/libavformat/avformat.h #usr/include/libavformat/avio.h #usr/include/libavformat/version.h -#usr/include/libavresample -#usr/include/libavresample/avresample.h -#usr/include/libavresample/version.h +#usr/include/libavformat/version_major.h #usr/include/libavutil #usr/include/libavutil/adler32.h #usr/include/libavutil/aes.h @@ -62,7 +63,9 @@ usr/bin/ffprobe #usr/include/libavutil/common.h #usr/include/libavutil/cpu.h #usr/include/libavutil/crc.h +#usr/include/libavutil/csp.h #usr/include/libavutil/des.h +#usr/include/libavutil/detection_bbox.h #usr/include/libavutil/dict.h #usr/include/libavutil/display.h #usr/include/libavutil/dovi_meta.h @@ -77,6 +80,7 @@ usr/bin/ffprobe #usr/include/libavutil/frame.h #usr/include/libavutil/hash.h #usr/include/libavutil/hdr_dynamic_metadata.h +#usr/include/libavutil/hdr_dynamic_vivid_metadata.h #usr/include/libavutil/hmac.h #usr/include/libavutil/hwcontext.h #usr/include/libavutil/hwcontext_cuda.h @@ -126,55 +130,57 @@ usr/bin/ffprobe #usr/include/libavutil/tree.h #usr/include/libavutil/twofish.h #usr/include/libavutil/tx.h +#usr/include/libavutil/uuid.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 #usr/include/libpostproc/version.h +#usr/include/libpostproc/version_major.h #usr/include/libswresample #usr/include/libswresample/swresample.h #usr/include/libswresample/version.h +#usr/include/libswresample/version_major.h #usr/include/libswscale #usr/include/libswscale/swscale.h #usr/include/libswscale/version.h +#usr/include/libswscale/version_major.h #usr/lib/libavcodec.so -usr/lib/libavcodec.so.58 -usr/lib/libavcodec.so.58.134.100 +usr/lib/libavcodec.so.59 +usr/lib/libavcodec.so.59.37.100 #usr/lib/libavdevice.so -usr/lib/libavdevice.so.58 -usr/lib/libavdevice.so.58.13.100 +usr/lib/libavdevice.so.59 +usr/lib/libavdevice.so.59.7.100 #usr/lib/libavfilter.so -usr/lib/libavfilter.so.7 -usr/lib/libavfilter.so.7.110.100 +usr/lib/libavfilter.so.8 +usr/lib/libavfilter.so.8.44.100 #usr/lib/libavformat.so -usr/lib/libavformat.so.58 -usr/lib/libavformat.so.58.76.100 -#usr/lib/libavresample.so -usr/lib/libavresample.so.4 -usr/lib/libavresample.so.4.0.0 +usr/lib/libavformat.so.59 +usr/lib/libavformat.so.59.27.100 #usr/lib/libavutil.so -usr/lib/libavutil.so.56 -usr/lib/libavutil.so.56.70.100 +usr/lib/libavutil.so.57 +usr/lib/libavutil.so.57.28.100 #usr/lib/libpostproc.so -usr/lib/libpostproc.so.55 -usr/lib/libpostproc.so.55.9.100 +usr/lib/libpostproc.so.56 +usr/lib/libpostproc.so.56.6.100 #usr/lib/libswresample.so -usr/lib/libswresample.so.3 -usr/lib/libswresample.so.3.9.100 +usr/lib/libswresample.so.4 +usr/lib/libswresample.so.4.7.100 #usr/lib/libswscale.so -usr/lib/libswscale.so.5 -usr/lib/libswscale.so.5.9.100 +usr/lib/libswscale.so.6 +usr/lib/libswscale.so.6.7.100 #usr/lib/pkgconfig/libavcodec.pc #usr/lib/pkgconfig/libavdevice.pc #usr/lib/pkgconfig/libavfilter.pc #usr/lib/pkgconfig/libavformat.pc -#usr/lib/pkgconfig/libavresample.pc #usr/lib/pkgconfig/libavutil.pc #usr/lib/pkgconfig/libpostproc.pc #usr/lib/pkgconfig/libswresample.pc #usr/lib/pkgconfig/libswscale.pc #usr/share/doc/ffmpeg +#usr/share/doc/ffmpeg/bootstrap.min.css +#usr/share/doc/ffmpeg/default.css #usr/share/doc/ffmpeg/developer.html #usr/share/doc/ffmpeg/faq.html #usr/share/doc/ffmpeg/fate.html @@ -205,6 +211,7 @@ usr/lib/libswscale.so.5.9.100 #usr/share/doc/ffmpeg/mailing-list-faq.html #usr/share/doc/ffmpeg/nut.html #usr/share/doc/ffmpeg/platform.html +#usr/share/doc/ffmpeg/style.min.css #usr/share/ffmpeg #usr/share/ffmpeg/examples #usr/share/ffmpeg/examples/Makefile diff --git a/lfs/ffmpeg b/lfs/ffmpeg index ef6a1bc7d..7491d7708 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -26,15 +26,15 @@ include Config

SUMMARY = Library for working with various multimedia formats

-VER = 4.4 +VER = 5.1.2

THISAPP = ffmpeg-$(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 = ffmpeg -PAK_VER = 13 +PAK_VER = 14

DEPS = sdl2 lame libvorbis xvid

@@ -56,7 +56,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = a8dc007e260896228789d27339402e846cd21758e02c7a8d66a745ced2d1bbef4aa9c18c9b7cefef004b5ffa3fc859e2a2474c957bdf9ff27e82cec72ed4a5bf +$(DL_FILE)_BLAKE2 = 4e2682f040205e6344ff1f2cf8ac69c35cac90a14634a2cd4b41fffc0e09264586b014327f7e9cb6417d12210894cdbc180541c07ad02e782bdf79af9f22991f

install : $(TARGET)

@@ -99,8 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-static \ --enable-gpl \ --enable-version3 \

• --enable-avfilter \
• --enable-avresample

• --enable-avfilter

cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -- 2.38.1