From 4c7c44eb6ab1dedbd80907d95b02157ee9e5a8aa Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 15 Feb 2023 16:02:24 -0500 Subject: [PATCH 1/5] Drop unused opencv BuildRequires opencv has deliberately broken their C API as of 3.4 and completely removed it in 4.0, meaning there is no way to enable OpenCV in ffmpeg without completely rewriting the filter in C++. https://github.com/opencv/opencv/wiki/ChangeLog#version400 https://ffmpeg.org/pipermail/ffmpeg-devel/2018-March/226872.html https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=915544 --- ffmpeg.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ffmpeg.spec b/ffmpeg.spec index 321be04..42699c7 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -221,7 +221,6 @@ BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(openal) BuildRequires: pkgconfig(opencore-amrnb) BuildRequires: pkgconfig(OpenCL) -BuildRequires: pkgconfig(opencv4) BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(rav1e) BuildRequires: pkgconfig(rubberband) From cb6d660a348d2ff5b08f1f757b8f618ffc1d9560 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 15 Feb 2023 17:25:15 -0500 Subject: [PATCH 2/5] rebuild for libvpx --- ffmpeg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ffmpeg.spec b/ffmpeg.spec index 42699c7..d7b2956 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -102,7 +102,7 @@ Name: ffmpeg %global pkg_name %{name}%{?pkg_suffix} Version: 5.1.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A complete solution to record, convert and stream audio and video License: GPLv3+ URL: https://ffmpeg.org/ @@ -868,6 +868,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples %{_mandir}/man3/libswscale.3* %changelog +* Wed Feb 15 2023 Tom Callaway - 5.1.2-10 +- rebuild for libvpx + * Mon Feb 13 2023 Yaakov Selkowitz - 5.1.2-9 - Enable lcms2, lv2, placebo, rabbitmq, xv From a8c440ac7559e75fe6b6adef77fae6b62daf214a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 15 Feb 2023 17:38:17 -0500 Subject: [PATCH 3/5] bootstrap needed --- ffmpeg.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ffmpeg.spec b/ffmpeg.spec index d7b2956..736dbdd 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -3,7 +3,7 @@ %bcond_with all_codecs # Break dependency cycles by disabling certain optional dependencies. -%bcond_with bootstrap +%bcond_without bootstrap # If you want to do a build with the upstream source tarball, then set the # pkg_suffix to %%nil. We can't handle this with a conditional, as srpm @@ -869,7 +869,7 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples %changelog * Wed Feb 15 2023 Tom Callaway - 5.1.2-10 -- rebuild for libvpx +- rebuild for libvpx (bootstrap) * Mon Feb 13 2023 Yaakov Selkowitz - 5.1.2-9 - Enable lcms2, lv2, placebo, rabbitmq, xv From 04c040828d90060aa0a3181fac0cacb339079cf5 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 15 Feb 2023 18:40:28 -0500 Subject: [PATCH 4/5] bootstrap off --- ffmpeg.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ffmpeg.spec b/ffmpeg.spec index 736dbdd..9596407 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -3,7 +3,7 @@ %bcond_with all_codecs # Break dependency cycles by disabling certain optional dependencies. -%bcond_without bootstrap +%bcond_with bootstrap # If you want to do a build with the upstream source tarball, then set the # pkg_suffix to %%nil. We can't handle this with a conditional, as srpm @@ -102,7 +102,7 @@ Name: ffmpeg %global pkg_name %{name}%{?pkg_suffix} Version: 5.1.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A complete solution to record, convert and stream audio and video License: GPLv3+ URL: https://ffmpeg.org/ @@ -868,6 +868,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples %{_mandir}/man3/libswscale.3* %changelog +* Wed Feb 15 2023 Tom Callaway - 5.1.2-11 +- bootstrap off + * Wed Feb 15 2023 Tom Callaway - 5.1.2-10 - rebuild for libvpx (bootstrap) From be0b562a327ab49d729a1ebd21bc8d310b44c723 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 15 Feb 2023 23:12:32 -0500 Subject: [PATCH 5/5] Enable support for the RIST protocol through librist --- ffmpeg.spec | 7 ++++++- ffmpeg_free_sources | 1 + sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ffmpeg.spec b/ffmpeg.spec index 9596407..f2024e1 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -102,7 +102,7 @@ Name: ffmpeg %global pkg_name %{name}%{?pkg_suffix} Version: 5.1.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A complete solution to record, convert and stream audio and video License: GPLv3+ URL: https://ffmpeg.org/ @@ -205,6 +205,7 @@ BuildRequires: pkgconfig(libplacebo) >= 4.192.0 %endif BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(librabbitmq) +BuildRequires: pkgconfig(librist) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libssh) BuildRequires: pkgconfig(libv4l2) @@ -641,6 +642,7 @@ cp -a doc/examples/{*.c,Makefile,README} _doc/examples/ --enable-libpulse \ --enable-librabbitmq \ --enable-librav1e \ + --enable-librist \ --enable-librsvg \ --enable-librubberband \ --enable-libsnappy \ @@ -868,6 +870,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples %{_mandir}/man3/libswscale.3* %changelog +* Wed Feb 15 2023 Neal Gompa - 5.1.2-12 +- Enable support for the RIST protocol through librist + * Wed Feb 15 2023 Tom Callaway - 5.1.2-11 - bootstrap off diff --git a/ffmpeg_free_sources b/ffmpeg_free_sources index c553ce4..c834f1c 100644 --- a/ffmpeg_free_sources +++ b/ffmpeg_free_sources @@ -2965,6 +2965,7 @@ libavformat/libavformat.v libavformat/libgme.c libavformat/libmodplug.c libavformat/libopenmpt.c +libavformat/librist.c libavformat/libsmbclient.c libavformat/libsrt.c libavformat/libssh.c diff --git a/sources b/sources index 584081c..bea1472 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (ffmpeg-free-5.1.2.tar.xz) = 122572273e2b22867d7e7abeb560a8bccbd9803156a3cc96686f0c9a0ef1ef3f4dcc68a438fdbaed8a9697b4cdc43b9bf1ece89e1085aa1db86460816ed3ae3c +SHA512 (ffmpeg-free-5.1.2.tar.xz) = 8dfb1b8a7d60357abbb21b38526ece67efec38cb52c01ed03b540d350ac82576ce68de3294a4cc6f166c36defa3933e2f9d4652b290e167bf8b6f220921e1e50 SHA512 (ffmpeg-5.1.2.tar.xz.asc) = 6afc898e3898a7d34e21f0f0bd0553765a46257332c6ece6226e3e043b842275a8d885b9ccca34bc90a2f008ae5fa14515276d23f921a518a63a47f6504af115 SHA512 (ffmpeg-dlopen-headers.tar.xz) = 97e6986fc2bb9dfa4516135a76b04d27ceb52ff96f0af21a6169919aeefefb4d2e2e24a771959689cdbec385f5d71614ba661223c67c0e94089a6dd823a30099 SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165