From 581cca54e9394a9626caa6d0c204a9890c4cc3d4a595cfd68e99f14fa8eb8d9c Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 4 Oct 2023 09:06:02 +0000
Subject: [PATCH] Accepting request 1115537 from home:manfred-h

- Add ffmpeg-x86-mathops.patch to allow building for Leap

OBS-URL: https://build.opensuse.org/request/show/1115537
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=71
---
 ffmpeg-5.changes         |  5 ++++
 ffmpeg-5.spec            |  2 ++
 ffmpeg-x86-mathops.patch | 59 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 ffmpeg-x86-mathops.patch

diff --git a/ffmpeg-5.changes b/ffmpeg-5.changes
index 3402348..89aa703 100644
--- a/ffmpeg-5.changes
+++ b/ffmpeg-5.changes
@@ -1,3 +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
+
 -------------------------------------------------------------------
 Thu Jun 29 12:26:41 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/ffmpeg-5.spec b/ffmpeg-5.spec
index d0ffe82..0bacb8d 100644
--- a/ffmpeg-5.spec
+++ b/ffmpeg-5.spec
@@ -112,6 +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
 
 %if %{with amf_sdk}
 BuildRequires:  AMF-devel
@@ -842,6 +843,7 @@ Patch9:         ffmpeg-4.4-CVE-2020-22046.patch
 Patch10:        ffmpeg-chromium.patch
 Patch91:        ffmpeg-dlopen-openh264.patch
 Patch93:        soname.diff
+Patch94:        ffmpeg-x86-mathops.patch
 BuildRequires:  c_compiler
 Requires:       this-is-only-for-build-envs
 
diff --git a/ffmpeg-x86-mathops.patch b/ffmpeg-x86-mathops.patch
new file mode 100644
index 0000000..ada8b7b
--- /dev/null
+++ b/ffmpeg-x86-mathops.patch
@@ -0,0 +1,59 @@
+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
+@@ -35,12 +35,20 @@
+ static av_always_inline av_const int MULL(int a, int b, unsigned shift)
+ {
+     int rt, dummy;
++    if (__builtin_constant_p(shift))
+     __asm__ (
+         "imull %3               \n\t"
+         "shrdl %4, %%edx, %%eax \n\t"
+         :"=a"(rt), "=d"(dummy)
+-        :"a"(a), "rm"(b), "ci"((uint8_t)shift)
++        :"a"(a), "rm"(b), "i"(shift & 0x1F)
+     );
++    else
++        __asm__ (
++            "imull %3               \n\t"
++            "shrdl %4, %%edx, %%eax \n\t"
++            :"=a"(rt), "=d"(dummy)
++            :"a"(a), "rm"(b), "c"((uint8_t)shift)
++        );
+     return rt;
+ }
+ 
+@@ -113,19 +121,31 @@ __asm__ volatile(\
+ // avoid +32 for shift optimization (gcc should do that ...)
+ #define NEG_SSR32 NEG_SSR32
+ static inline  int32_t NEG_SSR32( int32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("sarl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("sarl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+ 
+ #define NEG_USR32 NEG_USR32
+ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
++    if (__builtin_constant_p(s))
+     __asm__ ("shrl %1, %0\n\t"
+          : "+r" (a)
+-         : "ic" ((uint8_t)(-s))
++         : "i" (-s & 0x1F)
+     );
++    else
++        __asm__ ("shrl %1, %0\n\t"
++               : "+r" (a)
++               : "c" ((uint8_t)(-s))
++        );
+     return a;
+ }
+