Merge and update to 5.1.4-1

.ffmpeg.metadata

@@ -1,3 +1,3 @@
 81b8a0552dbd1c5e0c6e595f2174351397435d76  SOURCES/ffmpeg-dlopen-headers.tar.xz
-678b051ad6388318c9981b98071962d45b424ed5  SOURCES/ffmpeg-free-5.1.3.tar.xz
+dac6c3845a0ab47e7869dc0facfc8763d8db0064  SOURCES/ffmpeg-free-5.1.4.tar.xz
 ef85643caa3e7814da1b1cf49ac97b28f8c28c56  SOURCES/ffmpeg.keyring

.gitignore

@@ -1,3 +1,3 @@
 SOURCES/ffmpeg-dlopen-headers.tar.xz
-SOURCES/ffmpeg-free-5.1.3.tar.xz
+SOURCES/ffmpeg-free-5.1.4.tar.xz
 SOURCES/ffmpeg.keyring

SOURCES/ffmpeg-5.1.4.tar.xz.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmVNbhEYHGZmbXBlZy1k
+ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYdNMIAI+dP+nDw3YxOpr4H7ACcmpD
+mfKku9WKbrp648wqWDeB2jEFEe4F2Wh1hViGBoMs0bZ6ZnZY37SbvOAAGSP5aMNM
+DTxspAf5VwoBGWRFcx8ljSZImozwfDQuXL2DjxVA71s+7v47b8ww1flGIveIxnJG
+uFAZ0MUR6CN3NHMAjbpro+pZRam4hSA3UzNCgLF00iqzksOm9WxZqbOL0AJoH+en
+6wTqH+29BZhfY+zICyZnknYla3PcKxvO73grSY+dlpmleQEE2HIsmu0/b+v6CCeI
+qXoGEFF5PazrCW4JLuCXDOQmcxLreesCSdCsdHxPg8pU4zj3jQpO2UV6r/YdAE0=
+=LL3G
+-----END PGP SIGNATURE-----

SOURCES/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

SOURCES/ffmpeg-chromium.patch

@@ -0,0 +1,46 @@
+From 4464ecf750bb9440e2571a8d810627cdec85ae02 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 f12fa7d904..0b9fd1f061 100644
+--- a/libavformat/avformat.h
++++ b/libavformat/avformat.h
+@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
+  */
+ int64_t    av_stream_get_end_pts(const AVStream *st);
+ 
++// 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
+

SPECS/ffmpeg.spec

@@ -101,7 +101,7 @@
 Name:           ffmpeg
 %global pkg_name %{name}%{?pkg_suffix}
 
-Version:        5.1.3
+Version:        5.1.4
 Release:        1%{?dist}
 Summary:        A complete solution to record, convert and stream audio and video
 License:        GPLv3+
@@ -132,6 +132,12 @@ Patch3:         ffmpeg-allow-fdk-aac-free.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}
@@ -148,6 +154,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
@@ -552,7 +559,7 @@ This subpackage contains the headers for FFmpeg libswscale.
 gpgv2 --quiet --keyring %{SOURCE3} %{SOURCE2} %{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
@@ -868,6 +875,11 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
 %{_mandir}/man3/libswscale.3*
 
 %changelog
+* Tue Nov 14 2023 Neal Gompa <ngompa@fedoraproject.org> - 5.1.4-1
+- Update to 5.1.4
+- Add ffmpeg chromium support patch (#2240127)
+- Use git to apply patches
+
 * Mon Oct 30 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 5.1.3-1
 - Rebuilt for MSVSphere 9.2