From 8a6b1b01a458b0b4ccd6b4847bb70740cf3479c2808d6e58492238706a67b99b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 16 Mar 2023 20:32:52 +0000 Subject: [PATCH] Accepting request 1072459 from home:gmbr3:Active - Obsolete old FFmpeg 5 libswresample4, otherwise they'll conflict OBS-URL: https://build.opensuse.org/request/show/1072459 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=63 --- baselibs.conf | 1 + ffmpeg-5.changes | 5 +++++ ffmpeg-5.spec | 1 + 3 files changed, 7 insertions(+) diff --git a/baselibs.conf b/baselibs.conf index eedf933..56d8058 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -5,4 +5,5 @@ libavformat59 libavutil57 libpostproc56 libswresample4_ff5 + obsoletes "libswresample4- < -" libswscale6 diff --git a/ffmpeg-5.changes b/ffmpeg-5.changes index 8b4af5e..d87550b 100644 --- a/ffmpeg-5.changes +++ b/ffmpeg-5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 16 18:11:17 UTC 2023 - Callum Farmer + +- Obsolete old FFmpeg 5 libswresample4, otherwise they'll conflict + ------------------------------------------------------------------- Thu Mar 16 17:55:37 UTC 2023 - Jan Engelhardt diff --git a/ffmpeg-5.spec b/ffmpeg-5.spec index b3b0d88..1f13c64 100644 --- a/ffmpeg-5.spec +++ b/ffmpeg-5.spec @@ -462,6 +462,7 @@ This subpackage contains the headers for FFmpeg libpostproc. Summary: FFmpeg software resampling library Group: System/Libraries Requires: libavutil57 = %version-%release +Obsoletes: libswresample4 < %version-%release %description -n libswresample4_ff5 The libswresample library performs audio conversion between different