[v3] ffmpeg: Update to 4.4.2

  (Correction of the v2-patch)

For details see:
http://ffmpeg.org/download.html#release_4.2

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 config/rootfiles/packages/ffmpeg | 51 ++++++++++++++++----------------
 lfs/ffmpeg                       |  9 +++---
 2 files changed, 31 insertions(+), 29 deletions(-)
  

Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

> On 7 Apr 2020, at 17:49, Matthias Fischer <matthias.fischer@ipfire.org> wrote:
> 
> (Correction of the v2-patch)
> 
> For details see:
> http://ffmpeg.org/download.html#release_4.2
> 
> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
> config/rootfiles/packages/ffmpeg | 51 ++++++++++++++++----------------
> lfs/ffmpeg                       |  9 +++---
> 2 files changed, 31 insertions(+), 29 deletions(-)
> 
> diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg
> index 755764666..c0659f5ab 100644
> --- a/config/rootfiles/packages/ffmpeg
> +++ b/config/rootfiles/packages/ffmpeg
> @@ -1,7 +1,8 @@
> usr/bin/ffmpeg
> usr/bin/ffprobe
> -usr/bin/ffserver
> #usr/include/libavcodec
> +#usr/include/libavcodec/ac3_parser.h
> +#usr/include/libavcodec/adts_parser.h
> #usr/include/libavcodec/avcodec.h
> #usr/include/libavcodec/avdct.h
> #usr/include/libavcodec/avfft.h
> @@ -13,7 +14,6 @@ usr/bin/ffserver
> #usr/include/libavcodec/mediacodec.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
> @@ -24,7 +24,6 @@ usr/bin/ffserver
> #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
> @@ -60,6 +59,7 @@ usr/bin/ffserver
> #usr/include/libavutil/dict.h
> #usr/include/libavutil/display.h
> #usr/include/libavutil/downmix_info.h
> +#usr/include/libavutil/encryption_info.h
> #usr/include/libavutil/error.h
> #usr/include/libavutil/eval.h
> #usr/include/libavutil/ffversion.h
> @@ -67,12 +67,14 @@ usr/bin/ffserver
> #usr/include/libavutil/file.h
> #usr/include/libavutil/frame.h
> #usr/include/libavutil/hash.h
> +#usr/include/libavutil/hdr_dynamic_metadata.h
> #usr/include/libavutil/hmac.h
> #usr/include/libavutil/hwcontext.h
> #usr/include/libavutil/hwcontext_cuda.h
> #usr/include/libavutil/hwcontext_d3d11va.h
> #usr/include/libavutil/hwcontext_drm.h
> #usr/include/libavutil/hwcontext_dxva2.h
> +#usr/include/libavutil/hwcontext_mediacodec.h
> #usr/include/libavutil/hwcontext_qsv.h
> #usr/include/libavutil/hwcontext_vaapi.h
> #usr/include/libavutil/hwcontext_vdpau.h
> @@ -112,6 +114,7 @@ usr/bin/ffserver
> #usr/include/libavutil/timestamp.h
> #usr/include/libavutil/tree.h
> #usr/include/libavutil/twofish.h
> +#usr/include/libavutil/tx.h
> #usr/include/libavutil/version.h
> #usr/include/libavutil/xtea.h
> #usr/include/libpostproc
> @@ -125,40 +128,40 @@ usr/bin/ffserver
> #usr/include/libswscale/version.h
> #usr/lib/libavcodec.a
> #usr/lib/libavcodec.so
> -usr/lib/libavcodec.so.57
> -usr/lib/libavcodec.so.57.107.100
> +usr/lib/libavcodec.so.58
> +usr/lib/libavcodec.so.58.54.100
> #usr/lib/libavdevice.a
> #usr/lib/libavdevice.so
> -usr/lib/libavdevice.so.57
> -usr/lib/libavdevice.so.57.10.100
> +usr/lib/libavdevice.so.58
> +usr/lib/libavdevice.so.58.8.100
> #usr/lib/libavfilter.a
> #usr/lib/libavfilter.so
> -usr/lib/libavfilter.so.6
> -usr/lib/libavfilter.so.6.107.100
> +usr/lib/libavfilter.so.7
> +usr/lib/libavfilter.so.7.57.100
> #usr/lib/libavformat.a
> #usr/lib/libavformat.so
> -usr/lib/libavformat.so.57
> -usr/lib/libavformat.so.57.83.100
> +usr/lib/libavformat.so.58
> +usr/lib/libavformat.so.58.29.100
> #usr/lib/libavresample.a
> #usr/lib/libavresample.so
> -usr/lib/libavresample.so.3
> -usr/lib/libavresample.so.3.7.0
> +usr/lib/libavresample.so.4
> +usr/lib/libavresample.so.4.0.0
> #usr/lib/libavutil.a
> #usr/lib/libavutil.so
> -usr/lib/libavutil.so.55
> -usr/lib/libavutil.so.55.78.100
> +usr/lib/libavutil.so.56
> +usr/lib/libavutil.so.56.31.100
> #usr/lib/libpostproc.a
> #usr/lib/libpostproc.so
> -usr/lib/libpostproc.so.54
> -usr/lib/libpostproc.so.54.7.100
> +usr/lib/libpostproc.so.55
> +usr/lib/libpostproc.so.55.5.100
> #usr/lib/libswresample.a
> #usr/lib/libswresample.so
> -usr/lib/libswresample.so.2
> -usr/lib/libswresample.so.2.9.100
> +usr/lib/libswresample.so.3
> +usr/lib/libswresample.so.3.5.100
> #usr/lib/libswscale.a
> #usr/lib/libswscale.so
> -usr/lib/libswscale.so.4
> -usr/lib/libswscale.so.4.8.100
> +usr/lib/libswscale.so.5
> +usr/lib/libswscale.so.5.5.100
> #usr/lib/pkgconfig/libavcodec.pc
> #usr/lib/pkgconfig/libavdevice.pc
> #usr/lib/pkgconfig/libavfilter.pc
> @@ -185,8 +188,6 @@ usr/lib/libswscale.so.4.8.100
> #usr/share/doc/ffmpeg/ffmpeg.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
> @@ -224,6 +225,8 @@ usr/lib/libswscale.so.4.8.100
> #usr/share/ffmpeg/examples/scaling_video.c
> #usr/share/ffmpeg/examples/transcode_aac.c
> #usr/share/ffmpeg/examples/transcoding.c
> +#usr/share/ffmpeg/examples/vaapi_encode.c
> +#usr/share/ffmpeg/examples/vaapi_transcode.c
> #usr/share/ffmpeg/ffprobe.xsd
> #usr/share/ffmpeg/libvpx-1080p.ffpreset
> #usr/share/ffmpeg/libvpx-1080p50_60.ffpreset
> @@ -243,8 +246,6 @@ usr/lib/libswscale.so.4.8.100
> #usr/share/man/man1/ffmpeg.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
> diff --git a/lfs/ffmpeg b/lfs/ffmpeg
> index 3e705c2d5..ed013bc22 100644
> --- a/lfs/ffmpeg
> +++ b/lfs/ffmpeg
> @@ -1,7 +1,7 @@
> ###############################################################################
> #                                                                             #
> # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
> +# Copyright (C) 2007-2020  IPFire Team  <info@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.4
> +VER        = 4.2.2
> 
> 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    = 8
> +PAK_VER    = 9
> 
> DEPS       = sdl lame libvorbis xvid
> 
> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 4d368db3431895d140e6f5f7b4987911
> +$(DL_FILE)_MD5 = 829d56f158832dbf669b5b417af48060
> 
> install : $(TARGET)
> 
> @@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
> $(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 \
> 		--enable-shared \
> -- 
> 2.18.0
>