SHA256
2
1
forked from pool/ffmpeg-7

Fix BcntSync handling #14

Merged
jengelh merged 1 commits from adrianSuSE/ffmpeg-7:master into master 2025-03-27 11:23:47 +01:00
2 changed files with 11 additions and 8 deletions

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 25 11:48:21 UTC 2025 - Adrian Schröter <adrian@suse.de>
- Move BcntSync tag to the %else part where the mini package gets defined
-------------------------------------------------------------------
Sun Mar 23 23:21:26 UTC 2025 - Mia Herkt <mia@0x0.st>

View File

@@ -270,14 +270,6 @@ Requires: (libavutil59 = %version-%release or ffmpeg-7-mini-libs = %versio
Requires: (libpostproc58 = %version-%release or ffmpeg-7-mini-libs = %version-%release)
Requires: (libswresample5 = %version-%release or ffmpeg-7-mini-libs = %version-%release)
Requires: (libswscale8 = %version-%release or ffmpeg-7-mini-libs = %version-%release)
%if "%flavor" == "ffmpeg-7-mini"
# Patches may subtly change internal APIs, so we're sticking %%release in
# Requires lines. It also conveniently blocks openSUSE libav* being combined
# with Packman libav*, due to PM's unique %%release numbers.
# This use of %%release with %flavor however requires bcnt synchro:
#
#!BcntSyncTag: ffmpeg-7
%endif
%description
FFmpeg is a multimedia framework, able to decode, encode,
@@ -831,6 +823,12 @@ done
%else
%define _name ffmpeg
# Patches may subtly change internal APIs, so we're sticking %%release in
# Requires lines. It also conveniently blocks openSUSE libav* being combined
# with Packman libav*, due to PM's unique %%release numbers.
# This use of %%release with %flavor however requires bcnt synchro:
#
#!BcntSyncTag: ffmpeg-7
Name: ffmpeg-7-mini
Version: 7.1
Release: 0