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: Stop using bundled openh264 headers in F40+ and build against noopenh264
Date: Mon, 20 Jul 2026 17:31:20 GMT [thread overview]
Message-ID: <178456868072.1.12802202907032656995.rpms-ffmpeg-db2acb3681a8@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ffmpeg
Branch : epel9-next
Commit : db2acb3681a85baed6bbc897cdac792d4b7d7c5f
Author : Kalev Lember <klember@redhat.com>
Date : 2024-04-23T16:52:11+02:00
Stats : +16/-2 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/ffmpeg/c/db2acb3681a85baed6bbc897cdac792d4b7d7c5f?branch=epel9-next
Log:
Stop using bundled openh264 headers in F40+ and build against noopenh264
Now that we have noopenh264 stub package in Fedora, we can stop using
bundled openh264 headers and build against the system package instead.
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 46da505..e4ceace 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -36,6 +36,14 @@
%bcond_with omxil
%else
+# Use bundled openh264 headers on older Fedora/RHEL where the noopenh264 stub
+# package is not available
+%if 0%{?fedora} && 0%{?fedora} <= 39 || 0%{?rhel} && 0%{?rhel} <= 9
+%bcond_without bundled_openh264_headers
+%else
+%bcond_with bundled_openh264_headers
+%endif
+
# Disable some features because RHEL 9 packages are too old
%if 0%{?rhel} && 0%{?rhel} <= 9
%bcond_with flite
@@ -92,7 +100,7 @@ Name: ffmpeg
%global pkg_name %{name}%{?pkg_suffix}
Version: 6.1.1
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: A complete solution to record, convert and stream audio and video
License: GPL-3.0-or-later
URL: https://ffmpeg.org/
@@ -219,6 +227,9 @@ BuildRequires: pkgconfig(ogg)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(opencore-amrnb)
BuildRequires: pkgconfig(OpenCL)
+%if %{without bundled_openh264_headers}
+BuildRequires: pkgconfig(openh264)
+%endif
BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(rav1e)
BuildRequires: pkgconfig(rubberband)
@@ -550,7 +561,7 @@ This subpackage contains the headers for FFmpeg libswscale.
%{gpgverify} --keyring='%{SOURCE3}' --signature='%{SOURCE2}' --data='%{SOURCE0}'
%endif
-%autosetup -a1 -S git_am
+%autosetup %{?with_bundled_openh264_headers:-a1} -S git_am
install -m 0644 %{SOURCE20} enable_decoders
install -m 0644 %{SOURCE21} enable_encoders
# fix -O3 -g in host_cflags
@@ -865,6 +876,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
%{_mandir}/man3/libswscale.3*
%changelog
+* Tue Apr 23 2024 Kalev Lember <klember@redhat.com> - 6.1.1-12
+- Stop using bundled openh264 headers in F40+ and build against noopenh264
+
* Wed Mar 13 2024 Sérgio Basto <sergio@serjux.com> - 6.1.1-11
- Rebuild for jpegxl (libjxl) 0.10.2
reply other threads:[~2026-07-20 17:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=178456868072.1.12802202907032656995.rpms-ffmpeg-db2acb3681a8@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