use git-format-patch to extract the patch from git

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-6?expand=0&rev=12

0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch

@@ -1,6 +1,20 @@
-diff -rup a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
+From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001
---- a/libavcodec/x86/mathops.h	2023-10-01 13:02:26.829463017 +0200
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-+++ b/libavcodec/x86/mathops.h	2023-10-01 13:05:19.219502582 +0200
+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 <jamrial@gmail.com>
+---
+ 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 +71,6 @@ diff -rup a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
      return a;
  }
  
+-- 
+2.42.0
+

ffmpeg-6.changes

@@ -1,7 +1,8 @@
 -------------------------------------------------------------------
 Wed Oct  4 07:59:01 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
 
-- 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.
 
 -------------------------------------------------------------------
 Mon Jul 31 09:05:39 UTC 2023 - llyyr <llyyr.public@gmail.com>

ffmpeg-6.spec

@@ -17,6 +17,9 @@
 
 
 %define flavor @BUILD_FLAVOR@%{nil}
+#
+# preamble is present twice, watch out
+#
 %if "%{flavor}" != "ffmpeg-6-mini"
 
 # Create proper conflicts to make sure we require all from one version
@@ -107,7 +110,7 @@ Patch5:         work-around-abi-break.patch
 Patch6:         0001-avfilter-vf_libplacebo-remove-deprecated-field.diff
 Patch10:        ffmpeg-chromium.patch
 Patch91:        ffmpeg-dlopen-openh264.patch
-Patch92:        ffmpeg-x86-mathops.patch
+Patch92:        0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
 
 %if %{with amf_sdk}
 BuildRequires:  AMF-devel
@@ -857,7 +860,7 @@ Patch4:         ffmpeg-4.2-dlopen-fdk_aac.patch
 Patch5:         work-around-abi-break.patch
 Patch10:        ffmpeg-chromium.patch
 Patch91:        ffmpeg-dlopen-openh264.patch
-Patch92:        ffmpeg-x86-mathops.patch
+Patch92:        0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
 BuildRequires:  c_compiler
 Requires:       this-is-only-for-build-envs