diff --git a/ffmpeg-4.4.4.tar.xz b/ffmpeg-6.1.1.tar.xz similarity index 53% rename from ffmpeg-4.4.4.tar.xz rename to ffmpeg-6.1.1.tar.xz index 3419dc3..3c4a2a2 100644 Binary files a/ffmpeg-4.4.4.tar.xz and b/ffmpeg-6.1.1.tar.xz differ diff --git a/ffmpeg.spec b/ffmpeg.spec index e846c48..25414d1 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -20,6 +20,11 @@ %global _without_xvid 1 %endif +# Disable nvenc when not relevant +%ifnarch %{cuda_arches} +%global _without_nvenc 1 +%endif + # extras flags %if 0%{!?_cuda_version:1} %global _cuda_version 10.2 @@ -55,12 +60,12 @@ ExclusiveArch: armv7hnl Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} -Version: 4.4.4 -Release: 2 +Version: 6.1.1 +Release: 1 License: GPL-3.0-or-later URL: http://ffmpeg.org/ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz -Patch0: fix-vmaf-model-path.patch +# Patch0: fix-vmaf-model-path.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel} @@ -273,7 +278,6 @@ This package contains development files for %{name} %{?_with_zmq:--enable-libzmq} \\\ %{!?_without_zvbi:--enable-libzvbi} \\\ --enable-avfilter \\\ - --enable-avresample \\\ --enable-libmodplug \\\ --enable-postproc \\\ --enable-pthreads \\\ @@ -383,12 +387,16 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %doc MAINTAINERS doc/APIchanges doc/*.txt %doc _doc/examples %doc %{_docdir}/%{name}/*.html +%doc %{_docdir}/%{name}/*.css %{_includedir}/%{name} %{_libdir}/pkgconfig/lib*.pc %{_libdir}/lib*.so %changelog +* Thu Feb 22 2024 Dongxing Wang - 6.1.1-1 +- Upgrade to 6.1.1 to fix Eulermaker failure + * Wed Feb 21 2024 Dongxing Wang - 4.4.4-2 - Fix obs failure