From 5663b148b3ed622d2f553fd286753cb899e5f5fa Mon Sep 17 00:00:00 2001 From: s Date: Tue, 29 Aug 2023 19:56:39 +0800 Subject: [PATCH] fix clang build error --- ffmpeg.spec | 6 +++++- fix-clang.patch | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 fix-clang.patch diff --git a/ffmpeg.spec b/ffmpeg.spec index 297e25b..30271b5 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -61,7 +61,7 @@ ExclusiveArch: armv7hnl Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} Version: 4.2.4 -Release: 6 +Release: 7 License: GPL-3.0-or-later URL: http://ffmpeg.org/ %if 0%{?date} @@ -76,6 +76,7 @@ Patch3: CVE-2021-38291.patch Patch4: CVE-2021-38114.patch Patch5: CVE-2020-35964.patch Patch6: fix-build-error-about-srt.patch +Patch7: fix-clang.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel} @@ -409,6 +410,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %changelog +* Tue Aug 29 2023 yoo - 4.2.4-7 +- fix clang build error + * Tue Aug 15 2023 peijiankang - 4.2.4-6 - add ix-build-error-about-srt.patch diff --git a/fix-clang.patch b/fix-clang.patch new file mode 100644 index 0000000..a9035ef --- /dev/null +++ b/fix-clang.patch @@ -0,0 +1,16 @@ +diff -u -r ffmpeg-4.2.4/configure ffmpeg-4.2.4/configure +--- ffmpeg-4.2.4/configure 2020-07-09 17:17:46.000000000 +0800 ++++ ffmpeg-4.2.4/configure 2023-08-29 19:41:46.000000000 +0800 +@@ -3646,9 +3646,9 @@ + + # toolchain + ar_default="ar" +-cc_default="gcc" +-cxx_default="g++" +-host_cc_default="gcc" ++cc_default=${CC:-"gcc"} ++cxx_default=${CXX:-"g++"} ++host_cc_default=${CC:-"gcc"} + doxygen_default="doxygen" + install="install" + ln_s_default="ln -s -f" -- Gitee