[rpms/ffmpeg] epel9-next: Prefer openh264 over noopenh264

[rpms/ffmpeg] epel9-next: Prefer openh264 over noopenh264

[Kalev Lember]

            A new commit has been pushed.

            Repo   : rpms/ffmpeg
            Branch : epel9-next
            Commit : cc897ea5ca8f487ef79d84d3b453b321a8937a03
            Author : Kalev Lember <klember@redhat.com>
            Date   : 2023-12-08T16:48:07+01:00
            Stats  : +6/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/ffmpeg/c/cc897ea5ca8f487ef79d84d3b453b321a8937a03?branch=epel9-next

            Log:
            Prefer openh264 over noopenh264

Add "Suggests: openh264" so that dnf picks openh264 over noopenh264 that
both provide the same library.

---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 0ad6eac..f3d86b6 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -92,7 +92,7 @@ Name:           ffmpeg
 %global pkg_name %{name}%{?pkg_suffix}
 
 Version:        6.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A complete solution to record, convert and stream audio and video
 License:        GPL-3.0-or-later
 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
 ## 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,10 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
 %{_mandir}/man3/libswscale.3*
 
 %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
 - Update to 6.0.1
 - Add ffmpeg chromium support patch (#2240127)

[rpms/ffmpeg] epel9-next: Prefer openh264 over noopenh264

[Kalev Lember]

            A new commit has been pushed.

            Repo   : rpms/ffmpeg
            Branch : epel9-next
            Commit : 3e4867aff14e92b273a89c233671b4354572b0e0
            Author : Kalev Lember <klember@redhat.com>
            Date   : 2023-12-08T13:11:26-05:00
            Stats  : +5/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/ffmpeg/c/3e4867aff14e92b273a89c233671b4354572b0e0?branch=epel9-next

            Log:
            Prefer openh264 over noopenh264

Add "Suggests: openh264" so that dnf picks openh264 over noopenh264 that
both provide the same library.

---
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 <klember@redhat.com> - 5.1.4-2
+- Prefer openh264 over noopenh264
+
 * Tue Nov 14 2023 Neal Gompa <ngompa@fedoraproject.org> - 5.1.4-1
 - Update to 5.1.4
 - Add ffmpeg chromium support patch (#2240127)