Disable bootstrap and rework chromaprint dependency

This commit is contained in:
Neal Gompa 2022-08-29 19:59:29 -04:00
parent 15413a33c6
commit e48877b7d0
1 changed files with 18 additions and 7 deletions

View File

@ -2,9 +2,7 @@
%bcond_with upstream_tarball
%bcond_with all_codecs
# Break dependency cycles, e.g.:
# ffmpeg (libavcodec-free) → chromaprint → ffmpeg
# by disabling certain optional dependencies.
# 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
@ -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
@ -159,7 +170,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)
@ -561,10 +572,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 \