jengelh/ffmpeg-4
SHA256
1
0
Fork 2
forked from pool/ffmpeg-4
Code Pull Requests 1 Activity

- Add conflicts for ffmpeg-5's tools

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=180
This commit is contained in:
Jan Engelhardt 2022-03-23 21:44:48 +00:00 committed by Git OBS Bridge
parent 914c0a5c10
commit 25f5d4d73c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg-4.changes
View File

@ -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> Thu Mar 17 21:44:30 UTC 2022 - Enrico Belleri <idesmi@protonmail.com>

7
ffmpeg-4.spec
View File

@ -206,10 +206,10 @@ BuildRequires: pkgconfig(vdpau)
BuildRequires: pkgconfig(vidstab) >= 0.98 BuildRequires: pkgconfig(vidstab) >= 0.98
%endif %endif
%if %{with vulkan} %if %{with vulkan}
BuildRequires: pkgconfig(vulkan)
BuildRequires: pkgconfig(SPIRV-Tools)
BuildRequires: glslang-devel
BuildRequires: c++_compiler BuildRequires: c++_compiler
BuildRequires: glslang-devel
BuildRequires: pkgconfig(SPIRV-Tools)
BuildRequires: pkgconfig(vulkan)
%endif %endif
BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(vpx) >= 1.4.0 BuildRequires: pkgconfig(vpx) >= 1.4.0
@ -259,6 +259,7 @@ Provides: ffmpeg-tools = %version
Obsoletes: ffmpeg-tools < %version Obsoletes: ffmpeg-tools < %version
Provides: ffmpeg = %version Provides: ffmpeg = %version
Obsoletes: ffmpeg < %version Obsoletes: ffmpeg < %version
Conflicts: ffmpeg-5
Requires: libavcodec58_134 = %version-%release Requires: libavcodec58_134 = %version-%release
Requires: libavdevice58_13 = %version-%release Requires: libavdevice58_13 = %version-%release
Requires: libavfilter7_110 = %version-%release Requires: libavfilter7_110 = %version-%release