Fix ffmpeg-allow-fdk-aac-free.patch to apply with git-am

- Add ffmpeg chromium support patch (#2240127)
- Use git to apply patches

0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch

@@ -0,0 +1,30 @@
+From a0a0a804998da8d1a397479c9bafeb000e6be088 Mon Sep 17 00:00:00 2001
+From: Jun Zhao <barryjzhao@tencent.com>
+Date: Sat, 25 Feb 2023 21:54:00 +0800
+Subject: [PATCH] fftools/ffmpeg_filter: initialize the 'o' to silence the
+ warning
+
+silence the warning: variable 'o' is used uninitialized whenever
+'&&' condition is false
+
+Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
+---
+ fftools/ffmpeg_filter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
+index 1f5bbf6c4d..3504a3cc0a 100644
+--- a/fftools/ffmpeg_filter.c
++++ b/fftools/ffmpeg_filter.c
+@@ -362,7 +362,7 @@ fail:
+ 
+ static int filter_opt_apply(AVFilterContext *f, const char *key, const char *val)
+ {
+-    const AVOption *o;
++    const AVOption *o = NULL;
+     int ret;
+ 
+     ret = av_opt_set(f, key, val, AV_OPT_SEARCH_CHILDREN);
+-- 
+2.41.0
+

enable_decoders

@@ -1,5 +1,4 @@
 ## module name # reason for enablement in ffmpeg (usually there is another package that already got legal review)
-aac
 aasc
 libfdk_aac # fdk-aac-free
 ac3

enable_encoders

@@ -30,6 +30,7 @@ asv2
 av1_amf
 av1_nvenc
 av1_qsv
+av1_vaapi
 ayuv # trival
 bitpacked # trivial
 bmp # trivial

ffmpeg-allow-fdk-aac-free.patch

@@ -1,3 +1,5 @@
+From: Andreas Schneider <asn@cryptomilk.org>
+
 fdk-aac-free-devel is GPL compatible
 
 See https://bugzilla.redhat.com/show_bug.cgi?id=1501522#c112

ffmpeg-chromium.patch

@@ -0,0 +1,46 @@
+From d32aacab65a322b66d6a1b48f6cdb03e42bde0f9 Mon Sep 17 00:00:00 2001
+From: Frank Liberato <liberato@chromium.org>
+Date: Wed, 7 Jul 2021 19:01:22 -0700
+Subject: [PATCH] Add av_stream_get_first_dts for Chromium
+
+---
+ libavformat/avformat.h | 4 ++++
+ libavformat/utils.c    | 7 +++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/libavformat/avformat.h b/libavformat/avformat.h
+index 1916aa2dc5..e6682849fa 100644
+--- a/libavformat/avformat.h
++++ b/libavformat/avformat.h
+@@ -1019,6 +1019,10 @@ attribute_deprecated
+ int64_t    av_stream_get_end_pts(const AVStream *st);
+ #endif
+ 
++// Chromium: We use the internal field first_dts vvv
++int64_t    av_stream_get_first_dts(const AVStream *st);
++// Chromium: We use the internal field first_dts ^^^
++
+ #define AV_PROGRAM_RUNNING 1
+ 
+ /**
+diff --git a/libavformat/utils.c b/libavformat/utils.c
+index cf4d68bff9..7d750abf88 100644
+--- a/libavformat/utils.c
++++ b/libavformat/utils.c
+@@ -55,6 +55,13 @@ int ff_unlock_avformat(void)
+     return ff_mutex_unlock(&avformat_mutex) ? -1 : 0;
+ }
+ 
++// Chromium: We use the internal field first_dts vvv
++int64_t av_stream_get_first_dts(const AVStream *st)
++{
++  return cffstream(st)->first_dts;
++}
++// Chromium: We use the internal field first_dts ^^^
++
+ /* an arbitrarily chosen "sane" max packet size -- 50M */
+ #define SANE_CHUNK_SIZE (50000000)
+ 
+-- 
+2.41.0
+

ffmpeg.spec

@@ -91,8 +91,8 @@
 Name:           ffmpeg
 %global pkg_name %{name}%{?pkg_suffix}
 
-Version:        6.0
-Release:        4%{?dist}
+Version:        6.0.1
+Release:        1%{?dist}
 Summary:        A complete solution to record, convert and stream audio and video
 License:        GPL-3.0-or-later
 URL:            https://ffmpeg.org/
@@ -121,10 +121,29 @@ Patch3:         ffmpeg-allow-fdk-aac-free.patch
 # Backport upstream patches for libplacebo v5.264
 Patch4:         0001-avfilter-vf_libplacebo-wrap-deprecated-opts-in-FF_AP.patch
 Patch5:         0001-avfilter-vf_libplacebo-remove-deprecated-field.patch
+# Backport fix for segfault when passing non-existent filter option
+# See: https://bugzilla.rpmfusion.org/show_bug.cgi?id=6773
+Patch6:         0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch
+
+# Backport patches for enhanced rtmp support
+# Cf. https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=8926
+## From: https://patchwork.ffmpeg.org/series/8926/mbox/
+Patch8:         FFmpeg-devel-v10-Support-enhanced-flv-in-FFmpeg.patch
+
+# Backport AV1 VA-API encode support
+# Courtesy of GloriousEggroll
+## Adapted from: https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=9594
+Patch9:         ffmpeg-ge-av1-vaapi-encode-support.patch
 
 # Set up dlopen for openh264
 Patch1001:      ffmpeg-dlopen-openh264.patch
 
+# Add first_dts getter to libavformat for Chromium
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=2240127
+# Reference: https://crbug.com/1306560
+Patch1002:      ffmpeg-chromium.patch
+
+
 Requires:       libavcodec%{?pkg_suffix}%{_isa} = %{version}-%{release}
 Requires:       libavdevice%{?pkg_suffix}%{_isa} = %{version}-%{release}
 Requires:       libavfilter%{?pkg_suffix}%{_isa} = %{version}-%{release}
@@ -141,6 +160,7 @@ BuildRequires:  flite-devel >= 2.2
 %endif
 BuildRequires:  game-music-emu-devel
 BuildRequires:  gcc
+BuildRequires:  git-core
 BuildRequires:  gnupg2
 BuildRequires:  gsm-devel
 BuildRequires:  ladspa-devel
@@ -537,10 +557,10 @@ This subpackage contains the headers for FFmpeg libswscale.
 
 %prep
 %if %{with upstream_tarball}
-gpgv2 --quiet --keyring %{SOURCE3} %{SOURCE2} %{SOURCE0}
+%{gpgverify} --keyring='%{SOURCE3}' --signature='%{SOURCE2}' --data='%{SOURCE0}'
 %endif
 
-%autosetup -a1 -p1
+%autosetup -a1 -S git_am
 install -m 0644 %{SOURCE20} enable_decoders
 install -m 0644 %{SOURCE21} enable_encoders
 # fix -O3 -g in host_cflags
@@ -854,6 +874,19 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
 %{_mandir}/man3/libswscale.3*
 
 %changelog
+* Sat Nov 11 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.0.1-1
+- Update to 6.0.1
+- Add ffmpeg chromium support patch (#2240127)
+- Use git to apply patches
+
+* Fri Nov 10 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.0-6
+- Add patches to support enhanced RTMP and AV1 encoding through VA-API
+- Force AAC decoding through fdk-aac-free
+
+* Sun Oct 08 2023 Dominik Mierzejewski <dominik@greysector.net> - 6.0-5
+- Backport upstream patch to fix segfault when passing non-existent filter
+  option (rfbz#6773)
+
 * Mon Apr 03 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.0-4
 - Include RISC-V support sources in the tarball
 

sources

@@ -1,4 +1,4 @@
-SHA512 (ffmpeg-free-6.0.tar.xz) = 5e806529f45311d94a81401d8951135e84361a81d158ed030aeee9812b399dd28b25c5d3e1a4abe0665d5838e0954626de538b10cebf34f8669963b1974a3910
-SHA512 (ffmpeg-6.0.tar.xz.asc) = a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed
+SHA512 (ffmpeg-free-6.0.1.tar.xz) = da4aa6db92fbbfdda9fc64249a0c826ae5de33cacbed5ebbfbbe9a30d57ae6f79b61496fcf151dc504d646efd44ba63722220be0b718dd8ffdaa5b2510d92a97
+SHA512 (ffmpeg-6.0.1.tar.xz.asc) = 314f9ef996b85bc93c9fb823d582697c7415ac35f56bfc9cd906893491c8076df90bd852cf6e5e757b1fa94bd415ed108488c1220add49eb1f4854fc253c178c
 SHA512 (ffmpeg-dlopen-headers.tar.xz) = 97e6986fc2bb9dfa4516135a76b04d27ceb52ff96f0af21a6169919aeefefb4d2e2e24a771959689cdbec385f5d71614ba661223c67c0e94089a6dd823a30099
 SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165