[ffmpeg/f37] Fixup fedora/i686 case for 5.x
by Nicolas Chauvet
commit 2fe7947c84755364c5359a7193fc8d2dcd9e202d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 15 21:39:03 2023 +0100
Fixup fedora/i686 case for 5.x
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 2538b1a..63c9fbc 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -25,7 +25,6 @@
%global _without_lensfun 1
%if 0%{?fedora}
%global _with_placebo 1
-%endif
%ifnarch i686
%global _with_bs2b 1
%global _with_chromaprint 1
@@ -43,6 +42,7 @@
%else
%global _without_vulkan 1
%endif
+%endif
%ifarch x86_64
%global _with_mfx 1
%global _with_svtav1 1
1 year
[ffmpeg/el9] Update ffmpeg-chromium.patch for FFmpeg-5.x
by Nicolas Chauvet
commit d566b689f55ac8afbaefbb3344df5d71f2f9db01
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 15 21:46:56 2023 +0100
Update ffmpeg-chromium.patch for FFmpeg-5.x
ffmpeg-chromium.patch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/ffmpeg-chromium.patch b/ffmpeg-chromium.patch
index 2160609..6625e2d 100644
--- a/ffmpeg-chromium.patch
+++ b/ffmpeg-chromium.patch
@@ -1,4 +1,4 @@
-From d32aacab65a322b66d6a1b48f6cdb03e42bde0f9 Mon Sep 17 00:00:00 2001
+From 4464ecf750bb9440e2571a8d810627cdec85ae02 Mon Sep 17 00:00:00 2001
From: Frank Liberato <liberato(a)chromium.org>
Date: Wed, 7 Jul 2021 19:01:22 -0700
Subject: [PATCH] Add av_stream_get_first_dts for Chromium
@@ -9,12 +9,12 @@ Subject: [PATCH] Add av_stream_get_first_dts for Chromium
2 files changed, 11 insertions(+)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
-index 1916aa2dc5..e6682849fa 100644
+index f12fa7d904..0b9fd1f061 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
-@@ -1019,6 +1019,10 @@ attribute_deprecated
+@@ -1128,6 +1128,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s);
+ */
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);
1 year
[ffmpeg/el9] Fixup fedora/i686 case for 5.x
by Nicolas Chauvet
commit efc2699c80ab5b5e00eb2703f4df5fc82ee45593
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 15 21:39:03 2023 +0100
Fixup fedora/i686 case for 5.x
ffmpeg.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 2538b1a..63c9fbc 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -25,7 +25,6 @@
%global _without_lensfun 1
%if 0%{?fedora}
%global _with_placebo 1
-%endif
%ifnarch i686
%global _with_bs2b 1
%global _with_chromaprint 1
@@ -43,6 +42,7 @@
%else
%global _without_vulkan 1
%endif
+%endif
%ifarch x86_64
%global _with_mfx 1
%global _with_svtav1 1
1 year
[ffmpeg/f37] Update sources
by Nicolas Chauvet
commit c1fa8528614e0bcc2a665867ed536568d9d762b1
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 15 21:28:23 2023 +0100
Update sources
sources | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index 260fe33..61a5306 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ffmpeg-5.1.3.tar.xz) = 4310f27fe0c7b4363207e1535115e0ad266a45772bdb5445f5c8658f35b0f3216d8f2cf70d1d2baa71b12069fbdccf418a774b353ddf092d4f66829ef391508a
-SHA512 (ffmpeg-5.1.3.tar.xz.asc) = a7348205ef6648e5c73c32fbe99b8130256d1157d1a7c128701b240e4096ac16778cfcc74a922fe8147e0a137119b8a5fd60f006328454b712eefe154f546318
+SHA512 (ffmpeg-5.1.4.tar.xz) = 7d7fe8c660a62971a979553a864648d5c859059d3e64d4d32e4f5dca6fd4374270abdeec2dd782c34b2254e7485995c3fe0c1dcef54159e30536eab7f20e0795
+SHA512 (ffmpeg-5.1.4.tar.xz.asc) = f161815d47c988f8b6281a95f22301d07a22ddc41a2a84bfc126b4d7de0e9175da499c2cc15b3bdaa415af0e8ed1d2b4d52096a81b4a3d804effb00ff9e8ec5b
1 year
[ffmpeg/el9] Update sources
by Nicolas Chauvet
commit 98709cd59ca3cd5d9cb71c9f3e79a161c3958a37
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 15 21:28:23 2023 +0100
Update sources
sources | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index 260fe33..61a5306 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ffmpeg-5.1.3.tar.xz) = 4310f27fe0c7b4363207e1535115e0ad266a45772bdb5445f5c8658f35b0f3216d8f2cf70d1d2baa71b12069fbdccf418a774b353ddf092d4f66829ef391508a
-SHA512 (ffmpeg-5.1.3.tar.xz.asc) = a7348205ef6648e5c73c32fbe99b8130256d1157d1a7c128701b240e4096ac16778cfcc74a922fe8147e0a137119b8a5fd60f006328454b712eefe154f546318
+SHA512 (ffmpeg-5.1.4.tar.xz) = 7d7fe8c660a62971a979553a864648d5c859059d3e64d4d32e4f5dca6fd4374270abdeec2dd782c34b2254e7485995c3fe0c1dcef54159e30536eab7f20e0795
+SHA512 (ffmpeg-5.1.4.tar.xz.asc) = f161815d47c988f8b6281a95f22301d07a22ddc41a2a84bfc126b4d7de0e9175da499c2cc15b3bdaa415af0e8ed1d2b4d52096a81b4a3d804effb00ff9e8ec5b
1 year
[ffmpeg/el9] (6 commits) ...Add patch to fix fedora ffmpeg broken ABI change
by Nicolas Chauvet
Summary of changes:
1f8027d... Enable openh264 for fedora (*)
7b91076... fedora cisco repo isn't multiarch (*)
84347ff... update changelog (*)
f4d1f19... Update to 5.1.4 (*)
b8faee7... Enforces conflicts and virtual provides (*)
fe9f19c... Add patch to fix fedora ffmpeg broken ABI change (*)
(*) This commit already existed in another branch; no separate mail sent
1 year
[ffmpeg/f37] Add patch to fix fedora ffmpeg broken ABI change
by Nicolas Chauvet
commit fe9f19c0cfd53fc932234fded603fec7f9084c6c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Nov 15 17:05:19 2023 +0000
Add patch to fix fedora ffmpeg broken ABI change
ffmpeg-chromium.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
ffmpeg.spec | 2 ++
2 files changed, 48 insertions(+)
---
diff --git a/ffmpeg-chromium.patch b/ffmpeg-chromium.patch
new file mode 100644
index 0000000..2160609
--- /dev/null
+++ b/ffmpeg-chromium.patch
@@ -0,0 +1,46 @@
+From d32aacab65a322b66d6a1b48f6cdb03e42bde0f9 Mon Sep 17 00:00:00 2001
+From: Frank Liberato <liberato(a)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
+
diff --git a/ffmpeg.spec b/ffmpeg.spec
index b2db794..2538b1a 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -122,6 +122,8 @@ Source0: https://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
Source1: https://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz.asc
Source2: https://ffmpeg.org/ffmpeg-devel.asc
%endif
+# We don't endorse adding this patch but fedora insists on breaking the ffmpeg ABI
+Patch0: ffmpeg-chromium.patch
Conflicts: %{name}-free
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
1 year
[ffmpeg/f37] Enforces conflicts and virtual provides
by Nicolas Chauvet
commit b8faee7e198880fd694465629cba32b710f4b998
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 15 20:03:46 2023 +0100
Enforces conflicts and virtual provides
ffmpeg.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 83c9270..b2db794 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -244,6 +244,7 @@ Conflicts: libpostproc-free
Conflicts: libswresample-free
Conflicts: libswscale-free
%{?_with_vmaf:Recommends: vmaf-models}
+Provides: libavcodec-freeworld = %{version}-%{release}
%description libs
FFmpeg is a complete and free Internet live audio and video
@@ -281,6 +282,7 @@ This package contains development files for %{name}
Summary: Freeworld libavcodec to complement the distro counterparts
# Supplements doesn't work well yet - we can rely on comps for now
#Supplements: libavcodec-free >= %%{version}
+Conflicts: libavcodec-free < %{version}
%description -n libavcodec-freeworld
Freeworld libavcodec to complement the distro counterparts
1 year
[ffmpeg/f37] Update to 5.1.4
by Nicolas Chauvet
commit f4d1f1971d467370984dba934c7a7c7030ecd1fa
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 15 21:17:22 2023 +0100
Update to 5.1.4
ffmpeg.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 777f831..83c9270 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -111,8 +111,8 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 5.1.3
-Release: 3%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Version: 5.1.4
+Release: 1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -527,6 +527,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Wed Nov 15 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 5.1.4-1
+- Update to 5.1.4
+
* Sun May 14 2023 Leigh Scott <leigh123linux(a)gmail.com> - 5.1.3-3
- fedora cisco repo isn't multiarch
1 year
[ffmpeg/f38] Enforces conflicts and virtual provides
by Nicolas Chauvet
commit be2fb6d7301ba1367c2f7ea77216244832693df8
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Nov 15 20:03:46 2023 +0100
Enforces conflicts and virtual provides
ffmpeg.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 5b9e66e..3534b45 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -253,6 +253,7 @@ Conflicts: libpostproc-free
Conflicts: libswresample-free
Conflicts: libswscale-free
%{?_with_vmaf:Recommends: vmaf-models}
+Provides: libavcodec-freeworld = %{version}-%{release}
%description libs
FFmpeg is a complete and free Internet live audio and video
@@ -290,6 +291,7 @@ This package contains development files for %{name}
Summary: Freeworld libavcodec to complement the distro counterparts
# Supplements doesn't work well yet - we can rely on comps for now
#Supplements: libavcodec-free >= %%{version}
+Conflicts: libavcodec-free < %{version}
%description -n libavcodec-freeworld
Freeworld libavcodec to complement the distro counterparts
1 year