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