[rpms/ffmpeg] epel9-next: Disable bootstrap and rework chromaprint dependency

[rpms/ffmpeg] epel9-next: Disable bootstrap and rework chromaprint dependency

[Neal Gompa]

A new commit has been pushed.

Repo   : rpms/ffmpeg
Branch : epel9-next
Commit : 42000ced65418c7105a5ace3ed8999a9a7523b91
Author : Neal Gompa <ngompa@fedoraproject.org>
Date   : 2022-08-29T19:59:29-04:00
Stats  : +19/-8 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/ffmpeg/c/42000ced65418c7105a5ace3ed8999a9a7523b91?branch=epel9-next

Log:
Disable bootstrap and rework chromaprint dependency

---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index a03c02d..b83ce1b 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -2,10 +2,8 @@
 %bcond_with upstream_tarball
 %bcond_with all_codecs
 
-# Break dependency cycles, e.g.:
-#   ffmpeg (libavcodec-free) → chromaprint → ffmpeg
-# by disabling certain optional dependencies.
-%bcond_without bootstrap
+# Break dependency cycles by disabling certain optional dependencies.
+%bcond_with bootstrap
 
 # 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
@@ -41,6 +39,19 @@
 %bcond_without dc1394
 %endif
 
+# Break chromaprint dependency cycle:
+#   ffmpeg (libavcodec-free) → chromaprint → ffmpeg
+%if %{with bootstrap}
+%bcond_with chromaprint
+%else
+%bcond_without chromaprint
+%endif
+
+%if 0%{?rhel}
+# Disable dependencies not offered in RHEL
+%bcond_with chromaprint
+%endif
+
 %if %{with all_codecs}
 %bcond_without rtmp
 %bcond_without x264
@@ -150,7 +161,7 @@ BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libbs2b)
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcdio_paranoia)
-%if %{without bootstrap}
+%if %{with chromaprint}
 BuildRequires:  pkgconfig(libchromaprint)
 %endif
 BuildRequires:  pkgconfig(libdrm)
@@ -553,10 +564,10 @@ cp -a doc/examples/{*.c,Makefile,README} _doc/examples/
     --disable-openssl \
     --enable-bzlib \
     --enable-frei0r \
-%if %{with bootstrap}
-    --disable-chromaprint \
-%else
+%if %{with chromaprint}
     --enable-chromaprint \
+%else
+    --disable-chromaprint \
 %endif
     --enable-gcrypt \
     --enable-gnutls \