!24 Upgrade to version 6.1.1 to fix Eulermaker failure

From: @desert-sailor 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2024-02-23 00:53:38 +00:00 committed by Gitee
commit 189c9fdf98
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 12 additions and 4 deletions

View File

@ -20,6 +20,11 @@
%global _without_xvid 1 %global _without_xvid 1
%endif %endif
# Disable nvenc when not relevant
%ifnarch %{cuda_arches}
%global _without_nvenc 1
%endif
# extras flags # extras flags
%if 0%{!?_cuda_version:1} %if 0%{!?_cuda_version:1}
%global _cuda_version 10.2 %global _cuda_version 10.2
@ -55,12 +60,12 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor} Name: ffmpeg%{?flavor}
Version: 4.4.4 Version: 6.1.1
Release: 2 Release: 1
License: GPL-3.0-or-later License: GPL-3.0-or-later
URL: http://ffmpeg.org/ URL: http://ffmpeg.org/
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz 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} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel} %{?_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} \\\ %{?_with_zmq:--enable-libzmq} \\\
%{!?_without_zvbi:--enable-libzvbi} \\\ %{!?_without_zvbi:--enable-libzvbi} \\\
--enable-avfilter \\\ --enable-avfilter \\\
--enable-avresample \\\
--enable-libmodplug \\\ --enable-libmodplug \\\
--enable-postproc \\\ --enable-postproc \\\
--enable-pthreads \\\ --enable-pthreads \\\
@ -383,12 +387,16 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%doc MAINTAINERS doc/APIchanges doc/*.txt %doc MAINTAINERS doc/APIchanges doc/*.txt
%doc _doc/examples %doc _doc/examples
%doc %{_docdir}/%{name}/*.html %doc %{_docdir}/%{name}/*.html
%doc %{_docdir}/%{name}/*.css
%{_includedir}/%{name} %{_includedir}/%{name}
%{_libdir}/pkgconfig/lib*.pc %{_libdir}/pkgconfig/lib*.pc
%{_libdir}/lib*.so %{_libdir}/lib*.so
%changelog %changelog
* Thu Feb 22 2024 Dongxing Wang <dongxing.wang_a@thundersoft.com> - 6.1.1-1
- Upgrade to 6.1.1 to fix Eulermaker failure
* Wed Feb 21 2024 Dongxing Wang <dongxing.wang_a@thundersoft.com> - 4.4.4-2 * Wed Feb 21 2024 Dongxing Wang <dongxing.wang_a@thundersoft.com> - 4.4.4-2
- Fix obs failure - Fix obs failure