From 25f5d4d73cc607bbfdfb7c659dfb350817208c93027751bfdb83960ca5cd5f2e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 23 Mar 2022 21:44:48 +0000 Subject: [PATCH] - Add conflicts for ffmpeg-5's tools OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=180 --- ffmpeg-4.changes | 5 +++++ ffmpeg-4.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index f3063ae..6d0958c 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 23 21:44:33 UTC 2022 - Jan Engelhardt + +- Add conflicts for ffmpeg-5's tools + ------------------------------------------------------------------- Thu Mar 17 21:44:30 UTC 2022 - Enrico Belleri diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index e568144..8347a20 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -206,10 +206,10 @@ BuildRequires: pkgconfig(vdpau) BuildRequires: pkgconfig(vidstab) >= 0.98 %endif %if %{with vulkan} -BuildRequires: pkgconfig(vulkan) -BuildRequires: pkgconfig(SPIRV-Tools) -BuildRequires: glslang-devel BuildRequires: c++_compiler +BuildRequires: glslang-devel +BuildRequires: pkgconfig(SPIRV-Tools) +BuildRequires: pkgconfig(vulkan) %endif BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vpx) >= 1.4.0 @@ -259,6 +259,7 @@ Provides: ffmpeg-tools = %version Obsoletes: ffmpeg-tools < %version Provides: ffmpeg = %version Obsoletes: ffmpeg < %version +Conflicts: ffmpeg-5 Requires: libavcodec58_134 = %version-%release Requires: libavdevice58_13 = %version-%release Requires: libavfilter7_110 = %version-%release