From aa15319d583f33bb9033ccd797cf7482182146c42a1170ed0d98df8d6659f893 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 19 Mar 2023 13:28:06 +0000 Subject: [PATCH] Accepting request 1072935 from home:gmbr3:Active obsoletes != provides THIS IS NEEDED https://www.reddit.com/r/openSUSE/comments/11sl1a7/comment/jcg9pbh/?utm_source=share&utm_medium=web2x&context=3 OBS-URL: https://build.opensuse.org/request/show/1072935 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=65 --- 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