From 90d276f7fbe9fe865c0db22f6c254265b37ee2b13b846daac7bc8aace2d34e4b Mon Sep 17 00:00:00 2001 From: ZhaoQiang Date: Fri, 21 Feb 2025 12:37:11 +0800 Subject: [PATCH] orting Antonio's commit to ffmpeg-4 to adjust bconds to build the package in SLFO without xvidcore. --- ffmpeg-4.changes | 5 +++++ ffmpeg-4.spec | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 6e589c5..71ca9dc 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 15 08:18:54 UTC 2024 - Antonio Larrosa + +- Adjust bconds to build the package in SLFO without xvidcore. + ------------------------------------------------------------------- Mon Jan 6 11:53:32 UTC 2025 - Jan Engelhardt diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index dc7783d..0542d93 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -57,7 +57,7 @@ %bcond_with x265 %bcond_with xvid -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1600 %bcond_without libaom %bcond_without mysofa %bcond_without vidstab @@ -73,6 +73,15 @@ %bcond_without opencore %bcond_without xvid %else +%if 0%{?suse_version} > 1500 +%bcond_without mysofa +%bcond_without vidstab +%bcond_without codec2 +%bcond_without rubberband +%bcond_without vulkan +%bcond_without amrwb +%bcond_without opencore +%else %bcond_with libaom %bcond_with mysofa %bcond_with vidstab @@ -85,6 +94,7 @@ %bcond_with zmq %bcond_with vulkan %endif +%endif %if 0%{?suse_version} >= 1500 %bcond_without zimg -- 2.45.2