From 363a57284f46628c8e67738bc72c83a3ce573cba9a5e7fe9f98a6ac9dd82c424 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 14 Mar 2024 20:53:05 +0000 Subject: [PATCH] - Let the ffmpeg-6 main program be combinable with ffmpeg-6-mini-libs OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-6?expand=0&rev=27 --- ffmpeg-6.changes | 5 +++++ ffmpeg-6.spec | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ffmpeg-6.changes b/ffmpeg-6.changes index f8a36ea..03b98b7 100644 --- a/ffmpeg-6.changes +++ b/ffmpeg-6.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 14 18:58:31 UTC 2024 - Jan Engelhardt + +- Let the ffmpeg-6 main program be combinable with ffmpeg-6-mini-libs + ------------------------------------------------------------------- Mon Jan 15 11:11:08 UTC 2024 - Enrico Belleri diff --git a/ffmpeg-6.spec b/ffmpeg-6.spec index b553121..1d0cb79 100644 --- a/ffmpeg-6.spec +++ b/ffmpeg-6.spec @@ -246,14 +246,14 @@ Provides: ffmpeg-tools = %version Conflicts: ffmpeg-tools Provides: ffmpeg = %version Obsoletes: ffmpeg < %version -Requires: libavcodec60 = %version-%release -Requires: libavdevice60 = %version-%release -Requires: libavfilter9 = %version-%release -Requires: libavformat60 = %version-%release -Requires: libavutil58 = %version-%release -Requires: libpostproc57 = %version-%release -Requires: libswresample4 = %version-%release -Requires: libswscale7 = %version-%release +Requires: (libavcodec60 = %version-%release or ffmpeg-6-mini-libs = %version-%release) +Requires: (libavdevice60 = %version-%release or ffmpeg-6-mini-libs = %version-%release) +Requires: (libavfilter9 = %version-%release or ffmpeg-6-mini-libs = %version-%release) +Requires: (libavformat60 = %version-%release or ffmpeg-6-mini-libs = %version-%release) +Requires: (libavutil58 = %version-%release or ffmpeg-6-mini-libs = %version-%release) +Requires: (libpostproc57 = %version-%release or ffmpeg-6-mini-libs = %version-%release) +Requires: (libswresample4 = %version-%release or ffmpeg-6-mini-libs = %version-%release) +Requires: (libswscale7 = %version-%release or ffmpeg-6-mini-libs = %version-%release) %description FFmpeg is a multimedia framework, able to decode, encode,