Accepting request 1159780 from multimedia:libs

- Let the ffmpeg-6 main program be combinable with ffmpeg-6-mini-libs

OBS-URL: https://build.opensuse.org/request/show/1159780
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-6?expand=0&rev=8
This commit is contained in:
Ana Guerrero 2024-03-21 16:00:02 +00:00 committed by Git OBS Bridge
commit 2e6a95669e
2 changed files with 13 additions and 8 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Mar 14 18:58:31 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Let the ffmpeg-6 main program be combinable with ffmpeg-6-mini-libs
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 15 11:11:08 UTC 2024 - Enrico Belleri <kilgore.trout@idesmi.eu> Mon Jan 15 11:11:08 UTC 2024 - Enrico Belleri <kilgore.trout@idesmi.eu>

View File

@ -246,14 +246,14 @@ Provides: ffmpeg-tools = %version
Conflicts: ffmpeg-tools Conflicts: ffmpeg-tools
Provides: ffmpeg = %version Provides: ffmpeg = %version
Obsoletes: ffmpeg < %version Obsoletes: ffmpeg < %version
Requires: libavcodec60 = %version-%release Requires: (libavcodec60 = %version-%release or ffmpeg-6-mini-libs = %version-%release)
Requires: libavdevice60 = %version-%release Requires: (libavdevice60 = %version-%release or ffmpeg-6-mini-libs = %version-%release)
Requires: libavfilter9 = %version-%release Requires: (libavfilter9 = %version-%release or ffmpeg-6-mini-libs = %version-%release)
Requires: libavformat60 = %version-%release Requires: (libavformat60 = %version-%release or ffmpeg-6-mini-libs = %version-%release)
Requires: libavutil58 = %version-%release Requires: (libavutil58 = %version-%release or ffmpeg-6-mini-libs = %version-%release)
Requires: libpostproc57 = %version-%release Requires: (libpostproc57 = %version-%release or ffmpeg-6-mini-libs = %version-%release)
Requires: libswresample4 = %version-%release Requires: (libswresample4 = %version-%release or ffmpeg-6-mini-libs = %version-%release)
Requires: libswscale7 = %version-%release Requires: (libswscale7 = %version-%release or ffmpeg-6-mini-libs = %version-%release)
%description %description
FFmpeg is a multimedia framework, able to decode, encode, FFmpeg is a multimedia framework, able to decode, encode,