public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Kalev Lember <klember@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ffmpeg] epel9-next: Prefer openh264 over noopenh264
Date: Mon, 20 Jul 2026 17:31:12 GMT	[thread overview]
Message-ID: <178456867212.1.88910856312105924.rpms-ffmpeg-cc897ea5ca8f@fedoraproject.org> (raw)

            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)

             reply	other threads:[~2026-07-20 17:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-20 17:31 Kalev Lember [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-07-14 21:59 [rpms/ffmpeg] epel9-next: Prefer openh264 over noopenh264 Kalev Lember

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178456867212.1.88910856312105924.rpms-ffmpeg-cc897ea5ca8f@fedoraproject.org \
    --to=klember@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox