Accepting request 1208093 from multimedia:libs

- Adjust bconds to build the package in SLFO without xvidcore.

OBS-URL: https://build.opensuse.org/request/show/1208093
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-7?expand=0&rev=9
This commit is contained in:
Ana Guerrero 2024-10-16 21:36:19 +00:00 committed by Git OBS Bridge
commit a7d186aed2
4 changed files with 19 additions and 4 deletions

View File

@ -1,4 +1,4 @@
mtime: 1727857962 mtime: 1728982933
commit: d30cb95aec905435c6cc64ad770f21ca719b717f1b53b756c92f9da2c7e8b4de commit: 32cbe46280190beb53660e8ea40da248a198ba6eb095ea8a9dc9caccc4963886
url: https://src.opensuse.org/jengelh/ffmpeg-7 url: https://src.opensuse.org/jengelh/ffmpeg-7
revision: master revision: master

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:45933c3cd5aaec278a99c3002ce3814260b9a263ac82867c0a44f6ca089752c3 oid sha256:38ffd1799c116bb408d794314626408a09b370621dcd78ba8398dd455bf59069
size 256 size 256

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 15 08:18:54 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
- Adjust bconds to build the package in SLFO without xvidcore.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 2 08:20:18 UTC 2024 - Jan Engelhardt <jengelh@inai.de> Wed Oct 2 08:20:18 UTC 2024 - Jan Engelhardt <jengelh@inai.de>

View File

@ -64,7 +64,7 @@
%bcond_with x265 %bcond_with x265
%bcond_with xvid %bcond_with xvid
%if 0%{?suse_version} > 1500 %if 0%{?suse_version} > 1600
%bcond_without mysofa %bcond_without mysofa
%bcond_without vidstab %bcond_without vidstab
%bcond_without codec2 %bcond_without codec2
@ -74,12 +74,22 @@
%bcond_without opencore %bcond_without opencore
%bcond_without xvid %bcond_without xvid
%else %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 mysofa
%bcond_with vidstab %bcond_with vidstab
%bcond_with codec2 %bcond_with codec2
%bcond_with rubberband %bcond_with rubberband
%bcond_with vulkan %bcond_with vulkan
%endif %endif
%endif
%define _name ffmpeg %define _name ffmpeg
%define _major_version 7 %define _major_version 7