Sync with upstream branch

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2024-10-29 10:34:59 +02:00
parent 89c9704e7f
commit 500cee9e27
Signed by: davidlt
GPG Key ID: 7A5F42FAF91FACC3

View File

@ -3,7 +3,7 @@
%bcond all_codecs 0
# Break dependency cycles by disabling certain optional dependencies.
%bcond bootstrap 1
%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
@ -82,7 +82,7 @@ Name: ffmpeg
%global pkg_name %{name}%{?pkg_suffix}
Version: 7.0.2
Release: 7.2.riscv64%{?dist}
Release: 7%{?dist}
Summary: A complete solution to record, convert and stream audio and video
License: GPL-3.0-or-later
URL: https://ffmpeg.org/
@ -172,7 +172,7 @@ BuildRequires: pkgconfig(libbs2b)
BuildRequires: pkgconfig(libcdio)
BuildRequires: pkgconfig(libcdio_paranoia)
%if %{with chromaprint}
#BuildRequires: pkgconfig(libchromaprint)
BuildRequires: pkgconfig(libchromaprint)
%endif
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libjxl) >= 0.7.0
@ -569,7 +569,11 @@ cp -a doc/examples/{*.c,Makefile,README} _doc/examples/
--disable-openssl \
--enable-bzlib \
--enable-frei0r \
%if %{with chromaprint}
--enable-chromaprint \
%else
--disable-chromaprint \
%endif
--enable-gcrypt \
--enable-gnutls \
--enable-ladspa \
@ -854,12 +858,6 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
%{_mandir}/man3/libswscale.3*
%changelog
* Mon Oct 28 2024 David Abdurachmanov <davidlt@rivosinc.com> - 7.0.2-7.1.riscv64
- Bootstrap (riscv64)
* Mon Oct 28 2024 David Abdurachmanov <davidlt@rivosinc.com> - 7.0.2-7.0.riscv64
- Bootstrap (riscv64)
* Mon Oct 07 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 7.0.2-7
- Properly enable aribb24/libaribcaption
- Disable VANC dependency as it depends on decklink