rpms
/
ffmpeg
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable bootstrap and rework chromaprint dependency

This commit is contained in:
Neal Gompa 2022-08-29 19:59:29 -04:00
parent 0e5c137345
commit 42000ced65
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ffmpeg.spec
View File

@ -2,10 +2,8 @@
%bcond_with upstream_tarball %bcond_with upstream_tarball
%bcond_with all_codecs %bcond_with all_codecs
# Break dependency cycles, e.g.: # Break dependency cycles by disabling certain optional dependencies.
# ffmpeg (libavcodec-free) → chromaprint → ffmpeg %bcond_with bootstrap
# by disabling certain optional dependencies.
%bcond_without bootstrap
# If you want to do a build with the upstream source tarball, then set the # 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 # pkg_suffix to %%nil. We can't handle this with a conditional, as srpm
@ -41,6 +39,19 @@
%bcond_without dc1394 %bcond_without dc1394
%endif %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} %if %{with all_codecs}
%bcond_without rtmp %bcond_without rtmp
%bcond_without x264 %bcond_without x264
@ -150,7 +161,7 @@ BuildRequires: pkgconfig(libbluray)
BuildRequires: pkgconfig(libbs2b) BuildRequires: pkgconfig(libbs2b)
BuildRequires: pkgconfig(libcdio) BuildRequires: pkgconfig(libcdio)
BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libcdio_paranoia)
%if %{without bootstrap} %if %{with chromaprint}
BuildRequires: pkgconfig(libchromaprint) BuildRequires: pkgconfig(libchromaprint)
%endif %endif
BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libdrm)
@ -553,10 +564,10 @@ cp -a doc/examples/{*.c,Makefile,README} _doc/examples/
--disable-openssl \ --disable-openssl \
--enable-bzlib \ --enable-bzlib \
--enable-frei0r \ --enable-frei0r \
%if %{with bootstrap} %if %{with chromaprint}
--disable-chromaprint \
%else
--enable-chromaprint \ --enable-chromaprint \
%else
--disable-chromaprint \
%endif %endif
--enable-gcrypt \ --enable-gcrypt \
--enable-gnutls \ --enable-gnutls \