From dc472518d581961a72fd2e05aa138a8061397d07 Mon Sep 17 00:00:00 2001 From: technology208 Date: Tue, 4 Jun 2024 10:53:02 +0800 Subject: [PATCH] fix libsvgdec compile error --- ffmpeg.spec | 6 +++++- fix_libsvgdec_compile_error.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 fix_libsvgdec_compile_error.patch diff --git a/ffmpeg.spec b/ffmpeg.spec index 1d7eab5..a21b5ee 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -59,7 +59,7 @@ ExclusiveArch: armv7hnl Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} Version: 6.1.1 -Release: 2 +Release: 3 License: GPL-3.0-or-later URL: http://ffmpeg.org/ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz @@ -67,6 +67,7 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz # Special patch for building chromium on riscv64 Patch0: avformat-get_first_dts.patch %endif +Patch1: fix_libsvgdec_compile_error.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel} @@ -395,6 +396,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %changelog +* Tue Jun 4 2024 technology208 - 6.1.1-3 +- Add patch to fix libsvdec compile error + * Wed Apr 03 2024 misaka00251 - 6.1.1-2 - Add patch to fix chromium build on riscv64 & Cleanup patches diff --git a/fix_libsvgdec_compile_error.patch b/fix_libsvgdec_compile_error.patch new file mode 100644 index 0000000..1560668 --- /dev/null +++ b/fix_libsvgdec_compile_error.patch @@ -0,0 +1,27 @@ +From a414e25b60b8d11e30479d4f33fb9a94719dae8e Mon Sep 17 00:00:00 2001 +From: technology208 +Date: Tue, 4 Jun 2024 10:44:30 +0800 +Subject: [PATCH] fix_libsvgdec_compile_error.patch + +--- + libavcodec/librsvgdec.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libavcodec/librsvgdec.c b/libavcodec/librsvgdec.c +index c328fbc..756c26d 100644 +--- a/libavcodec/librsvgdec.c ++++ b/libavcodec/librsvgdec.c +@@ -90,8 +90,10 @@ static int librsvg_decode_frame(AVCodecContext *avctx, AVFrame *frame, + goto end; + + avctx->pix_fmt = AV_PIX_FMT_RGB32; ++#if LIBRSVG_MAJOR_VERSION > 2 || LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION >= 52 + viewport.width = dimensions.width; + viewport.height = dimensions.height; ++#endif + + ret = ff_get_buffer(avctx, frame, 0); + if (ret < 0) +-- +2.33.0 + -- Gitee