From 5d863e600a32245820a58dee0853434aae8386c9 Mon Sep 17 00:00:00 2001 From: tigro Date: Thu, 7 Dec 2023 10:39:19 +0300 Subject: [PATCH] Update to 5.1.4 --- .ffmpeg.metadata | 2 +- .gitignore | 2 +- SOURCES/ffmpeg-5.1.3.tar.xz.asc | 11 ----------- SPECS/ffmpeg.spec | 20 ++++++++++++++++++-- 4 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 SOURCES/ffmpeg-5.1.3.tar.xz.asc diff --git a/.ffmpeg.metadata b/.ffmpeg.metadata index c953f1f..bb91ef7 100644 --- a/.ffmpeg.metadata +++ b/.ffmpeg.metadata @@ -1 +1 @@ -0d897a89bf4c2ccbe54032fce0caefeecf041fbc SOURCES/ffmpeg-5.1.3.tar.xz +ebcb9e2f6975b97e25314abdfd717d94b3078eff SOURCES/ffmpeg-5.1.4.tar.xz diff --git a/.gitignore b/.gitignore index e61360b..ee92ace 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ffmpeg-5.1.3.tar.xz +SOURCES/ffmpeg-5.1.4.tar.xz diff --git a/SOURCES/ffmpeg-5.1.3.tar.xz.asc b/SOURCES/ffmpeg-5.1.3.tar.xz.asc deleted file mode 100644 index 4d6146b..0000000 --- a/SOURCES/ffmpeg-5.1.3.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmQgVfwYHGZmbXBlZy1k -ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYntkH/1aN/nVkVPhbalrPdX14VIau -aW2OxXleh7AJe9FVjYduJPQZHS5+wm1GTTl5/IHje3sMG54RdkezRIfx/XCeZefd -c+P6OPvqpIXvhEHoKABB/hD7bI/+0bkAfUtDDp0Nfv05sag9PPC0XAJfLGlvWTPl -Ci8rLbO7VnsOo35+3dRVHgx6N6vNQuKRx5oZVgb3GEo18gjV1zsoDD91cQjR7GeF -64Jol7CPAikSnGwi3rxjARTk+V2YqaPM0KY/VR9QlVReIT2CdrRvQtUTvL1WB5mC -6nQ3tHDkRk5uEohAT+e9dxAUBxSTQhKHJn8V4pFS1QVBKH4slPqGvTPnKf5vg+8= -=Tdc7 ------END PGP SIGNATURE----- diff --git a/SPECS/ffmpeg.spec b/SPECS/ffmpeg.spec index 8c7f3a1..73f7657 100644 --- a/SPECS/ffmpeg.spec +++ b/SPECS/ffmpeg.spec @@ -25,11 +25,11 @@ %global _without_lensfun 1 %if 0%{?fedora} %global _with_placebo 1 -%endif %ifnarch i686 %global _with_bs2b 1 %global _with_chromaprint 1 %global _with_ilbc 1 +%global _with_openh264 1 %global _with_rav1e 1 %global _with_rubberband 1 %global _with_smb 1 @@ -42,6 +42,7 @@ %else %global _without_vulkan 1 %endif +%endif %ifarch x86_64 %global _with_mfx 1 %global _with_svtav1 1 @@ -110,7 +111,7 @@ ExclusiveArch: armv7hnl Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} -Version: 5.1.3 +Version: 5.1.4 Release: 1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}.inferit License: %{ffmpeg_license} URL: https://ffmpeg.org/ @@ -121,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} @@ -165,6 +168,7 @@ BuildRequires: libgcrypt-devel BuildRequires: libGL-devel BuildRequires: libmodplug-devel BuildRequires: libmysofa-devel +%{?_with_openh264:BuildRequires: openh264-devel} BuildRequires: libopenmpt-devel %{?_with_placebo:BuildRequires: libplacebo-devel} BuildRequires: librsvg2-devel @@ -242,6 +246,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 @@ -279,6 +284,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 @@ -346,6 +352,7 @@ Freeworld libavcodec to complement the distro counterparts %{!?_without_opencl:--enable-opencl} \\\ %{?_with_opencv:--enable-libopencv} \\\ %{!?_without_opengl:--enable-opengl} \\\ + %{?_with_openh264:--enable-libopenh264} \\\ --enable-libopenjpeg \\\ --enable-libopenmpt \\\ %{!?_without_opus:--enable-libopus} \\\ @@ -524,9 +531,18 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.* %changelog +* Wed Nov 15 2023 Nicolas Chauvet - 5.1.4-1.inferit +- Update to 5.1.4 + * Mon Jul 17 2023 Arkady L. Shane - 5.1.3-1.inferit - Rebuild RPMFusion version for MSVSphere 9.2 +* Sun May 14 2023 Leigh Scott - 5.1.3-3 +- fedora cisco repo isn't multiarch + +* Fri May 12 2023 Leigh Scott - 5.1.3-2 +- Enable openh264 for fedora + * Fri Mar 31 2023 Leigh Scott - 5.1.3-1 - Update to 5.1.3 release - verify upstream source signature