Prefer openh264 over noopenh264
Add "Suggests: openh264" so that dnf picks openh264 over noopenh264 that both provide the same library.
This commit is contained in:
parent
b3cfba90d4
commit
cc897ea5ca
|
@ -92,7 +92,7 @@ Name: ffmpeg
|
||||||
%global pkg_name %{name}%{?pkg_suffix}
|
%global pkg_name %{name}%{?pkg_suffix}
|
||||||
|
|
||||||
Version: 6.0.1
|
Version: 6.0.1
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: A complete solution to record, convert and stream audio and video
|
Summary: A complete solution to record, convert and stream audio and video
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
URL: https://ffmpeg.org/
|
URL: https://ffmpeg.org/
|
||||||
|
@ -352,6 +352,7 @@ Requires: libswresample%{?pkg_suffix}%{_isa} = %{version}-%{release}
|
||||||
## Note, we can do this because openh264 is provided in a default-enabled
|
## Note, we can do this because openh264 is provided in a default-enabled
|
||||||
## third party repository provided by Cisco.
|
## third party repository provided by Cisco.
|
||||||
Recommends: libopenh264.so.%{openh264_soversion}%{?lib64_suffix}
|
Recommends: libopenh264.so.%{openh264_soversion}%{?lib64_suffix}
|
||||||
|
Suggests: openh264%{_isa}
|
||||||
|
|
||||||
%description -n libavcodec%{?pkg_suffix}
|
%description -n libavcodec%{?pkg_suffix}
|
||||||
The libavcodec library provides a generic encoding/decoding framework
|
The libavcodec library provides a generic encoding/decoding framework
|
||||||
|
@ -875,6 +876,10 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
|
||||||
%{_mandir}/man3/libswscale.3*
|
%{_mandir}/man3/libswscale.3*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Dec 06 2023 Kalev Lember <klember@redhat.com> - 6.0.1-2
|
||||||
|
- Build against noopenh264 stub headers and drop the bundled headers
|
||||||
|
- Prefer openh264 over noopenh264
|
||||||
|
|
||||||
* Sat Nov 11 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.0.1-1
|
* Sat Nov 11 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.0.1-1
|
||||||
- Update to 6.0.1
|
- Update to 6.0.1
|
||||||
- Add ffmpeg chromium support patch (#2240127)
|
- Add ffmpeg chromium support patch (#2240127)
|
||||||
|
|
Loading…
Reference in New Issue