forked from jengelh/ffmpeg-4
- Add conflicts for ffmpeg-5's tools
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=180
This commit is contained in:
parent
914c0a5c10
commit
25f5d4d73c
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 23 21:44:33 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Add conflicts for ffmpeg-5's tools
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 17 21:44:30 UTC 2022 - Enrico Belleri <idesmi@protonmail.com>
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user