From 9359870d00ca3405aadc8f78dd041afa90210f725fcd67d0aca935da701be8ff Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 15 Oct 2024 10:05:04 +0000 Subject: [PATCH] [info=32cbe46280190beb53660e8ea40da248a198ba6eb095ea8a9dc9caccc4963886] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-7?expand=0&rev=21 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- ffmpeg-7.changes | 5 +++++ ffmpeg-7.spec | 12 +++++++++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 6c13a93..16d9a0d 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1727857962 -commit: d30cb95aec905435c6cc64ad770f21ca719b717f1b53b756c92f9da2c7e8b4de +mtime: 1728982933 +commit: 32cbe46280190beb53660e8ea40da248a198ba6eb095ea8a9dc9caccc4963886 url: https://src.opensuse.org/jengelh/ffmpeg-7 revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 0925950..2e4c282 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45933c3cd5aaec278a99c3002ce3814260b9a263ac82867c0a44f6ca089752c3 +oid sha256:38ffd1799c116bb408d794314626408a09b370621dcd78ba8398dd455bf59069 size 256 diff --git a/ffmpeg-7.changes b/ffmpeg-7.changes index 34f2e11..fddea60 100644 --- a/ffmpeg-7.changes +++ b/ffmpeg-7.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. + ------------------------------------------------------------------- Wed Oct 2 08:20:18 UTC 2024 - Jan Engelhardt diff --git a/ffmpeg-7.spec b/ffmpeg-7.spec index 13b98be..ef22b03 100644 --- a/ffmpeg-7.spec +++ b/ffmpeg-7.spec @@ -64,7 +64,7 @@ %bcond_with x265 %bcond_with xvid -%if 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1600 %bcond_without mysofa %bcond_without vidstab %bcond_without codec2 @@ -74,12 +74,22 @@ %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 mysofa %bcond_with vidstab %bcond_with codec2 %bcond_with rubberband %bcond_with vulkan %endif +%endif %define _name ffmpeg %define _major_version 7