diff --git a/ffmpeg-x86-mathops.patch b/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch similarity index 67% rename from ffmpeg-x86-mathops.patch rename to 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch index ada8b7b..4b555d2 100644 --- a/ffmpeg-x86-mathops.patch +++ b/0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch @@ -1,6 +1,21 @@ -diff -rup a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h ---- a/libavcodec/x86/mathops.h 2023-10-01 13:02:26.829463017 +0200 -+++ b/libavcodec/x86/mathops.h 2023-10-01 13:05:19.219502582 +0200 +From 25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sun, 16 Jul 2023 18:18:02 +0300 +Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift + instructions within inline assembly + +Fixes assembling with binutil as >= 2.41 + +Signed-off-by: James Almer +(cherry picked from commit effadce6c756247ea8bae32dc13bb3e6f464f0eb) +--- + libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h +index 6298f5ed19..ca7e2dffc1 100644 +--- a/libavcodec/x86/mathops.h ++++ b/libavcodec/x86/mathops.h @@ -35,12 +35,20 @@ static av_always_inline av_const int MULL(int a, int b, unsigned shift) { @@ -57,3 +72,6 @@ diff -rup a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h return a; } +-- +2.42.0 + diff --git a/ffmpeg-5.changes b/ffmpeg-5.changes index 89aa703..db58db3 100644 --- a/ffmpeg-5.changes +++ b/ffmpeg-5.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Wed Oct 4 07:59:01 UTC 2023 - Manfred Hollstein -- Add ffmpeg-x86-mathops.patch to allow building for Leap +- Add 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch + to resolve a build failure on 15.4/15.5. ------------------------------------------------------------------- Thu Jun 29 12:26:41 UTC 2023 - Jan Engelhardt diff --git a/ffmpeg-5.spec b/ffmpeg-5.spec index 0bacb8d..b970726 100644 --- a/ffmpeg-5.spec +++ b/ffmpeg-5.spec @@ -112,7 +112,7 @@ Patch13: 0003-avcodec-libsvtav1-only-set-max_buf_sz-if-both-bitrat.patch Patch14: 0004-avcodec-libsvtav1-use-larger-of-bit-rate-and-max-rat.patch Patch91: ffmpeg-dlopen-openh264.patch Patch93: soname.diff -Patch94: ffmpeg-x86-mathops.patch +Patch94: 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch %if %{with amf_sdk} BuildRequires: AMF-devel