From ce2a8cac2f4d7a433f24f2bc9c70659e0eae39f0f5732d2eb9b5480ec74a284b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 16 Mar 2023 17:55:45 +0000 Subject: [PATCH 1/4] - Conflict with otherproviders(ffmpeg-tools). OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=62 --- ffmpeg-5.changes | 5 +++++ ffmpeg-5.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ffmpeg-5.changes b/ffmpeg-5.changes index aceca96..8b4af5e 100644 --- a/ffmpeg-5.changes +++ b/ffmpeg-5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 16 17:55:37 UTC 2023 - Jan Engelhardt + +- Conflict with otherproviders(ffmpeg-tools). + ------------------------------------------------------------------- Mon Mar 13 11:54:15 UTC 2023 - Jan Engelhardt diff --git a/ffmpeg-5.spec b/ffmpeg-5.spec index 09634a7..b3b0d88 100644 --- a/ffmpeg-5.spec +++ b/ffmpeg-5.spec @@ -230,7 +230,7 @@ BuildRequires: pkgconfig(x264) BuildRequires: pkgconfig(x265) %endif Provides: ffmpeg-tools = %version -Obsoletes: ffmpeg-tools < %version +Conflicts: ffmpeg-tools Provides: ffmpeg = %version Obsoletes: ffmpeg < %version Requires: libavcodec59 = %version-%release From 8a6b1b01a458b0b4ccd6b4847bb70740cf3479c2808d6e58492238706a67b99b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 16 Mar 2023 20:32:52 +0000 Subject: [PATCH 2/4] 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 From 59d54df1b8abc34d487af7939ac662472fd41bd64a275668b1c2e895af7b5ed2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 18 Mar 2023 07:52:57 +0000 Subject: [PATCH 3/4] Revert to r62: ffmpeg-6 is going to provide libswscale4 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=64 --- baselibs.conf | 1 - ffmpeg-5.changes | 5 ----- ffmpeg-5.spec | 1 - 3 files changed, 7 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 56d8058..eedf933 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -5,5 +5,4 @@ libavformat59 libavutil57 libpostproc56 libswresample4_ff5 - obsoletes "libswresample4- < -" libswscale6 diff --git a/ffmpeg-5.changes b/ffmpeg-5.changes index d87550b..8b4af5e 100644 --- a/ffmpeg-5.changes +++ b/ffmpeg-5.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 1f13c64..b3b0d88 100644 --- a/ffmpeg-5.spec +++ b/ffmpeg-5.spec @@ -462,7 +462,6 @@ 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 From aa15319d583f33bb9033ccd797cf7482182146c42a1170ed0d98df8d6659f893 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 19 Mar 2023 13:28:06 +0000 Subject: [PATCH 4/4] 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