public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Neal Gompa <ngompa@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/ffmpeg] epel9-next: Fix chromaprint bcond
Date: Mon, 20 Jul 2026 17:31:27 GMT [thread overview]
Message-ID: <178456868780.1.15530136579211710341.rpms-ffmpeg-a38892833e20@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ffmpeg
Branch : epel9-next
Commit : a38892833e20f6ca8d6378ad139c58e07c9f0d33
Author : Neal Gompa <ngompa@fedoraproject.org>
Date : 2024-10-02T04:56:28-04:00
Stats : +11/-17 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/ffmpeg/c/a38892833e20f6ca8d6378ad139c58e07c9f0d33?branch=epel9-next
Log:
Fix chromaprint bcond
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 872a489..fe44857 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -2,9 +2,6 @@
%bcond upstream_tarball 0
%bcond all_codecs 0
-# Break dependency cycles by disabling certain optional dependencies.
-%bcond bootstrap 0
-
# If you want to do a build with the upstream source tarball, then set the
# pkg_suffix to %%nil. We can't handle this with a conditional, as srpm
# generation would not take it into account.
@@ -32,11 +29,16 @@
%endif
%if 0%{?rhel}
-# Disable dependencies not offered in RHEL/EPEL
+# Disable dependencies not available or wanted on RHEL/EPEL
+%bcond chromaprint 0
%else
+# Break chromaprint dependency cycle (Fedora-only):
+# ffmpeg (libavcodec-free) → chromaprint → ffmpeg
+%bcond chromaprint %{?_with_bootstrap:0}%{!?_with_bootstrap:1}
+%endif
-# Disable some features because RHEL 9 packages are too old
%if 0%{?rhel} && 0%{?rhel} <= 9
+# Disable some features because RHEL 9 packages are too old
%bcond flite 0
%bcond lcms2 0
%bcond placebo 0
@@ -46,17 +48,6 @@
%bcond placebo 1
%endif
-%endif
-
-# Break chromaprint dependency cycle (Fedora-only):
-# ffmpeg (libavcodec-free) → chromaprint → ffmpeg
-%if %{with bootstrap}
-%bcond chromaprint 0
-%else
-%bcond chromaprint 1
-%endif
-
-
%if %{with all_codecs}
%bcond evc 1
%bcond rtmp 1
@@ -88,7 +79,7 @@ Name: ffmpeg
%global pkg_name %{name}%{?pkg_suffix}
Version: 7.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A complete solution to record, convert and stream audio and video
License: GPL-3.0-or-later
URL: https://ffmpeg.org/
@@ -860,6 +851,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
%{_mandir}/man3/libswscale.3*
%changelog
+* Wed Oct 02 2024 Neal Gompa <ngompa@fedoraproject.org> - 7.0.2-4
+- Fix chromaprint bcond
+
* Wed Sep 25 2024 Michel Lind <salimma@fedoraproject.org> - 7.0.2-3
- Disable omxil completely, it's now retired
- Rebuild for tesseract-5.4.1-3 (soversion change from 5.4.1 to just 5.4)
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=178456868780.1.15530136579211710341.rpms-ffmpeg-a38892833e20@fedoraproject.org \
--to=ngompa@fedoraproject.org \
--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