From 3e4867aff14e92b273a89c233671b4354572b0e0 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 6 Dec 2023 13:18:11 +0100 Subject: [PATCH] Prefer openh264 over noopenh264 Add "Suggests: openh264" so that dnf picks openh264 over noopenh264 that both provide the same library. --- ffmpeg.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ffmpeg.spec b/ffmpeg.spec index 776e8ba..8f7cd61 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -102,7 +102,7 @@ Name: ffmpeg %global pkg_name %{name}%{?pkg_suffix} Version: 5.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A complete solution to record, convert and stream audio and video License: GPLv3+ URL: https://ffmpeg.org/ @@ -350,6 +350,7 @@ Requires: libswresample%{?pkg_suffix}%{_isa} = %{version}-%{release} ## Note, we can do this because openh264 is provided in a default-enabled ## third party repository provided by Cisco. Recommends: libopenh264.so.%{openh264_soversion}%{?lib64_suffix} +Suggests: openh264%{_isa} %description -n libavcodec%{?pkg_suffix} The libavcodec library provides a generic encoding/decoding framework @@ -875,6 +876,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples %{_mandir}/man3/libswscale.3* %changelog +* Wed Dec 06 2023 Kalev Lember - 5.1.4-2 +- Prefer openh264 over noopenh264 + * Tue Nov 14 2023 Neal Gompa - 5.1.4-1 - Update to 5.1.4 - Add ffmpeg chromium support patch (#2240127)