[neon/qt6/qt6-webengine/Neon/release] debian/patches: patch not needed anymore

[Carlos De Maine]

Git commit 546a8fba5c10574c6946e27292de8336960662e7 by Carlos De Maine.
Committed on 10/12/2023 at 08:33.
Pushed by carlosdem into branch 'Neon/release'.

patch not needed anymore

D  +0    -64   debian/patches/ffmpeg-x86-optimization.patch
M  +0    -4    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-webengine/-/commit/546a8fba5c10574c6946e27292de8336960662e7

diff --git a/debian/patches/ffmpeg-x86-optimization.patch b/debian/patches/ffmpeg-x86-optimization.patch
deleted file mode 100644
index 335f585..0000000
--- a/debian/patches/ffmpeg-x86-optimization.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: avcodec/x86/mathops: clip constants used with shift instructions within inline assembly
- Fixes assembling with gas from binutils >= 2.41.
-Origin: upstream, https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/effadce6c756247e
-Bug: https://bugs.debian.org/1038131
-Last-Update: 2023-07-20
-
---- a/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-+++ b/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h
-@@ -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 @@
- // 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;
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 1c7f8c7..ca74ea4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
-
-# Don't do shift optimisation in ffmpeg, fails on x86
-ffmpeg-x86-optimization.patch
-
 # remove catapult
 remove_catapult_3rdparty.patch
 remove_catapult_core.patch